From 256bb16dba59df807115b554b0e8e46c3baef7c0 Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@pivotal.io>
Date: Tue, 4 Jul 2017 22:02:14 +0200
Subject: [PATCH] DATAKV-185 - Polishing.

Fix NPE by now returning an expression that always resolves to true.
---
 .../keyvalue/repository/query/SpelQueryCreator.java    |  2 +-
 .../repository/query/SpelQueryCreatorUnitTests.java    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java b/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
index 4f69f9a..28bb9af 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
@@ -214,7 +214,7 @@ public class SpelQueryCreator extends AbstractQueryCreator<KeyValueQuery<SpelExp
 			}
 		}
 
-		return !StringUtils.hasText(sb) ? null : PARSER.parseRaw(sb.toString());
+		return StringUtils.hasText(sb) ? PARSER.parseRaw(sb.toString()) : PARSER.parseRaw("true");
 	}
 
 	private static boolean requiresInverseLookup(Part part) {
diff --git a/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java
index 8491c66..b0f1547 100644
--- a/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java
+++ b/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java
@@ -306,6 +306,13 @@ public class SpelQueryCreatorUnitTests {
 		assertThat(evaluate("findByFirstnameIn", list).against(new Person(null, 10)), is(true));
 	}
 
+	@Test // DATAKV-185
+	public void noDerivedQueryArgumentsMatchesAlways() throws Exception {
+
+		assertThat(evaluate("findBy").against(JON), is(true));
+		assertThat(evaluate("findBy").against(null), is(true));
+	}
+
 	private Evaluation evaluate(String methodName, Object... args) throws Exception {
 		return new Evaluation((SpelExpression) createQueryForMethodWithArgs(methodName, args).getCriteria());
 	}
@@ -336,6 +343,9 @@ public class SpelQueryCreatorUnitTests {
 
 	static interface PersonRepository {
 
+		// No arguments
+		Person findBy();
+
 		// Type.SIMPLE_PROPERTY
 		Person findByFirstname(String firstname);