From d73a0e1677e7379a97060cb624c9841ba6a7c7a4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 15 May 2018 15:14:55 +0200
Subject: [PATCH] DATAREDIS-771 - Add support for IsTrue and IsFalse keywords
 in repository query methods.

We now support IsTrue and IsFalse keywords usage in repository query methods to create queries with predicates for boolean fields values without requiring to pass a boolean argument.

class Person {

    @Id String id;

    @Indexed Boolean alive;
}

interface PersonRepository extends Repository<Person, String> {

    Person findByAliveIsTrue();

    Person findByAliveIsFalse();
}

Original Pull Request: #342
---
 src/main/asciidoc/new-features.adoc           |  1 +
 .../repository/query/RedisQueryCreator.java   |  6 ++++
 .../RedisRepositoryIntegrationTestBase.java   | 21 ++++++++++++++
 .../query/RedisQueryCreatorUnitTests.java     | 28 +++++++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 9c1ec669e..8bad4f155 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -15,6 +15,7 @@ This section briefly covers items that are new and noteworthy in the latest rele
 * `BITFIELD`, `BITPOS`, and `OBJECT` command support.
 * Align return types of `BoundZSetOperations` with `ZSetOperations`.
 * Reactive `SCAN`, `HSCAN`, `SSCAN`, and `ZSCAN` support.
+* Usage of `IsTrue` and `IsFalse` keywords in repository query methods.
 
 [[new-in-2.0.0]]
 == New in Spring Data Redis 2.0
diff --git a/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java b/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
index 6163d83b6..01d86f9a4 100644
--- a/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
+++ b/src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
@@ -59,6 +59,12 @@ public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisO
 			case SIMPLE_PROPERTY:
 				sink.sismember(part.getProperty().toDotPath(), iterator.next());
 				break;
+			case TRUE:
+				sink.sismember(part.getProperty().toDotPath(), true);
+				break;
+			case FALSE:
+				sink.sismember(part.getProperty().toDotPath(), false);
+				break;
 			case WITHIN:
 			case NEAR:
 				sink.near(getNearPath(part, iterator));
diff --git a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java
index 8d526b5fa..a7e4d1828 100644
--- a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java
+++ b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java
@@ -224,6 +224,24 @@ public abstract class RedisRepositoryIntegrationTestBase {
 		assertThat(repo.findBy(firstPage.nextPageable()).getContent(), hasSize(1));
 	}
 
+	@Test // DATAREDIS-771
+	public void shouldFindByBooleanIsTrue() {
+
+		Person eddard = new Person("eddard", "stark");
+		eddard.setAlive(true);
+
+		Person robb = new Person("robb", "stark");
+		robb.setAlive(false);
+		Person jon = new Person("jon", "snow");
+
+		repo.saveAll(Arrays.asList(eddard, robb, jon));
+
+		List<Person> result = repo.findPersonByAliveIsTrue();
+
+		assertThat(result, hasSize(1));
+		assertThat(result, contains(eddard));
+	}
+
 	@Test // DATAREDIS-547
 	public void shouldReturnEmptyListWhenPageableOutOfBoundsUsingFindAll() {
 
@@ -374,6 +392,8 @@ public abstract class RedisRepositoryIntegrationTestBase {
 
 		Page<Person> findPersonByLastname(String lastname, Pageable page);
 
+		List<Person> findPersonByAliveIsTrue();
+
 		List<Person> findByFirstnameAndLastname(String firstname, String lastname);
 
 		List<Person> findByFirstnameOrLastname(String firstname, String lastname);
@@ -429,6 +449,7 @@ public abstract class RedisRepositoryIntegrationTestBase {
 
 		@Id String id;
 		@Indexed String firstname;
+		@Indexed Boolean alive;
 		String lastname;
 		@Reference City city;
 		City hometown;
diff --git a/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java b/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java
index 27e3a8992..c330cc8e2 100644
--- a/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java
@@ -173,6 +173,30 @@ public class RedisQueryCreatorUnitTests {
 		creator.createQuery();
 	}
 
+	@Test // DATAREDIS-771
+	public void findByBooleanIsTrue() throws SecurityException, NoSuchMethodException {
+
+		RedisQueryCreator creator = createQueryCreatorForMethodWithArgs(
+				SampleRepository.class.getMethod("findByAliveIsTrue"), new Object[0]);
+
+		KeyValueQuery<RedisOperationChain> query = creator.createQuery();
+
+		assertThat(query.getCriteria().getSismember(), hasSize(1));
+		assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("alive", true)));
+	}
+
+	@Test // DATAREDIS-771
+	public void findByBooleanIsFalse() throws SecurityException, NoSuchMethodException {
+
+		RedisQueryCreator creator = createQueryCreatorForMethodWithArgs(
+				SampleRepository.class.getMethod("findByAliveIsFalse"), new Object[0]);
+
+		KeyValueQuery<RedisOperationChain> query = creator.createQuery();
+
+		assertThat(query.getCriteria().getSismember(), hasSize(1));
+		assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("alive", false)));
+	}
+
 	private RedisQueryCreator createQueryCreatorForMethodWithArgs(Method method, Object[] args) {
 
 		PartTree partTree = new PartTree(method.getName(), method.getReturnType());
@@ -190,6 +214,10 @@ public class RedisQueryCreatorUnitTests {
 
 		Person findByAgeOrFirstname(Integer age, String firstname);
 
+		Person findByAliveIsTrue();
+
+		Person findByAliveIsFalse();
+
 		Person findByLocationWithin(Circle circle);
 
 		Person findByLocationNear(Point point, Distance distance);