You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2025/11/12 10:39:06 UTC

(syncope) branch 4_0_X updated (c088a8fb61 -> e8058afe3c)

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a change to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


    from c088a8fb61 Revert "Bump co.elastic.clients:elasticsearch-java from 9.2.0 to 9.2.1"
     new 68aa6a5e95 Fix warnings
     new e8058afe3c Bump co.elastic.clients:elasticsearch-java from 9.2.0 to 9.2.1

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java | 2 +-
 .../syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java  | 2 +-
 .../syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java    | 2 +-
 .../syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java   | 2 +-
 .../syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java       | 2 +-
 .../persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java  | 8 ++++----
 .../core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java   | 8 ++++----
 pom.xml                                                           | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)


(syncope) 02/02: Bump co.elastic.clients:elasticsearch-java from 9.2.0 to 9.2.1

Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit e8058afe3ce880ecf715a05890eb2c83c5353326
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Nov 11 22:07:04 2025 +0000

    Bump co.elastic.clients:elasticsearch-java from 9.2.0 to 9.2.1
    
    Bumps [co.elastic.clients:elasticsearch-java](https://github.com/elastic/elasticsearch-java) from 9.2.0 to 9.2.1.
    - [Release notes](https://github.com/elastic/elasticsearch-java/releases)
    - [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/elastic/elasticsearch-java/commits)
    
    ---
    updated-dependencies:
    - dependency-name: co.elastic.clients:elasticsearch-java
      dependency-version: 9.2.1
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 806078883e..b9e8c823fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,7 +449,7 @@ under the License.
 
     <disruptor.version>4.0.0</disruptor.version>
 
-    <elasticsearch.version>9.2.0</elasticsearch.version>
+    <elasticsearch.version>9.2.1</elasticsearch.version>
     <opensearch.version>3.3.2</opensearch.version>
     <opensearch-java.version>3.3.0</opensearch-java.version>
 


(syncope) 01/02: Fix warnings

Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 68aa6a5e956b1d44e59e8ed32bc869d9fa0d6955
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Nov 12 09:58:02 2025 +0100

    Fix warnings
---
 .../syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java | 2 +-
 .../syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java  | 2 +-
 .../syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java    | 2 +-
 .../syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java   | 2 +-
 .../syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java       | 2 +-
 .../persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java  | 8 ++++----
 .../core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java   | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java
index a22376eaa3..8b700b82b6 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java
@@ -658,7 +658,7 @@ abstract class AbstractJPAAnySearchDAO extends AbstractAnySearchDAO {
     protected AttrCondQuery getQuery(
             final AttrCond cond,
             final boolean not,
-            final CheckResult checked,
+            final CheckResult<AttrCond> checked,
             final List<Object> parameters,
             final SearchSupport svs) {
 
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java
index d52e37108e..858496ee4a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MariaDBJPAAnySearchDAO.java
@@ -100,7 +100,7 @@ public class MariaDBJPAAnySearchDAO extends AbstractJPAAnySearchDAO {
     protected AttrCondQuery getQuery(
             final AttrCond cond,
             final boolean not,
-            final CheckResult checked,
+            final CheckResult<AttrCond> checked,
             final List<Object> parameters,
             final SearchSupport svs) {
 
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java
index ad2ce101e7..9f9e62302a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MySQLJPAAnySearchDAO.java
@@ -184,7 +184,7 @@ public class MySQLJPAAnySearchDAO extends AbstractJPAAnySearchDAO {
     protected AttrCondQuery getQuery(
             final AttrCond cond,
             final boolean not,
-            final CheckResult checked,
+            final CheckResult<AttrCond> checked,
             final List<Object> parameters,
             final SearchSupport svs) {
 
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java
index b0120fd7db..ad63eb5260 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java
@@ -213,7 +213,7 @@ public class OracleJPAAnySearchDAO extends AbstractJPAAnySearchDAO {
     protected AttrCondQuery getQuery(
             final AttrCond cond,
             final boolean not,
-            final CheckResult checked,
+            final CheckResult<AttrCond> checked,
             final List<Object> parameters,
             final SearchSupport svs) {
 
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java
index 98e1c53fec..28cd12b1ba 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java
@@ -241,7 +241,7 @@ public class PGJPAAnySearchDAO extends AbstractJPAAnySearchDAO {
     protected AttrCondQuery getQuery(
             final AttrCond cond,
             final boolean not,
-            final CheckResult checked,
+            final CheckResult<AttrCond> checked,
             final List<Object> parameters,
             final SearchSupport svs) {
 
diff --git a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
index 28f9ad9169..0d415f731f 100644
--- a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
+++ b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
@@ -588,14 +588,14 @@ public class ElasticsearchAnySearchDAO extends AbstractAnySearchDAO {
     }
 
     protected Query getQuery(final AttrCond cond) {
-        CheckResult checked = check(cond);
+        CheckResult<AttrCond> checked = check(cond);
 
         return fillAttrQuery(checked.schema(), checked.value(), cond);
     }
 
     @Override
-    protected CheckResult check(final AnyCond cond, final AnyTypeKind kind) {
-        CheckResult checked = super.check(cond, kind);
+    protected CheckResult<AnyCond> check(final AnyCond cond, final AnyTypeKind kind) {
+        CheckResult<AnyCond> checked = super.check(cond, kind);
 
         // Manage difference between external id attribute and internal _id
         if ("id".equals(checked.cond().getSchema())) {
@@ -615,7 +615,7 @@ public class ElasticsearchAnySearchDAO extends AbstractAnySearchDAO {
             cond.setExpression(realm.getKey());
         }
 
-        CheckResult checked = check(cond, kind);
+        CheckResult<AnyCond> checked = check(cond, kind);
 
         return fillAttrQuery(checked.schema(), checked.value(), checked.cond());
     }
diff --git a/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java b/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java
index 1e6748defa..82bad187ce 100644
--- a/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java
+++ b/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchAnySearchDAO.java
@@ -583,14 +583,14 @@ public class OpenSearchAnySearchDAO extends AbstractAnySearchDAO {
     }
 
     protected Query getQuery(final AttrCond cond) {
-        CheckResult checked = check(cond);
+        CheckResult<AttrCond> checked = check(cond);
 
         return fillAttrQuery(checked.schema(), checked.value(), cond);
     }
 
     @Override
-    protected CheckResult check(final AnyCond cond, final AnyTypeKind kind) {
-        CheckResult checked = super.check(cond, kind);
+    protected CheckResult<AnyCond> check(final AnyCond cond, final AnyTypeKind kind) {
+        CheckResult<AnyCond> checked = super.check(cond, kind);
 
         // Manage difference between external id attribute and internal _id
         if ("id".equals(checked.cond().getSchema())) {
@@ -610,7 +610,7 @@ public class OpenSearchAnySearchDAO extends AbstractAnySearchDAO {
             cond.setExpression(realm.getKey());
         }
 
-        CheckResult checked = check(cond, kind);
+        CheckResult<AnyCond> checked = check(cond, kind);
 
         return fillAttrQuery(checked.schema(), checked.value(), checked.cond());
     }