(syncope) branch 3_0_X updated: Upgrading Elasticsearch and MySQL JDBC driver

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/3_0_X by this push:
     new fb91462774 Upgrading Elasticsearch and MySQL JDBC driver
fb91462774 is described below

commit fb91462774e4246e7314ea7bc080774163779c1e
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jan 22 09:06:40 2025 +0100

    Upgrading Elasticsearch and MySQL JDBC driver
---
 .../core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java   | 15 +++------------
 .../syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java |  5 +++--
 pom.xml                                                   |  4 ++--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git 
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java
 
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java
index e9974776a2..42602c0a2e 100644
--- 
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java
+++ 
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java
@@ -169,14 +169,6 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO 
{
 
         StringBuilder clause = new StringBuilder();
         switch (cond.getType()) {
-            case ISNULL:
-                // shouldn't occour: processed before
-                break;
-
-            case ISNOTNULL:
-                
clause.append("jsonb_path_exists(").append(schema.getKey()).append(", '$[*]')");
-                break;
-
             case ILIKE:
             case LIKE:
                 // jsonb_path_exists(Nome, '$[*] ? (@.stringValue like_regex 
"EL.*" flag "i")')
@@ -187,8 +179,8 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
                             append("\"").
                             append(lower ? " flag \"i\"" : "").append(")')");
                 } else {
-                    clause.append(' ').append(ALWAYS_FALSE_CLAUSE);
                     LOG.error("LIKE is only compatible with string or enum 
schemas");
+                    clause.append(' ').append(ALWAYS_FALSE_CLAUSE);
                 }
                 break;
 
@@ -310,13 +302,12 @@ public class PGJPAJSONAnySearchDAO extends 
JPAAnySearchDAO {
             });
         }
 
-        schemas.forEach(schema -> 
Optional.ofNullable(plainSchemaDAO.find(schema)).ifPresentOrElse(
+        schemas.forEach(schema -> 
Optional.ofNullable(plainSchemaDAO.find(schema)).ifPresent(
                 pschema -> clause.append(',').
                         append("jsonb_path_query_array(plainattrs, '$[*] ? 
(@.schema==\"").
                         append(schema).append("\").").
                         append("\"").append(pschema.isUniqueConstraint() ? 
"uniqueValue" : "values").append("\"')").
-                        append(" AS ").append(schema),
-                () -> LOG.warn("Ignoring invalid schema '{}'", schema)));
+                        append(" AS ").append(schema)));
 
         return clause.toString();
     }
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
index 4612016fb9..a2a984801e 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
@@ -629,8 +629,9 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
                 } else {
                     clause.append('=');
                 }
-                if ((schema.getType() == AttrSchemaType.String
-                        || schema.getType() == AttrSchemaType.Enum) && 
ignoreCase) {
+                if (ignoreCase
+                        && (schema.getType() == AttrSchemaType.String || 
schema.getType() == AttrSchemaType.Enum)) {
+
                     clause.append("LOWER(?").append(setParameter(parameters, 
attrValue.getValue())).append(')');
                 } else {
                     clause.append('?').append(setParameter(parameters, 
attrValue.getValue()));
diff --git a/pom.xml b/pom.xml
index 9f2ff06e18..ec83d08980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@ under the License.
 
     <slf4j.version>1.7.36</slf4j.version>
 
-    <elasticsearch.version>8.17.0</elasticsearch.version>
+    <elasticsearch.version>8.17.1</elasticsearch.version>
     <opensearch.version>2.18.0</opensearch.version>
     <opensearch-java.version>2.19.0</opensearch-java.version>
 
@@ -508,7 +508,7 @@ under the License.
     <docker.mariadb.version>11</docker.mariadb.version>
 
     <jdbc.postgresql.version>42.7.5</jdbc.postgresql.version>
-    <jdbc.mysql.version>9.0.0</jdbc.mysql.version>
+    <jdbc.mysql.version>9.2.0</jdbc.mysql.version>
     <jdbc.mariadb.version>3.5.1</jdbc.mariadb.version>
     <jdbc.mssql.version>12.6.1.jre11</jdbc.mssql.version>
     <jdbc.oracle.version>23.6.0.24.10</jdbc.oracle.version>