Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-1608 - Add guard against NPE in MongoQueryCreator when using IgnoreCase.

Browse Source 
Original Pull Request: #439
This commit is contained in:
Edward Prentice
2017-02-07 21:27:40 +00:00
committed by Christoph Strobl
parent 439616c788
commit eacfd2c172
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
View File

@@ -55,6 +55,7 @@ import org.springframework.util.ClassUtils;
* @author Oliver Gierke * @author Oliver Gierke
* @author Thomas Darimont * @author Thomas Darimont
* @author Christoph Strobl * @author Christoph Strobl
* @author Edward Prentice
*/ */
class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> { class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
@@ -297,7 +298,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
criteria = criteria.not(); criteria = criteria.not();
} }
return addAppropriateLikeRegexTo(criteria, part, parameters.next().toString()); Object next = parameters.next();
return addAppropriateLikeRegexTo(criteria, part, next != null ? next.toString() : "");
case NEVER: case NEVER:
// intentional no-op // intentional no-op

13
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
View File

@@ -66,6 +66,8 @@ import org.springframework.test.util.ReflectionTestUtils;
* @author Thomas Darimont * @author Thomas Darimont
* @author Christoph Strobl * @author Christoph Strobl
* @author Mark Paluch * @author Mark Paluch
* @author Fırat KÜÇÜK
* @author Edward Prentice
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
public abstract class AbstractPersonRepositoryIntegrationTests { public abstract class AbstractPersonRepositoryIntegrationTests {
@@ -712,6 +714,17 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS)); assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS));
} }
/***
* @see DATAMONGO-1608
*/
@Test
public void findByFirstNameIgnoreCaseWithNull() {
List<Person> result = repository.findByFirstnameIgnoreCase(null);
assertThat(result.size(), is(0));
}
/** /**
* @see DATAMONGO-770 * @see DATAMONGO-770
*/ */