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

DATAREDIS-633 - Adapt to renamed KeyValueQuery.getCriteria() method.

Browse Source 
Original Pull Request: #246
This commit is contained in:
Mark Paluch
2017-04-20 13:15:07 +02:00
committed by Christoph Strobl
parent cba88f4573
commit a382fb4a42
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015 the original author or authors.
* Copyright 2015-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import org.springframework.util.CollectionUtils;
/**
* Redis specific {@link QueryEngine} implementation.
*
*
* @author Christoph Strobl
* @author Mark Paluch
* @since 1.7
@@ -60,7 +60,7 @@ class RedisQueryEngine extends QueryEngine<RedisKeyValueAdapter, RedisOperationC
/**
* Creates new {@link RedisQueryEngine}.
*
*
* @param criteriaAccessor
* @param sortAccessor
* @see QueryEngine#QueryEngine(CriteriaAccessor, SortAccessor)
@@ -219,7 +219,7 @@ class RedisQueryEngine extends QueryEngine<RedisKeyValueAdapter, RedisOperationC
@Override
public RedisOperationChain resolve(KeyValueQuery<?> query) {
return (RedisOperationChain) query.getCritieria();
return (RedisOperationChain) query.getCriteria();
}
}
}

15
src/main/java/org/springframework/data/redis/repository/query/RedisQueryCreator.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 the original author or authors.
* Copyright 2015-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,8 +33,9 @@ import org.springframework.util.CollectionUtils;
/**
* Redis specific query creator.
*
*
* @author Christoph Strobl
* @author Mark Paluch
* @since 1.7
*/
public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisOperationChain>, RedisOperationChain> {
@@ -97,12 +98,12 @@ public class RedisQueryCreator extends AbstractQueryCreator<KeyValueQuery<RedisO
KeyValueQuery<RedisOperationChain> query = new KeyValueQuery<RedisOperationChain>(criteria);
if (query.getCritieria() != null && !CollectionUtils.isEmpty(query.getCritieria().getSismember())
&& !CollectionUtils.isEmpty(query.getCritieria().getOrSismember()))
if (query.getCritieria().getSismember().size() == 1 && query.getCritieria().getOrSismember().size() == 1) {
if (query.getCriteria() != null && !CollectionUtils.isEmpty(query.getCriteria().getSismember())
&& !CollectionUtils.isEmpty(query.getCriteria().getOrSismember()))
if (query.getCriteria().getSismember().size() == 1 && query.getCriteria().getOrSismember().size() == 1) {
query.getCritieria().getOrSismember().add(query.getCritieria().getSismember().iterator().next());
query.getCritieria().getSismember().clear();
query.getCriteria().getOrSismember().add(query.getCriteria().getSismember().iterator().next());
query.getCriteria().getSismember().clear();
}
if (sort != null) {

35
src/test/java/org/springframework/data/redis/repository/query/RedisQueryCreatorUnitTests.java
View File

@@ -45,6 +45,7 @@ import org.springframework.data.repository.query.parser.PartTree;
/**
* @author Christoph Strobl
* @author Mark Paluch
*/
public class RedisQueryCreatorUnitTests {
@@ -60,8 +61,8 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getSismember(), hasSize(1));
assertThat(query.getCritieria().getSismember(), hasItem(new PathAndValue("firstname", "eddard")));
assertThat(query.getCriteria().getSismember(), hasSize(1));
assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("firstname", "eddard")));
}
@Test // DATAREDIS-425
@@ -73,9 +74,9 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getSismember(), hasSize(2));
assertThat(query.getCritieria().getSismember(), hasItem(new PathAndValue("firstname", "eddard")));
assertThat(query.getCritieria().getSismember(), hasItem(new PathAndValue("age", 43)));
assertThat(query.getCriteria().getSismember(), hasSize(2));
assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("firstname", "eddard")));
assertThat(query.getCriteria().getSismember(), hasItem(new PathAndValue("age", 43)));
}
@Test // DATAREDIS-425
@@ -87,9 +88,9 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getOrSismember(), hasSize(2));
assertThat(query.getCritieria().getOrSismember(), hasItem(new PathAndValue("age", 43)));
assertThat(query.getCritieria().getOrSismember(), hasItem(new PathAndValue("firstname", "eddard")));
assertThat(query.getCriteria().getOrSismember(), hasSize(2));
assertThat(query.getCriteria().getOrSismember(), hasItem(new PathAndValue("age", 43)));
assertThat(query.getCriteria().getOrSismember(), hasItem(new PathAndValue("firstname", "eddard")));
}
@Test // DATAREDIS-533
@@ -101,9 +102,9 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getNear(), is(notNullValue()));
assertThat(query.getCritieria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCritieria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
assertThat(query.getCriteria().getNear(), is(notNullValue()));
assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
}
@Test // DATAREDIS-533
@@ -115,9 +116,9 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getNear(), is(notNullValue()));
assertThat(query.getCritieria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCritieria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
assertThat(query.getCriteria().getNear(), is(notNullValue()));
assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
}
@Test // DATAREDIS-533
@@ -129,9 +130,9 @@ public class RedisQueryCreatorUnitTests {
KeyValueQuery<RedisOperationChain> query = creator.createQuery();
assertThat(query.getCritieria().getNear(), is(notNullValue()));
assertThat(query.getCritieria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCritieria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
assertThat(query.getCriteria().getNear(), is(notNullValue()));
assertThat(query.getCriteria().getNear().getPoint(), is(new Point(1, 2)));
assertThat(query.getCriteria().getNear().getDistance(), is(new Distance(200, Metrics.KILOMETERS)));
}
@Test // DATAREDIS-533