diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java index 1b0c6f331..f244a5cac 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisSet.java @@ -67,34 +67,34 @@ public class DefaultRedisSet extends AbstractRedisCollection implements Re } @Override - public Set diff(Collection> sets) { + public Set diff(Collection> sets) { return boundSetOps.diff(CollectionUtils.extractKeys(sets)); } @Override - public RedisSet diffAndStore(String destKey, Collection> sets) { + public RedisSet diffAndStore(String destKey, Collection> sets) { boundSetOps.diffAndStore(destKey, CollectionUtils.extractKeys(sets)); return new DefaultRedisSet(boundSetOps.getOperations().forSet(destKey)); } @Override - public Set intersect(Collection> sets) { + public Set intersect(Collection> sets) { return boundSetOps.intersect(CollectionUtils.extractKeys(sets)); } @Override - public RedisSet intersectAndStore(String destKey, Collection> sets) { + public RedisSet intersectAndStore(String destKey, Collection> sets) { boundSetOps.intersectAndStore(destKey, CollectionUtils.extractKeys(sets)); return new DefaultRedisSet(boundSetOps.getOperations().forSet(destKey)); } @Override - public Set union(Collection> sets) { + public Set union(Collection> sets) { return boundSetOps.union(CollectionUtils.extractKeys(sets)); } @Override - public RedisSet unionAndStore(String destKey, Collection> sets) { + public RedisSet unionAndStore(String destKey, Collection> sets) { boundSetOps.unionAndStore(destKey, CollectionUtils.extractKeys(sets)); return new DefaultRedisSet(boundSetOps.getOperations().forSet(destKey)); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java index c2cf4f095..243a65131 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisZSet.java @@ -91,7 +91,7 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R } @Override - public RedisZSet intersectAndStore(String destKey, Collection> sets) { + public RedisZSet intersectAndStore(String destKey, Collection> sets) { boundZSetOps.intersectAndStore(destKey, CollectionUtils.extractKeys(sets)); return new DefaultRedisZSet(boundZSetOps.getOperations().forZSet(destKey), getDefaultScore()); } @@ -124,7 +124,7 @@ public class DefaultRedisZSet extends AbstractRedisCollection implements R } @Override - public RedisZSet unionAndStore(String destKey, Collection> sets) { + public RedisZSet unionAndStore(String destKey, Collection> sets) { boundZSetOps.unionAndStore(destKey, CollectionUtils.extractKeys(sets)); return new DefaultRedisZSet(boundZSetOps.getOperations().forZSet(destKey), getDefaultScore()); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java index 21b13bb73..a38d20280 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisSet.java @@ -26,15 +26,15 @@ import java.util.Set; */ public interface RedisSet extends RedisStore, Set { - Set intersect(Collection> sets); + Set intersect(Collection> sets); - Set union(Collection> sets); + Set union(Collection> sets); - Set diff(Collection> sets); + Set diff(Collection> sets); - RedisSet intersectAndStore(String destKey, Collection> sets); + RedisSet intersectAndStore(String destKey, Collection> sets); - RedisSet unionAndStore(String destKey, Collection> sets); + RedisSet unionAndStore(String destKey, Collection> sets); - RedisSet diffAndStore(String destKey, Collection> sets); + RedisSet diffAndStore(String destKey, Collection> sets); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java index 8a67bd936..bcc17fe6f 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/RedisZSet.java @@ -29,9 +29,9 @@ import java.util.SortedSet; */ public interface RedisZSet extends RedisStore, Set { - RedisZSet intersectAndStore(String destKey, Collection> sets); + RedisZSet intersectAndStore(String destKey, Collection> sets); - RedisZSet unionAndStore(String destKey, Collection> sets); + RedisZSet unionAndStore(String destKey, Collection> sets); Set range(long start, long end); diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java index 483a846d3..c8ca6f707 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisSetTests.java @@ -29,8 +29,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.core.BoundSetOperations; import org.springframework.data.keyvalue.redis.core.RedisTemplate; -import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisSet; -import org.springframework.data.keyvalue.redis.support.collections.RedisSet; /** * Integration test for Redis set. @@ -80,7 +78,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe diffSet1.add(t2); diffSet2.add(t3); - Set diff = set.diff(diffSet1, diffSet2); + Set diff = set.diff(Arrays.asList(diffSet1, diffSet2)); assertEquals(1, diff.size()); assertThat(diff, hasItem(t1)); } @@ -104,7 +102,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe diffSet2.add(t4); String resultName = "test:set:diff:result:1"; - RedisSet diff = set.diffAndStore(resultName, diffSet1, diffSet2); + RedisSet diff = set.diffAndStore(resultName, Arrays.asList(diffSet1, diffSet2)); assertEquals(1, diff.size()); assertThat(diff, hasItem(t1)); @@ -130,7 +128,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe intSet2.add(t2); intSet2.add(t3); - Set inter = set.intersect(intSet1, intSet2); + Set inter = set.intersect(Arrays.asList(intSet1, intSet2)); assertEquals(1, inter.size()); assertThat(inter, hasItem(t2)); } @@ -155,7 +153,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe intSet2.add(t3); String resultName = "test:set:intersect:result:1"; - RedisSet inter = set.intersectAndStore(resultName, intSet1, intSet2); + RedisSet inter = set.intersectAndStore(resultName, Arrays.asList(intSet1, intSet2)); assertEquals(1, inter.size()); assertThat(inter, hasItem(t2)); assertEquals(resultName, inter.getKey()); @@ -178,7 +176,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe unionSet1.add(t4); unionSet2.add(t3); - Set union = set.union(unionSet1, unionSet2); + Set union = set.union(Arrays.asList(unionSet1, unionSet2)); assertEquals(4, union.size()); assertThat(union, hasItems(t1, t2, t3, t4)); } @@ -201,7 +199,7 @@ public abstract class AbstractRedisSetTests extends AbstractRedisCollectionTe unionSet2.add(t3); String resultName = "test:set:union:result:1"; - RedisSet union = set.unionAndStore(resultName, unionSet1, unionSet2); + RedisSet union = set.unionAndStore(resultName, Arrays.asList(unionSet1, unionSet2)); assertEquals(4, union.size()); assertThat(union, hasItems(t1, t2, t3, t4)); assertEquals(resultName, union.getKey()); diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java index e0756199f..1e29571d5 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/AbstractRedisZSetTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.*; import static org.junit.Assume.*; import static org.junit.matchers.JUnitMatchers.*; +import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Set; @@ -27,8 +28,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.keyvalue.redis.core.BoundZSetOperations; import org.springframework.data.keyvalue.redis.core.RedisTemplate; -import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisZSet; -import org.springframework.data.keyvalue.redis.support.collections.RedisZSet; /** * Integration test for Redis ZSet. @@ -208,7 +207,7 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe interSet2.add(t3, 3); String resultName = "test:zset:inter:result:1"; - RedisZSet inter = zSet.intersectAndStore(resultName, interSet1, interSet2); + RedisZSet inter = zSet.intersectAndStore(resultName, Arrays.asList(interSet1, interSet2)); assertEquals(1, inter.size()); assertThat(inter, hasItem(t2)); @@ -328,7 +327,7 @@ public abstract class AbstractRedisZSetTest extends AbstractRedisCollectionTe unionSet2.add(t3, 6); String resultName = "test:zset:union:result:1"; - RedisZSet union = zSet.unionAndStore(resultName, unionSet1, unionSet2); + RedisZSet union = zSet.unionAndStore(resultName, Arrays.asList(unionSet1, unionSet2)); assertEquals(4, union.size()); assertThat(union, hasItems(t1, t2, t3, t4)); assertEquals(resultName, union.getKey());