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

DATAKV-170 - Fix KeyValue.getCriteria() method name.

Browse Source 
Introduce KeyValue.getCriteria() method and deprecate KeyValue.getCritieria() for later removal. Use fixed method in affected classes.
This commit is contained in:
Mark Paluch
2017-04-20 13:03:53 +02:00
parent cc51ec8c47
commit 3f21f10d78
9 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/keyvalue/core/KeyValueTemplateUnitTests.java
View File

@@ -216,7 +216,7 @@ public class KeyValueTemplateUnitTests {
verify(adapterMock, times(1)).find(captor.capture(), eq(Foo.class.getName()), eq(Foo.class));
assertThat(captor.getValue().getOffset(), is(1L));
assertThat(captor.getValue().getRows(), is(5));
assertThat(captor.getValue().getCritieria(), nullValue());
assertThat(captor.getValue().getCriteria(), nullValue());
}
@Test // DATACMNS-525

2
src/test/java/org/springframework/data/keyvalue/core/SpelQueryEngineUnitTests.java
View File

@@ -99,7 +99,7 @@ public class SpelQueryEngineUnitTests {
SpelQueryCreator creator = new SpelQueryCreator(partTree, new ParametersParameterAccessor(
new QueryMethod(method, metadata, new SpelAwareProxyProjectionFactory()).getParameters(), args));
return new SpelCriteria(creator.createQuery().getCritieria(), new StandardEvaluationContext(args));
return new SpelCriteria(creator.createQuery().getCriteria(), new StandardEvaluationContext(args));
}
static interface PersonRepository {

4
src/test/java/org/springframework/data/keyvalue/repository/query/CachingKeyValuePartTreeQueryUnitTests.java
View File

@@ -68,8 +68,8 @@ public class CachingKeyValuePartTreeQueryUnitTests {
Object[] args = new Object[] { "foo" };
SpelCriteria first = (SpelCriteria) query.prepareQuery(args).getCritieria();
SpelCriteria second = (SpelCriteria) query.prepareQuery(args).getCritieria();
SpelCriteria first = (SpelCriteria) query.prepareQuery(args).getCriteria();
SpelCriteria second = (SpelCriteria) query.prepareQuery(args).getCriteria();
assertThat(first.getExpression(), sameInstance(second.getExpression()));
assertThat(first.getContext(), not(sameInstance(second.getContext())));

10
src/test/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQueryUnitTests.java
View File

@@ -64,8 +64,8 @@ public class KeyValuePartTreeQueryUnitTests {
Object[] args = new Object[] { "foo" };
Object first = query.prepareQuery(args).getCritieria();
Object second = query.prepareQuery(args).getCritieria();
Object first = query.prepareQuery(args).getCriteria();
Object second = query.prepareQuery(args).getCriteria();
assertThat(first, not(sameInstance(second)));
}
@@ -121,9 +121,9 @@ public class KeyValuePartTreeQueryUnitTests {
KeyValueQuery<?> query = partTreeQuery.prepareQuery(new Object[] { "firstname" });
assertThat(query.getCritieria(), is(notNullValue()));
assertThat(query.getCritieria(), IsInstanceOf.instanceOf(SpelCriteria.class));
assertThat(((SpelCriteria) query.getCritieria()).getExpression().getExpressionString(),
assertThat(query.getCriteria(), is(notNullValue()));
assertThat(query.getCriteria(), IsInstanceOf.instanceOf(SpelCriteria.class));
assertThat(((SpelCriteria) query.getCriteria()).getExpression().getExpressionString(),
is("#it?.firstname?.equals([0])"));
assertThat(query.getRows(), is(3));
}

4
src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java
View File

@@ -307,7 +307,7 @@ public class SpelQueryCreatorUnitTests {
}
private Evaluation evaluate(String methodName, Object... args) throws Exception {
return new Evaluation((SpelExpression) createQueryForMethodWithArgs(methodName, args).getCritieria());
return new Evaluation((SpelExpression) createQueryForMethodWithArgs(methodName, args).getCriteria());
}
private KeyValueQuery<SpelExpression> createQueryForMethodWithArgs(String methodName, Object... args)
@@ -329,7 +329,7 @@ public class SpelQueryCreatorUnitTests {
new QueryMethod(method, metadataMock, new SpelAwareProxyProjectionFactory()).getParameters(), args));
KeyValueQuery<SpelExpression> q = creator.createQuery();
q.getCritieria().setEvaluationContext(new StandardEvaluationContext(args));
q.getCriteria().setEvaluationContext(new StandardEvaluationContext(args));
return q;
}