[syncope] branch 2_1_X updated: [SYNCOPE-1609] Fix bad test

[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 fe2b857  [SYNCOPE-1609] Fix bad test
fe2b857 is described below

commit fe2b8572c3a18e5665cfc86adb78aa67cd97ebc7
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Jan 12 09:23:02 2021 +0100

    [SYNCOPE-1609] Fix bad test
---
 .../syncope/core/persistence/jpa/dao/MyJPAJSONAnySearchDAO.java     | 2 +-
 .../syncope/core/persistence/jpa/dao/PGJPAJSONAnySearchDAO.java     | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MyJPAJSONAnySearchDAO.java
 
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MyJPAJSONAnySearchDAO.java
index 0aedf58..fcb13f7 100644
--- 
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MyJPAJSONAnySearchDAO.java
+++ 
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/MyJPAJSONAnySearchDAO.java
@@ -139,7 +139,7 @@ public class MyJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
         item.orderBy = fieldName + " " + clause.getDirection().name();
     }
 
-    private void fillAttrQuery(
+    protected void fillAttrQuery(
             final AnyUtils anyUtils,
             final StringBuilder query,
             final PlainAttrValue attrValue,
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 2de1f54..a117b8d 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
@@ -132,8 +132,7 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
                             Double.parseDouble(value);
                             break;
                         case Boolean:
-                            if (!("true".equalsIgnoreCase(value)
-                                    || "false".equalsIgnoreCase(value))) {
+                            if (!("true".equalsIgnoreCase(value) || 
"false".equalsIgnoreCase(value))) {
                                 throw new IllegalArgumentException();
                             }
                             break;
@@ -176,7 +175,7 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
                     
query.append("jsonb_path_exists(").append(schema.getKey()).append(", '$[*] ? ").
                             append("(@.").append(key);
                     if (isStr) {
-                        query.append(" like_regex 
\"").append(value).append("\"");
+                        query.append(" like_regex 
\"").append(value.replace("'", "''")).append("\"");
                     } else {
                         query.append(" == ").append(value);
                     }
@@ -1099,5 +1098,4 @@ public class PGJPAJSONAnySearchDAO extends 
AbstractJPAJSONAnySearchDAO {
             }
         }
     }
-
 }