(syncope) branch master updated: [SYNCOPE-1855] Allow for easier subclassing

[ilgrosso]

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 a26f7cc97c [SYNCOPE-1855] Allow for easier subclassing
a26f7cc97c is described below

commit a26f7cc97cd3cf0480dd7b8c51bdc9a45915bb78
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jun 4 16:45:34 2025 +0200

    [SYNCOPE-1855] Allow for easier subclassing
---
 .../core/persistence/jpa/dao/AbstractJPAAnySearchDAO.java        | 9 +++++++--
 .../syncope/core/persistence/jpa/dao/OracleJPAAnySearchDAO.java  | 6 +++---
 .../syncope/core/persistence/jpa/dao/PGJPAAnySearchDAO.java      | 6 +++---
 3 files changed, 13 insertions(+), 8 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 9c225dd72d..1cb1f8781e 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
@@ -157,8 +157,13 @@ abstract class AbstractJPAAnySearchDAO extends 
AbstractAnySearchDAO {
         return svs.field();
     }
 
+    protected String anyId(final SearchSupport.SearchView sv) {
+        return sv.alias() + ".any_id";
+    }
+
     protected String anyId(final SearchSupport svs) {
-        return defaultSV(svs).alias() + ".any_id";
+        return anyId(defaultSV(svs));
+
     }
 
     protected Optional<AnySearchNode> getQueryForCustomConds(
@@ -853,7 +858,7 @@ abstract class AbstractJPAAnySearchDAO extends 
AbstractAnySearchDAO {
                 join.append(" LEFT JOIN ").
                         append(sv.name()).append(" ").append(sv.alias()).
                         append(" ON ").
-                        
append(joins.getFirst().alias()).append(".any_id=").append(sv.alias()).append(".any_id");
+                        
append(anyId(joins.get(0))).append('=').append(anyId(sv));
             }
             fromString = join.toString();
         }
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 05646557cd..31cdbbfe76 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
@@ -93,8 +93,8 @@ public class OracleJPAAnySearchDAO extends 
AbstractJPAAnySearchDAO {
     }
 
     @Override
-    protected String anyId(final SearchSupport svs) {
-        return defaultSV(svs).alias() + ".id";
+    protected String anyId(final SearchSupport.SearchView sv) {
+        return sv.alias() + ".id";
     }
 
     @Override
@@ -140,7 +140,7 @@ public class OracleJPAAnySearchDAO extends 
AbstractJPAAnySearchDAO {
 
         String value = Optional.ofNullable(attrValue.getDateValue()).
                 map(DateTimeFormatter.ISO_OFFSET_DATE_TIME::format).
-            orElseGet(cond::getExpression);
+                orElseGet(cond::getExpression);
 
         boolean lower = (schema.getType() == AttrSchemaType.String || 
schema.getType() == AttrSchemaType.Enum)
                 && (cond.getType() == AttrCond.Type.IEQ || cond.getType() == 
AttrCond.Type.ILIKE);
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 ecdb92babf..2ebd57713e 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
@@ -94,8 +94,8 @@ public class PGJPAAnySearchDAO extends 
AbstractJPAAnySearchDAO {
     }
 
     @Override
-    protected String anyId(final SearchSupport svs) {
-        return defaultSV(svs).alias() + ".id";
+    protected String anyId(final SearchSupport.SearchView sv) {
+        return sv.alias() + ".id";
     }
 
     @Override
@@ -140,7 +140,7 @@ public class PGJPAAnySearchDAO extends 
AbstractJPAAnySearchDAO {
 
         String value = Optional.ofNullable(attrValue.getDateValue()).
                 map(DateTimeFormatter.ISO_OFFSET_DATE_TIME::format).
-            orElseGet(cond::getExpression);
+                orElseGet(cond::getExpression);
 
         boolean isStr = true;
         boolean lower = false;