Removed unused parameter

Removed the unused "type" parameter in the search and count methods of AbstractAnyRestClient

Author: TatoniMatteo

client/idm/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java

@@ -277,7 +277,7 @@ protected List<StatusBean> getStatusBeans(final long first, final long count) {
  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 @@ protected List<StatusBean> getStatusBeans(final long first, final long count) {
  @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);
  }
  }

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 AnyDataProvider(
  this.comparator = new SortableAnyProviderComparator<>(this);
 
  this.realm = realm;
- this.type = type;
  this.pageRef = pageRef;
  }
 
@@ -104,10 +101,10 @@ public Iterator<A> iterator(final long first, final long count) {
 
  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 long size() {
 
  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);

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java

@@ -167,7 +167,7 @@ protected AbstractSearchPanel(
 
  @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));

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSearchPanel.java

@@ -111,8 +111,8 @@ protected List<String> load() {
  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());
  }
  };
 

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java

@@ -721,8 +721,8 @@ protected void onEvent(final AjaxRequestTarget target) {
  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());
  }
  }
  }

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);

client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java

@@ -57,16 +57,15 @@ public ProvisioningResult<AnyObjectTO> update(final String etag, final AnyObject
  }
 
  @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();
  }
 
  @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).

client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java

@@ -58,7 +58,7 @@ public ProvisioningResult<GroupTO> update(final String etag, final GroupUR updat
  }
 
  @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 List<GroupTO> search(
  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).

client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java

@@ -67,16 +67,15 @@ public ProvisioningResult<UserTO> update(final String etag, final UserUR updateR
  }
 
  @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();
  }
 
  @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).

client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java

@@ -237,8 +237,7 @@ protected void reloadMemberships() {
  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 @@ protected void reloadDynMemberships() {
  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());
  }
  }