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
commit 9dc2f980aabd6db4111b6fa2a52dd73f44185d40 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu Nov 12 12:56:24 2026 +0100 Attempting to fix IT issues --- .../persistence/jpa/dao/repo/UserRepoExtImpl.java | 11 +++++++-- .../org/apache/syncope/fit/AbstractITCase.java | 2 +- .../apache/syncope/fit/core/PushTaskITCase.java | 2 +- .../org/apache/syncope/fit/core/SearchITCase.java | 28 ++++++++++++---------- 4 files changed, 27 insertions(+), 16 deletions(-) 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 59ca4532e3..7f2d354309 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 @@ -96,18 +96,25 @@ public class UserRepoExtImpl extends AbstractAnyRepoExt<User> implements UserRep this.securityProperties = securityProperties; } + // 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("_", "#_"); + } + @Transactional(readOnly = true) @Override public Optional<String> findByToken(final String token) { return query( - "SELECT id FROM " + JPAUser.TABLE + " WHERE token = ?", + "SELECT id FROM " + JPAUser.TABLE + " WHERE token LIKE ? ESCAPE '#'", rs -> { if (rs.next()) { return Optional.of(rs.getString(1)); } return Optional.empty(); }, - token); + escapeForLike(token)); } @Transactional(readOnly = true) diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java index 5155b9ac31..d0e725dfcd 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java @@ -611,7 +611,7 @@ public abstract class AbstractITCase { protected static void awaitIfExtSearchEnabled() { if (IS_EXT_SEARCH_ENABLED) { - await().atMost(Duration.ofSeconds(2)).pollInterval(Duration.ofSeconds(1)).until(() -> true); + await().atMost(Duration.ofSeconds(3)).pollInterval(Duration.ofSeconds(1)).until(() -> true); } } 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 5f04b0aecf..fb187c08f3 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 @@ -360,7 +360,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 7bb5dccf07..b8c2155e3e 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; @@ -649,16 +651,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 @@ -946,7 +950,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(); @@ -962,7 +966,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()))); }
