From be74bbebdefd842b6cedc59332b6d749879da557 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Apr 2017 13:15:07 +0200 Subject: [PATCH] DATAREDIS-633 - Adapt to renamed KeyValueQuery.getCriteria() method. Original Pull Request: #246 --- .../data/redis/core/RedisQueryEngine.java | 8 ++--- .../repository/query/RedisQueryCreator.java | 15 ++++---- .../query/RedisQueryCreatorUnitTests.java | 35 ++++++++++--------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java b/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java index 97ee20557..50d8f482c 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java +++ b/src/main/java/org/springframework/data/redis/core/RedisQueryEngine.java @@ -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 query) { - return (RedisOperationChain) query.getCritieria(); + return (RedisOperationChain) query.getCriteria(); } } } 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 aa4b15f40..ddcef5f06 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 @@ -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, RedisOperationChain> { @@ -97,12 +98,12 @@ public class RedisQueryCreator extends AbstractQueryCreator query = new KeyValueQuery(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) { 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 5c9717ee3..0cf67724a 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 @@ -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 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 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 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 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 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 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