Upgrading Commons JEXL and maven-dependency-plugin

Author: ilgrosso

core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/dao/AnyFinder.java

@@ -139,9 +139,9 @@ public <A extends Any> List<A> findByDerAttrValue(
         for (int i = 0; i < identifiers.size() && !used.contains(identifiers.get(i)); i++) {
             used.add(identifiers.get(i));
 
-            AttrCond cond = plainSchemaDAO.findById(identifiers.get(i)).
-                    map(schema -> new AttrCond()).
-                    orElseGet(() -> new AnyCond());
+            AttrCond cond = plainSchemaDAO.existsById(identifiers.get(i))
+                    ? new AttrCond()
+                    : new AnyCond();
             cond.setType(ignoreCaseMatch ? AttrCond.Type.IEQ : AttrCond.Type.EQ);
             cond.setSchema(identifiers.get(i));
             cond.setExpression(attrValues.get(i));
@@ -150,6 +150,6 @@ public <A extends Any> List<A> findByDerAttrValue(
 
         LOG.debug("Generated search {} conditions: {}", anyTypeKind, andConditions);
 
-        return anySearchDAO.search(SearchCond.and(andConditions), anyTypeKind);
+        return andConditions.isEmpty() ? List.of() : anySearchDAO.search(SearchCond.and(andConditions), anyTypeKind);
     }
 }

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationManager.java

@@ -612,8 +612,8 @@ public List<PropagationAttrs> prepareAttrs(
                             enable,
                             resource,
                             provision);
-                    attrs.add(new PropagationAttrs(resource.getKey(), preparedAttrs.connObjectLink(), preparedAttrs.
-                            attributes()));
+                    attrs.add(new PropagationAttrs(
+                            resource.getKey(), preparedAttrs.connObjectLink(), preparedAttrs.attributes()));
                 }));
 
         if (any instanceof User user) {

ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java

@@ -126,8 +126,7 @@ public ElasticsearchAnySearchDAO(
     protected AdminRealmsFilter getAdminRealmsFilter(
             final Realm base,
             final boolean recursive,
-            final Set<String> adminRealms,
-            final AnyTypeKind kind) {
+            final Set<String> adminRealms) {
 
         Set<Pair<AnyTypeKind, String>> managed = new HashSet<>();
         List<Query> queries = new ArrayList<>();
@@ -185,7 +184,7 @@ protected Query getQuery(
                         build();
             }
         } else {
-            AdminRealmsFilter filter = getAdminRealmsFilter(base, recursive, adminRealms, kind);
+            AdminRealmsFilter filter = getAdminRealmsFilter(base, recursive, adminRealms);
             query = getQuery(buildEffectiveCond(cond, filter.managed(), kind), kind);
 
             if (filter.query().isPresent()) {

ext/elasticsearch/persistence/src/test/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAOTest.java

@@ -119,7 +119,7 @@ public void getAdminRealmsFilter4realm() throws IOException {
         // 2. test
         Set<String> adminRealms = Set.of(SyncopeConstants.ROOT_REALM);
         ElasticsearchAnySearchDAO.AdminRealmsFilter filter =
-                searchDAO.getAdminRealmsFilter(root, true, adminRealms, AnyTypeKind.USER);
+                searchDAO.getAdminRealmsFilter(root, true, adminRealms);
 
         assertThat(new Query.Builder().disMax(QueryBuilders.disMax().queries(
                 new Query.Builder().term(QueryBuilders.term().caseInsensitive(false).
@@ -133,7 +133,7 @@ public void getAdminRealmsFilter4realm() throws IOException {
     public void getAdminRealmsFilter4manager() {
         Set<String> adminRealms = Set.of(new RealmUtils.ManagerRealm("/any", AnyTypeKind.GROUP, "groupKey").output());
         ElasticsearchAnySearchDAO.AdminRealmsFilter filter =
-                searchDAO.getAdminRealmsFilter(realmDAO.getRoot(), true, adminRealms, AnyTypeKind.USER);
+                searchDAO.getAdminRealmsFilter(realmDAO.getRoot(), true, adminRealms);
         assertFalse(filter.query().isPresent());
         assertEquals(Set.of(Pair.of(AnyTypeKind.GROUP, "groupKey")), filter.managed());
     }

ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java

@@ -125,8 +125,7 @@ public OpenSearchAnySearchDAO(
     protected AdminRealmsFilter getAdminRealmsFilter(
             final Realm base,
             final boolean recursive,
-            final Set<String> adminRealms,
-            final AnyTypeKind kind) {
+            final Set<String> adminRealms) {
 
         Set<Pair<AnyTypeKind, String>> managed = new HashSet<>();
         List<Query> queries = new ArrayList<>();
@@ -184,7 +183,7 @@ protected Query getQuery(
                         build();
             }
         } else {
-            AdminRealmsFilter filter = getAdminRealmsFilter(base, recursive, adminRealms, kind);
+            AdminRealmsFilter filter = getAdminRealmsFilter(base, recursive, adminRealms);
             query = getQuery(buildEffectiveCond(cond, filter.managed(), kind), kind);
 
             if (filter.query().isPresent()) {

ext/opensearch/persistence/src/test/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAOTest.java

@@ -120,7 +120,7 @@ public void getAdminRealmsFilter4realm() throws IOException {
         // 2. test
         Set<String> adminRealms = Set.of(SyncopeConstants.ROOT_REALM);
         OpenSearchAnySearchDAO.AdminRealmsFilter filter =
-                searchDAO.getAdminRealmsFilter(root, true, adminRealms, AnyTypeKind.USER);
+                searchDAO.getAdminRealmsFilter(root, true, adminRealms);
 
         assertThat(new Query.Builder().disMax(QueryBuilders.disMax().queries(
                 new Query.Builder().term(QueryBuilders.term().caseInsensitive(false).
@@ -134,7 +134,7 @@ public void getAdminRealmsFilter4realm() throws IOException {
     public void getAdminRealmsFilter4manager() {
         Set<String> adminRealms = Set.of(new RealmUtils.ManagerRealm("/any", AnyTypeKind.GROUP, "groupKey").output());
         OpenSearchAnySearchDAO.AdminRealmsFilter filter =
-                searchDAO.getAdminRealmsFilter(realmDAO.getRoot(), true, adminRealms, AnyTypeKind.USER);
+                searchDAO.getAdminRealmsFilter(realmDAO.getRoot(), true, adminRealms);
         assertFalse(filter.query().isPresent());
         assertEquals(Set.of(Pair.of(AnyTypeKind.GROUP, "groupKey")), filter.managed());
     }

fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java

@@ -510,7 +510,7 @@ public void reconcileFromLDAP() {
                         fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("pullFromLDAP").
                                 query()).
                         build());
-        assertNull(matchingUsers.getResult().getFirst().getPlainAttr("title").orElse(null));
+        assertTrue(matchingUsers.getResult().getFirst().getPlainAttr("title").isEmpty());
 
         // SYNCOPE-1356 remove group membership from LDAP, pull and check in Syncope
         ConnObject groupConnObject = RESOURCE_SERVICE.readConnObject(

pom.xml

@@ -458,7 +458,7 @@ under the License.
     <debezium.version>3.0</debezium.version>
 
     <commons-lang3.version>3.20.0</commons-lang3.version>
-    <commons-jexl.version>3.6.1</commons-jexl.version>
+    <commons-jexl.version>3.6.2</commons-jexl.version>
     <commons-text.version>1.15.0</commons-text.version>
 
     <pac4j.version>6.2.2</pac4j.version>
@@ -1651,7 +1651,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.9.0</version>
+          <version>3.10.0</version>
           <configuration>
             <outputDirectory>${bundles.directory}</outputDirectory>
             <artifactItems>