From f96e6523188e019b84efb4f245463bae995f36f4 Mon Sep 17 00:00:00 2001
From: Pavel Seda <441048@mail.muni.cz>
Date: Tue, 20 Aug 2019 15:19:33 +0200
Subject: [PATCH] evaluate querydsl expressions as and.
---
.../ics/kypo/userandgroup/repository/IDMGroupRepository.java | 2 +-
.../muni/ics/kypo/userandgroup/repository/RoleRepository.java | 2 +-
.../muni/ics/kypo/userandgroup/repository/UserRepository.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/IDMGroupRepository.java b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/IDMGroupRepository.java
index ecb68fbd..9601ad0e 100644
--- a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/IDMGroupRepository.java
+++ b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/IDMGroupRepository.java
@@ -43,7 +43,7 @@ public interface IDMGroupRepository extends JpaRepository<IDMGroup, Long>,
default void customize(QuerydslBindings querydslBindings, QIDMGroup qIDMGroup) {
querydslBindings.bind(String.class).all((StringPath path, Collection<? extends String> values) -> {
BooleanBuilder predicate = new BooleanBuilder();
- values.forEach(value -> predicate.or(path.containsIgnoreCase(value)));
+ values.forEach(value -> predicate.and(path.containsIgnoreCase(value)));
return Optional.ofNullable(predicate);
});
}
diff --git a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/RoleRepository.java b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/RoleRepository.java
index 60efe1ba..d2d8919d 100644
--- a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/RoleRepository.java
+++ b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/RoleRepository.java
@@ -40,7 +40,7 @@ public interface RoleRepository extends JpaRepository<Role, Long>,
default void customize(QuerydslBindings querydslBindings, QRole qRole) {
querydslBindings.bind(String.class).all((StringPath path, Collection<? extends String> values) -> {
BooleanBuilder predicate = new BooleanBuilder();
- values.forEach(value -> predicate.or(path.containsIgnoreCase(value)));
+ values.forEach(value -> predicate.and(path.containsIgnoreCase(value)));
return Optional.ofNullable(predicate);
});
}
diff --git a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/UserRepository.java b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/UserRepository.java
index 1af46a29..a79e9a05 100644
--- a/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/UserRepository.java
+++ b/kypo2-persistence-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/repository/UserRepository.java
@@ -44,7 +44,7 @@ public interface UserRepository extends JpaRepository<User, Long>,
default void customize(QuerydslBindings querydslBindings, QUser qUser) {
querydslBindings.bind(String.class).all((StringPath path, Collection<? extends String> values) -> {
BooleanBuilder predicate = new BooleanBuilder();
- values.forEach(value -> predicate.or(path.containsIgnoreCase(value)));
+ values.forEach(value -> predicate.and(path.containsIgnoreCase(value)));
return Optional.ofNullable(predicate);
});
}
--
GitLab