[syncope] branch 2_1_X updated: [SYNCOPE-1609] Cleanup

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/2_1_X by this push:
     new ea9b966  [SYNCOPE-1609] Cleanup
ea9b966 is described below

commit ea9b966de3eef02f792016078f25209fe82581fb
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Jan 12 14:16:45 2021 +0100

    [SYNCOPE-1609] Cleanup
---
 .../core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java      | 12 +++++-------
 .../core/persistence/jpa/dao/AbstractAnySearchDAO.java       |  2 +-
 2 files changed, 6 insertions(+), 8 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 703a500..04ab0b6 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
@@ -161,7 +161,7 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
                     if (schema.getType() == AttrSchemaType.String || 
schema.getType() == AttrSchemaType.Enum) {
                         
query.append("jsonb_path_exists(").append(schema.getKey()).append(", '$[*] ? ").
                                 append("(@.").append(key).append(" like_regex 
\"").
-                                append(value.replaceAll("%", ".*")).
+                                append(value.replace("%", ".*")).
                                 append("\"").
                                 append(lower ? " flag \"i\"" : 
"").append(")')");
                     } else {
@@ -418,9 +418,8 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
 
         StringBuilder query = new StringBuilder("(");
         if (cond.isFromGroup()) {
-            realmDAO.findDescendants(realm).forEach(current -> {
-                query.append("realm_id=?").append(setParameter(parameters, 
current.getKey())).append(" OR ");
-            });
+            realmDAO.findDescendants(realm).forEach(current -> 
query.append("realm_id=?").
+                    append(setParameter(parameters, 
current.getKey())).append(" OR "));
             query.setLength(query.length() - 4);
         } else {
             for (Realm current = realm; current.getParent() != null; current = 
current.getParent()) {
@@ -712,10 +711,9 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
     protected StringBuilder buildOrderBy(final OrderBySupport obs) {
         StringBuilder orderBy = new StringBuilder();
 
-        obs.items.forEach(item -> {
-            orderBy.append(item.orderBy).append(',');
-        });
         if (!obs.items.isEmpty()) {
+            obs.items.forEach(item -> 
orderBy.append(item.orderBy).append(','));
+
             orderBy.insert(0, " ORDER BY ");
             orderBy.deleteCharAt(orderBy.length() - 1);
         }
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnySearchDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnySearchDAO.java
index 47c27e1..0ae4659 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnySearchDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnySearchDAO.java
@@ -245,7 +245,7 @@ public abstract class AbstractAnySearchDAO extends 
AbstractDAO<Any<?>> implement
                         map(Collections::singletonList).orElseGet(() -> 
Collections.emptyList())
                 : groupDAO.findKeysByNamePattern(cond.getGroup());
         if (matching.isEmpty()) {
-            LOG.error("Could not find group(s) for '" + cond.getGroup() + 
'\'');
+            LOG.error("Could not find group(s) for '{}'", cond.getGroup());
             throw new IllegalArgumentException();
         }