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

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

commit b0fb0c67fae078f0c18568c85643a54f3fa41cef
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Nov 12 12:56:24 2026 +0100

    Attempting to fix IT issues
---
 .../core/persistence/jpa/dao/repo/UserRepo.java    |  4 ----
 .../core/persistence/jpa/dao/repo/UserRepoExt.java |  3 +++
 .../persistence/jpa/dao/repo/UserRepoExtImpl.java  | 23 ++++++++++++++++++
 .../apache/syncope/fit/core/PushTaskITCase.java    |  2 +-
 .../org/apache/syncope/fit/core/SearchITCase.java  | 28 ++++++++++++----------
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepo.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepo.java
index eede54f051..850c7794a1 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepo.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepo.java
@@ -40,10 +40,6 @@ public interface UserRepo
     @Override
     Optional<String> findUsername(@Param("key") String key);
 
-    @Query("SELECT e FROM #{#entityName} e WHERE e.token = :token")
-    @Override
-    Optional<? extends User> findByToken(@Param("token") String token);
-
     @Query("SELECT e FROM #{#entityName} e WHERE e.id IN (:keys)")
     @Override
     List<User> findByKeys(@Param("keys") List<String> keys);
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExt.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExt.java
index 7be164041c..6f2196a739 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExt.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExt.java
@@ -21,6 +21,7 @@ package org.apache.syncope.core.persistence.jpa.dao.repo;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.apache.syncope.core.persistence.api.entity.ExternalResource;
 import org.apache.syncope.core.persistence.api.entity.Role;
@@ -31,6 +32,8 @@ import 
org.apache.syncope.core.persistence.api.entity.user.User;
 
 public interface UserRepoExt extends AnyRepoExt<User> {
 
+    Optional<? extends User> findByToken(String token);
+
     void securityChecks(Set<String> authRealms, String key, String realm, 
Collection<String> groups);
 
     boolean isManager(String key);
diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExtImpl.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExtImpl.java
index 3c4e0405bb..6c01e1e3aa 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExtImpl.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/UserRepoExtImpl.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.persistence.jpa.dao.repo;
 
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 import jakarta.persistence.Query;
 import jakarta.persistence.TypedQuery;
 import java.util.ArrayList;
@@ -62,6 +63,13 @@ import 
org.springframework.transaction.annotation.Transactional;
 
 public class UserRepoExtImpl extends AbstractAnyRepoExt<User> implements 
UserRepoExt {
 
+    // The token column is a CLOB: a plain equality comparison is not 
supported by Oracle
+    // (ORA-22848), hence LIKE is used with the LIKE metacharacters escaped so 
that the token
+    // is still matched exactly; '#' is used as escape char as it works across 
all supported DBMS.
+    protected static String escapeForLike(final String value) {
+        return value == null ? null : value.replace("#", "##").replace("%", 
"#%").replace("_", "#_");
+    }
+
     protected final RoleDAO roleDAO;
 
     protected final AccessTokenDAO accessTokenDAO;
@@ -97,6 +105,21 @@ public class UserRepoExtImpl extends 
AbstractAnyRepoExt<User> implements UserRep
         this.securityProperties = securityProperties;
     }
 
+    @Transactional(readOnly = true)
+    @Override
+    public Optional<? extends User> findByToken(final String token) {
+        Query query = entityManager.createNativeQuery(
+                "SELECT id FROM " + JPAUser.TABLE + " WHERE token LIKE ? 
ESCAPE '#'");
+        query.setParameter(1, escapeForLike(token));
+
+        try {
+            return Optional.of(entityManager.find(JPAUser.class, 
query.getSingleResult()));
+        } catch (NoResultException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Transactional(readOnly = true)
     @Override
     public boolean isManager(final String key) {
         Query user = entityManager.createNativeQuery(
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
index 980e56fdce..1fe772530f 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
@@ -361,7 +361,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
         pushTask.setKey(null);
         pushTask.setName("Concurrent Export on resource-testdb2");
         pushTask.setDescription("Concurrent Export on resource-testdb2");
-        pushTask.getFilters().put(AnyTypeKind.USER.name(), 
"username!=puccini;username!=vivaldi");
+        pushTask.getFilters().put(AnyTypeKind.USER.name(), 
"username==rossini,username==verdi,username==bellini");
 
         ThreadPoolSettings tps = new ThreadPoolSettings();
         tps.setPoolSize(3);
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
index e92fef4575..71b27b7608 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.fit.core;
 
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -28,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.core.Response;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -679,16 +681,18 @@ public class SearchITCase extends AbstractITCase {
                 getTotalCount();
         assertTrue(usersWithNullable > 0);
 
-        long nonOrdered = USER_SERVICE.search(new 
AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
-                
fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").notNullValue().query()).build()).
-                getTotalCount();
-        assertTrue(nonOrdered > 0);
-
-        long orderedByNullable = USER_SERVICE.search(new 
AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
-                
fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").notNullValue().query()).
-                
orderBy(SyncopeClient.getOrderByClauseBuilder().asc("ctype").build()).build()).
-                getTotalCount();
-        assertEquals(nonOrdered, orderedByNullable);
+        
await().atMost(Duration.ofSeconds(MAX_WAIT_SECONDS)).pollInterval(Duration.ofSeconds(2)).untilAsserted(()
 -> {
+            long nonOrdered = USER_SERVICE.search(new 
AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
+                    
fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").notNullValue().query()).build()).
+                    getTotalCount();
+            assertTrue(nonOrdered > 0);
+
+            long orderedByNullable = USER_SERVICE.search(new 
AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
+                    
fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").notNullValue().query()).
+                    
orderBy(SyncopeClient.getOrderByClauseBuilder().asc("ctype").build()).build()).
+                    getTotalCount();
+            assertEquals(nonOrdered, orderedByNullable);
+        });
     }
 
     @Test
@@ -1006,7 +1010,7 @@ public class SearchITCase extends AbstractITCase {
         assertFalse(users.getResult().isEmpty());
         assertTrue(users.getResult().stream().
                 allMatch(u -> 
"[email protected]".equals(u.getPlainAttr("email").
-                orElseThrow().getValues().getFirst())));
+                        orElseThrow().getValues().getFirst())));
 
         // 1. create user with similar email
         UserTO user = 
createUser(UserITCase.getSample("[email protected]")).getEntity();
@@ -1028,7 +1032,7 @@ public class SearchITCase extends AbstractITCase {
         assertFalse(users.getResult().isEmpty());
         assertTrue(users.getResult().stream().
                 allMatch(u -> 
"[email protected]".equals(u.getPlainAttr("email").
-                orElseThrow().getValues().getFirst())));
+                        orElseThrow().getValues().getFirst())));
         assertTrue(users.getResult().stream().noneMatch(u -> 
user.getKey().equals(u.getKey())));
     }
 

Reply via email to