From 2dc11f550118fc6741d217da090e0597e1d8deb0 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Wed, 8 Dec 2010 22:47:21 +0200
Subject: [PATCH] + rename diff to differentiate

---
 .../data/keyvalue/redis/core/DefaultBoundSetOperations.java   | 4 ++--
 .../data/keyvalue/redis/core/RedisTemplate.java               | 4 ++--
 .../data/keyvalue/redis/core/SetOperations.java               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java
index 2caed3155..5d0ca9a23 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundSetOperations.java
@@ -47,12 +47,12 @@ class DefaultBoundSetOperations<K, V> extends DefaultKeyBound<K> implements Boun
 
 	@Override
 	public Set<V> diff(Collection<K> keys) {
-		return ops.diff(getKey(), keys);
+		return ops.difference(getKey(), keys);
 	}
 
 	@Override
 	public void diffAndStore(K destKey, Collection<K> keys) {
-		ops.diffAndStore(getKey(), destKey, keys);
+		ops.differenceAndStore(getKey(), destKey, keys);
 	}
 
 	@Override
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
index 59387c1f2..9c5bdbf50 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
@@ -960,7 +960,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 
 		@Override
-		public Set<V> diff(final K key, final Collection<K> keys) {
+		public Set<V> difference(final K key, final Collection<K> keys) {
 			final byte[][] rawKeys = rawKeys(key, keys);
 			Set<byte[]> rawValues = execute(new RedisCallback<Set<byte[]>>() {
 				@Override
@@ -973,7 +973,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 
 		@Override
-		public void diffAndStore(final K key, K destKey, final Collection<K> keys) {
+		public void differenceAndStore(final K key, K destKey, final Collection<K> keys) {
 			final byte[][] rawKeys = rawKeys(key, keys);
 			final byte[] rawDestKey = rawKey(destKey);
 			execute(new RedisCallback<Object>() {
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java
index a16e44407..6d3e414de 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/SetOperations.java
@@ -26,9 +26,9 @@ import java.util.Set;
  */
 public interface SetOperations<K, V> {
 
-	Set<V> diff(K key, Collection<K> keys);
+	Set<V> difference(K key, Collection<K> keys);
 
-	void diffAndStore(K key, K destKey, Collection<K> keys);
+	void differenceAndStore(K key, K destKey, Collection<K> keys);
 
 	Set<V> intersect(K key, Collection<K> keys);