This is an automated email from the ASF dual-hosted git repository.
matato pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_0_X by this push:
new c766d9e2f2 Removed unused parameter
c766d9e2f2 is described below
commit c766d9e2f2c9acecdeaa63faa08ed4f194569999
Author: Matteo Tatoni <[email protected]>
AuthorDate: Thu Nov 13 15:04:32 2025 +0100
Removed unused parameter
Removed the unused "type" parameter in the search and count methods of
AbstractAnyRestClient
---
.../client/console/status/ResourceStatusDirectoryPanel.java | 4 ++--
.../syncope/client/console/commons/AnyDataProvider.java | 11 ++++-------
.../client/console/panels/search/AbstractSearchPanel.java | 2 +-
.../client/console/panels/search/AnyObjectSearchPanel.java | 4 ++--
.../client/console/panels/search/SearchClausePanel.java | 4 ++--
.../syncope/client/console/rest/AbstractAnyRestClient.java | 4 ++--
.../syncope/client/console/rest/AnyObjectRestClient.java | 5 ++---
.../apache/syncope/client/console/rest/GroupRestClient.java | 5 ++---
.../apache/syncope/client/console/rest/UserRestClient.java | 5 ++---
.../org/apache/syncope/client/console/wizards/any/Groups.java | 7 +++----
10 files changed, 22 insertions(+), 29 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
index 3617d836d5..efebe66dc3 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -277,7 +277,7 @@ public class ResourceStatusDirectoryPanel
if (fiql != null && restClient != null) {
int page = (int) first / paginatorRows;
List<? extends AnyTO> result = restClient.search(
- SyncopeConstants.ROOT_REALM, fiql, (page < 0 ? 0 :
page) + 1, paginatorRows, getSort(), type);
+ SyncopeConstants.ROOT_REALM, fiql, (page < 0 ? 0 :
page) + 1, paginatorRows, getSort());
statusBeans.addAll(result.stream().map(any ->
StatusUtils.getStatusBean(any,
resource.getKey(),
@@ -291,7 +291,7 @@ public class ResourceStatusDirectoryPanel
@Override
public long size() {
return Optional.ofNullable(fiql).
- map(s -> restClient.count(SyncopeConstants.ROOT_REALM, s,
type)).
+ map(s -> restClient.count(SyncopeConstants.ROOT_REALM, s)).
orElse(0L);
}
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
index fe2bf78598..2ae40ae7a8 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java
@@ -52,8 +52,6 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
protected final String realm;
- protected final String type;
-
protected final PageReference pageRef;
protected int currentPage;
@@ -88,7 +86,6 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
this.comparator = new SortableAnyProviderComparator<>(this);
this.realm = realm;
- this.type = type;
this.pageRef = pageRef;
}
@@ -104,10 +101,10 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
if (filtered) {
result = Optional.ofNullable(fiql).
- map(s -> restClient.search(realm, s, currentPage + 1,
paginatorRows, getSort(), type)).
+ map(s -> restClient.search(realm, s, currentPage + 1,
paginatorRows, getSort())).
orElseGet(List::of);
} else {
- result = restClient.search(realm, null, currentPage + 1,
paginatorRows, getSort(), type);
+ result = restClient.search(realm, null, currentPage + 1,
paginatorRows, getSort());
}
} catch (Exception e) {
LOG.error("While searching with FIQL {}", fiql, e);
@@ -126,9 +123,9 @@ public class AnyDataProvider<A extends AnyTO> extends
DirectoryDataProvider<A> {
try {
if (filtered) {
- result = Optional.ofNullable(fiql).map(s ->
restClient.count(realm, s, type)).orElse(0L);
+ result = Optional.ofNullable(fiql).map(s ->
restClient.count(realm, s)).orElse(0L);
} else {
- result = restClient.count(realm, null, type);
+ result = restClient.count(realm, null);
}
} catch (Exception e) {
LOG.error("While requesting for size() with FIQL {}", fiql, e);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
index ab3fd33a6c..2fb724fba5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
@@ -167,7 +167,7 @@ public abstract class AbstractSearchPanel extends Panel {
@Override
protected Long load() {
- return
groupRestClient.count(SyncopeConstants.ROOT_REALM, null, null);
+ return
groupRestClient.count(SyncopeConstants.ROOT_REALM, null);
}
})
: Pair.of(groupNames, Model.of(0L));
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
index 3479bd64f7..95e1a9e457 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java
@@ -111,8 +111,8 @@ public class AnyObjectSearchPanel extends
AbstractSearchPanel {
null,
1,
Constants.MAX_GROUP_LIST_SIZE,
- new SortParam<>(Constants.NAME_FIELD_NAME, true),
-
null).stream().map(GroupTO::getName).collect(Collectors.toList());
+ new SortParam<>(Constants.NAME_FIELD_NAME, true)).
+
stream().map(GroupTO::getName).collect(Collectors.toList());
}
};
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 60d50c6f94..2581fdc431 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -721,8 +721,8 @@ public class SearchClausePanel extends
FieldPanel<SearchClause> {
query(),
1,
Constants.MAX_GROUP_LIST_SIZE,
- new SortParam<>(Constants.NAME_FIELD_NAME,
true),
- null).stream().map(GroupTO::getName).toList());
+ new SortParam<>(Constants.NAME_FIELD_NAME,
true)).
+ stream().map(GroupTO::getName).toList());
}
}
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
index b31499a158..64acac878f 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
@@ -54,9 +54,9 @@ public abstract class AbstractAnyRestClient<TO extends AnyTO>
extends BaseRestCl
protected abstract Class<? extends AnyService<TO>> getAnyServiceClass();
- public abstract long count(String realm, String fiql, String type);
+ public abstract long count(String realm, String fiql);
- public abstract List<TO> search(String realm, String fiql, int page, int
size, SortParam<String> sort, String type);
+ public abstract List<TO> search(String realm, String fiql, int page, int
size, SortParam<String> sort);
public TO read(final String key) {
return getService(getAnyServiceClass()).read(key);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
index fca6cb4f7c..03c9816feb 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
@@ -57,7 +57,7 @@ public class AnyObjectRestClient extends
AbstractAnyRestClient<AnyObjectTO> {
}
@Override
- public long count(final String realm, final String fiql, final String
type) {
+ public long count(final String realm, final String fiql) {
return getService(AnyObjectService.class).
search(new
AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).build()).
getTotalCount();
@@ -65,8 +65,7 @@ public class AnyObjectRestClient extends
AbstractAnyRestClient<AnyObjectTO> {
@Override
public List<AnyObjectTO> search(final String realm, final String fiql,
final int page, final int size,
- final SortParam<String> sort,
- final String type) {
+ final SortParam<String> sort) {
return getService(AnyObjectService.class).search(
new
AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
index 2f75a08c38..0b5c8cec14 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
@@ -58,7 +58,7 @@ public class GroupRestClient extends
AbstractAnyRestClient<GroupTO> {
}
@Override
- public long count(final String realm, final String fiql, final String
type) {
+ public long count(final String realm, final String fiql) {
return getService(GroupService.class).
search(new
AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).details(false).build()).
getTotalCount();
@@ -70,8 +70,7 @@ public class GroupRestClient extends
AbstractAnyRestClient<GroupTO> {
final String fiql,
final int page,
final int size,
- final SortParam<String> sort,
- final String type) {
+ final SortParam<String> sort) {
return getService(GroupService.class).
search(new
AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).details(false).
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
index 9792c99986..224bbb8065 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
@@ -67,7 +67,7 @@ public class UserRestClient extends
AbstractAnyRestClient<UserTO> {
}
@Override
- public long count(final String realm, final String fiql, final String
type) {
+ public long count(final String realm, final String fiql) {
return getService(UserService.class).
search(new
AnyQuery.Builder().realm(realm).fiql(fiql).page(1).size(0).details(false).build()).
getTotalCount();
@@ -75,8 +75,7 @@ public class UserRestClient extends
AbstractAnyRestClient<UserTO> {
@Override
public List<UserTO> search(
- final String realm, final String fiql, final int page, final int
size, final SortParam<String> sort,
- final String type) {
+ final String realm, final String fiql, final int page, final int
size, final SortParam<String> sort) {
return getService(UserService.class).
search(new
AnyQuery.Builder().realm(realm).fiql(fiql).page(page).size(size).details(false).
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
index af3157cd47..bf81f94d22 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
@@ -237,8 +237,7 @@ public class Groups extends AbstractGroups {
builder.or(conditions).query(),
1,
Constants.MAX_GROUP_LIST_SIZE,
- sort,
-
null).stream().collect(Collectors.toMap(GroupTO::getKey, GroupTO::getName)));
+
sort).stream().collect(Collectors.toMap(GroupTO::getKey, GroupTO::getName)));
}
}
@@ -268,8 +267,8 @@ public class Groups extends AbstractGroups {
builder.or(conditions).query(),
-1,
-1,
- new SortParam<>(Constants.NAME_FIELD_NAME, true),
- null).stream().map(GroupTO::getName).toList());
+ new SortParam<>(Constants.NAME_FIELD_NAME, true)).
+ stream().map(GroupTO::getName).toList());
}
}
