DATAREDIS-277 - Add support for 'SLAVEOF'.

docs/src/reference/docbook/appendix/appendix-command-reference.xml

@@ -138,7 +138,7 @@
 				<row><entry><code>SINTER</code></entry><entry>X</entry></row>
 				<row><entry><code>SINTERSTORE</code></entry><entry>X</entry></row>
 				<row><entry><code>SISMEMBER</code></entry><entry>X</entry></row>
-				<row><entry><code>SLAVEOF</code></entry><entry>-</entry></row>
+				<row><entry><code>SLAVEOF</code></entry><entry>X</entry></row>
 				<row><entry><code>SLOWLOG</code></entry><entry>-</entry></row>
 				<row><entry><code>SMEMBERS</code></entry><entry>X</entry></row>
 				<row><entry><code>SMOVE</code></entry><entry>X</entry></row>

gradle.properties

@@ -4,7 +4,7 @@ jredisVersion=06052013
 jedisVersion=2.4.1
 springVersion=3.2.8.RELEASE
 log4jVersion=1.2.17
-version=1.3.0.BUILD-SNAPSHOT
+version=1.3.0.DATAREDIS-277-SNAPSHOT
 srpVersion=0.7
 jacksonVersion=1.8.8
 fasterXmlJacksonVersion=2.2.0

src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java

@@ -2197,6 +2197,24 @@ public List<RedisClientInfo> getClientList() {
 		return this.delegate.getClientList();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
+	 */
+	@Override
+	public void slaveOf(String host, int port) {
+		this.delegate.slaveOf(host, port);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+		this.delegate.slaveOfNoOne();
+	}
+
 	/**
 	 * Specifies if pipelined and tx results should be deserialized to Strings. If false, results of
 	 * {@link #closePipeline()} and {@link #exec()} will be of the type returned by the underlying connection

src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java

@@ -165,7 +165,7 @@ public enum ShutdownOption {
 	Long time();
 
 	/**
-	 * Closes a given client connection identified by {@literal ip:port}.
+	 * <<<<<<< HEAD Closes a given client connection identified by {@literal ip:port}.
 	 * 
 	 * @param host of connection to close.
 	 * @param port of connection to close
@@ -197,4 +197,22 @@ public enum ShutdownOption {
 	 * @see http://redis.io/commands/client-list
 	 */
 	List<RedisClientInfo> getClientList();
+
+	/**
+	 * Change redis replication setting to new master.
+	 * 
+	 * @param host
+	 * @param port
+	 * @since 1.3
+	 * @see http://redis.io/commands/slaveof
+	 */
+	void slaveOf(String host, int port);
+
+	/**
+	 * Change server into master.
+	 * 
+	 * @since 1.3
+	 * @see http://redis.io/commands/slaveof
+	 */
+	void slaveOfNoOne();
 }

src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java

@@ -2051,8 +2051,7 @@ public Double zIncrBy(byte[] key, double increment, byte[] value) {
 
 	public Long zInterStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) {
 		try {
-			ZParams zparams = new ZParams().weights(weights).aggregate(
-					redis.clients.jedis.ZParams.Aggregate.valueOf(aggregate.name()));
+			ZParams zparams = new ZParams().weights(weights).aggregate(ZParams.Aggregate.valueOf(aggregate.name()));
 
 			if (isPipelined()) {
 				pipeline(new JedisResult(pipeline.zinterstore(destKey, zparams, sets)));
@@ -2382,8 +2381,7 @@ public Double zScore(byte[] key, byte[] value) {
 
 	public Long zUnionStore(byte[] destKey, Aggregate aggregate, int[] weights, byte[]... sets) {
 		try {
-			ZParams zparams = new ZParams().weights(weights).aggregate(
-					redis.clients.jedis.ZParams.Aggregate.valueOf(aggregate.name()));
+			ZParams zparams = new ZParams().weights(weights).aggregate(ZParams.Aggregate.valueOf(aggregate.name()));
 
 			if (isPipelined()) {
 				pipeline(new JedisResult(pipeline.zunionstore(destKey, zparams, sets)));
@@ -2830,6 +2828,23 @@ public void killClient(String host, int port) {
 		}
 	}
 
+	/*
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
+	 */
+	@Override
+	public void slaveOf(String host, int port) {
+
+		Assert.hasText(host, "Host must not be null for 'SLAVEOF' command.");
+		if (isQueueing() || isPipelined()) {
+			throw new UnsupportedOperationException("'SLAVEOF' cannot be called in pipline / transaction mode.");
+		}
+		try {
+			this.jedis.slaveof(host, port);
+		} catch (Exception e) {
+			throw convertJedisAccessException(e);
+		}
+	}
+
 	/*
 	* @see org.springframework.data.redis.connection.RedisServerCommands#setClientName(java.lang.String)
 	*/
@@ -2868,6 +2883,23 @@ public List<RedisClientInfo> getClientList() {
 		return JedisConverters.toListOfRedisClientInformation(this.jedis.clientList());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+
+		if (isQueueing() || isPipelined()) {
+			throw new UnsupportedOperationException("'SLAVEOF' cannot be called in pipline / transaction mode.");
+		}
+		try {
+			this.jedis.slaveofNoOne();
+		} catch (Exception e) {
+			throw convertJedisAccessException(e);
+		}
+	}
+
 	/**
 	 * Specifies if pipelined results should be converted to the expected data type. If false, results of
 	 * {@link #closePipeline()} and {@link #exec()} will be of the type returned by the Jedis driver

src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java

@@ -1197,6 +1197,20 @@ public void setClientName(byte[] name) {
 		throw new UnsupportedOperationException("'CLIENT SETNAME' is not supported by the JRedis driver.");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
+	 */
+	@Override
+	public void slaveOf(String host, int port) {
+
+		try {
+			this.jredis.slaveof(host, port);
+		} catch (Exception e) {
+			throw convertJredisAccessException(e);
+		}
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
@@ -1209,4 +1223,17 @@ public String getClientName() {
 	public List<RedisClientInfo> getClientList() {
 		throw new UnsupportedOperationException();
 	}
+
+	/*
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+
+		try {
+			this.jredis.slaveofnone();
+		} catch (Exception e) {
+			throw convertJredisAccessException(e);
+		}
+	}
 }

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

@@ -2939,6 +2939,29 @@ public void setClientName(byte[] name) {
 		getAsyncConnection().clientSetname(name);
 	}
 
+	/*
+	* (non-Javadoc)
+	* @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
+	*/
+	@Override
+	public void slaveOf(String host, int port) {
+
+		Assert.hasText(host, "Host must not be null for 'SLAVEOF' command.");
+		try {
+			if (isPipelined()) {
+				pipeline(new LettuceStatusResult(getAsyncConnection().slaveof(host, port)));
+				return;
+			}
+			if (isQueueing()) {
+				transaction(new LettuceTxResult(getConnection().slaveof(host, port)));
+				return;
+			}
+			getConnection().slaveof(host, port);
+		} catch (Exception ex) {
+			throw convertLettuceAccessException(ex);
+		}
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
@@ -2978,6 +3001,27 @@ public List<RedisClientInfo> getClientList() {
 		return LettuceConverters.toListOfRedisClientInformation(getConnection().clientList());
 	}
 
+	/*
+		* @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+
+		try {
+			if (isPipelined()) {
+				pipeline(new LettuceStatusResult(getAsyncConnection().slaveofNoOne()));
+				return;
+			}
+			if (isQueueing()) {
+				transaction(new LettuceTxResult(getConnection().slaveofNoOne()));
+				return;
+			}
+			getConnection().slaveofNoOne();
+		} catch (Exception ex) {
+			throw convertLettuceAccessException(ex);
+		}
+	}
+
 	/**
 	 * Specifies if pipelined and transaction results should be converted to the expected data type. If false, results of
 	 * {@link #closePipeline()} and {@link #exec()} will be of the type returned by the Lettuce driver

src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java

@@ -2262,6 +2262,25 @@ public void setClientName(byte[] name) {
 		}
 	}
 
+	/*
+	* (non-Javadoc)
+	* @see org.springframework.data.redis.connection.RedisServerCommands#slaveOf(java.lang.String, int)
+	*/
+	@Override
+	public void slaveOf(String host, int port) {
+
+		Assert.hasText(host, "Host must not be null for 'SLAVEOF' command.");
+		try {
+			if (isPipelined()) {
+				pipeline(new SrpStatusResult(pipeline.slaveof(host, port)));
+				return;
+			}
+			client.slaveof(host, port);
+		} catch (Exception e) {
+			throw convertSrpAccessException(e);
+		}
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisServerCommands#getClientName()
@@ -2295,6 +2314,23 @@ public List<RedisClientInfo> getClientList() {
 		return SrpConverters.toListOfRedisClientInformation(this.client.client_list());
 	}
 
+	/*
+	 * @see org.springframework.data.redis.connection.RedisServerCommands#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+
+		try {
+			if (isPipelined()) {
+				pipeline(new SrpStatusResult(pipeline.slaveof("NO", "ONE")));
+				return;
+			}
+			client.slaveof("NO", "ONE");
+		} catch (Exception e) {
+			throw convertSrpAccessException(e);
+		}
+	}
+
 	private List<Object> closeTransaction() {
 		List<Object> results = Collections.emptyList();
 		if (txTracker != null) {

src/main/java/org/springframework/data/redis/core/RedisOperations.java

@@ -303,4 +303,20 @@ <T> T execute(RedisScript<T> script, RedisSerializer<?> argsSerializer, RedisSer
 	 * @since 1.3
 	 */
 	void killClient(String host, int port);
+
+	/**
+	 * Change redis replication setting to new master.
+	 * 
+	 * @param host
+	 * @param port
+	 * @since 1.3
+	 */
+	void slaveOf(String host, int port);
+
+	/**
+	 * Change server into master.
+	 * 
+	 * @since 1.3
+	 */
+	void slaveOfNoOne();
 }

src/main/java/org/springframework/data/redis/core/RedisTemplate.java

@@ -1019,4 +1019,38 @@ public List<RedisClientInfo> doInRedis(RedisConnection connection) throws DataAc
 			}
 		});
 	}
+
+	/*
+	 * @see org.springframework.data.redis.core.RedisOperations#slaveOf(java.lang.String, int)
+	 */
+	@Override
+	public void slaveOf(final String host, final int port) {
+
+		execute(new RedisCallback<Void>() {
+			@Override
+			public Void doInRedis(RedisConnection connection) throws DataAccessException {
+
+				connection.slaveOf(host, port);
+				return null;
+			}
+
+		});
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.core.RedisOperations#slaveOfNoOne()
+	 */
+	@Override
+	public void slaveOfNoOne() {
+
+		execute(new RedisCallback<Void>() {
+
+			@Override
+			public Void doInRedis(RedisConnection connection) throws DataAccessException {
+				connection.slaveOfNoOne();
+				return null;
+			}
+		});
+	}
 }