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 2022/02/06 07:56:07 UTC
[syncope] branch master updated: [SYNCOPE-1663] pgjsonb was missing
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 1fb8b4f [SYNCOPE-1663] pgjsonb was missing
1fb8b4f is described below
commit 1fb8b4fa3a7d0af2158f01d61dd0a0e35a86b8a5
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun Feb 6 08:55:19 2022 +0100
[SYNCOPE-1663] pgjsonb was missing
---
.../persistence/jpa/dao/PGJPAJSONAnySearchDAO.java | 42 ++++------------------
1 file changed, 6 insertions(+), 36 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 646fd92..d67f80f 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
@@ -245,12 +245,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
final List<Object> parameters,
final SearchSupport svs) {
- Pair<PlainSchema, PlainAttrValue> checked;
- try {
- checked = check(cond, svs.anyTypeKind);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ Pair<PlainSchema, PlainAttrValue> checked = check(cond, svs.anyTypeKind);
StringBuilder query = new StringBuilder();
@@ -426,12 +421,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
final List<Object> parameters,
final SearchSupport svs) {
- Realm realm;
- try {
- realm = check(cond);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ Realm realm = check(cond);
StringBuilder query = new StringBuilder().append('(');
if (cond.isFromGroup()) {
@@ -457,12 +447,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
final List<Object> parameters,
final SearchSupport svs) {
- String memberKey;
- try {
- memberKey = check(cond);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ String memberKey = check(cond);
StringBuilder query = new StringBuilder().append('(');
@@ -528,12 +513,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
final List<Object> parameters,
final SearchSupport svs) {
- String rightAnyObjectKey;
- try {
- rightAnyObjectKey = check(cond);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ String rightAnyObjectKey = check(cond);
StringBuilder query = new StringBuilder().append('(');
@@ -560,12 +540,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
final List<Object> parameters,
final SearchSupport svs) {
- List<String> groupKeys;
- try {
- groupKeys = check(cond);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ List<String> groupKeys =check(cond);
String where = groupKeys.stream().
map(key -> "group_id=?" + setParameter(parameters, key)).
@@ -617,12 +592,7 @@ public class PGJPAJSONAnySearchDAO extends JPAAnySearchDAO {
cond.setExpression(realm.getKey());
}
- Triple<PlainSchema, PlainAttrValue, AnyCond> checked;
- try {
- checked = check(cond, svs.anyTypeKind);
- } catch (IllegalArgumentException e) {
- return ALWAYS_FALSE_ASSERTION;
- }
+ Triple<PlainSchema, PlainAttrValue, AnyCond> checked = check(cond, svs.anyTypeKind);
StringBuilder query = new StringBuilder();