Skip to content

[SYNCOPE-1951] Fix Realm search console and clean code #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilgrosso merged 2 commits into from
Mar 10, 2026
+4 −13
Merged

[SYNCOPE-1951] Fix Realm search console and clean code #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb48314
[SYNCOPE-1951] Fix Realm search console and clean code
TatoniMatteo Mar 10, 2026
4618e9d
[SYNCOPE-1951] Removed unnecessary Logger in OpenSearchRealmSearchDAO
TatoniMatteo Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nsole/src/main/java/org/apache/syncope/client/console/panels/search/RealmSearchPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void adjust(

@Override
public boolean showOperator(final int index, final SearchClause currentClause) {
return isNotBaseClause(currentClause, index);
return index > 1;
}
});
}
Expand Down Expand Up @@ -304,6 +304,6 @@ protected static boolean isNotBaseClause(final SearchClause clause, final int in
return clause == null
|| clause.getType() != SearchClause.Type.CUSTOM
|| !FULLPATH.equals(clause.getProperty())
|| index > 1;
|| index > 0;
}
}
1 change: 1 addition & 0 deletions client/idrepo/console/src/main/resources/console.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ console.adminUser=${adminUser}

console.page.dashboard=org.apache.syncope.client.console.pages.Dashboard
console.page.realms=org.apache.syncope.client.console.pages.Realms
console.page.anys=org.apache.syncope.client.console.pages.Anys
console.page.reports=org.apache.syncope.client.console.pages.Reports
console.page.audit=org.apache.syncope.client.console.pages.Audit
console.page.implementations=org.apache.syncope.client.console.pages.Implementations
Expand Down
3 changes: 1 addition & 2 deletions .../src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,7 @@ protected List<Realm> doSearch(final Set<String> bases, final SearchCond cond, f
obs.items.forEach(item -> queryString.append(',').append(item.select));

queryString.append(" FROM ").append(buildFrom(queryInfo.plainSchemas(), obs)).
append(" WHERE ").append(buildWhere(bases, queryInfo, parameters)).
toString();
append(" WHERE ").append(buildWhere(bases, queryInfo, parameters));

if (!obs.items.isEmpty()) {
queryString.append(" ORDER BY ").
Expand Down
4 changes: 0 additions & 4 deletions ...va/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,12 @@
import org.apache.syncope.core.persistence.common.dao.AbstractRealmSearchDAO;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.ext.elasticsearch.client.ElasticsearchUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Transactional;

public class ElasticsearchRealmSearchDAO extends AbstractRealmSearchDAO implements RealmSearchDAO {

protected static final Logger LOG = LoggerFactory.getLogger(RealmSearchDAO.class);

protected static final Set<String> ID_PROPS = Set.of("key", "id", "_id");

protected static final List<SortOptions> FULLPATH_SORT_OPTIONS = List.of(
Expand Down
5 changes: 0 additions & 5 deletions ...ain/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,11 @@
import org.opensearch.client.opensearch.core.SearchRequest;
import org.opensearch.client.opensearch.core.search.Hit;
import org.opensearch.client.opensearch.core.search.SourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Transactional;

public class OpenSearchRealmSearchDAO extends AbstractRealmSearchDAO implements RealmSearchDAO {

protected static final Logger LOG = LoggerFactory.getLogger(RealmSearchDAO.class);

protected static final Set<String> ID_PROPS = Set.of("key", "id", "_id");

protected static final List<SortOptions> FULLPATH_SORT_OPTIONS = List.of(
Expand Down