Remove usage of oppressive language.

The API exposes now the renamed command terminology (replica) only and no longer the deprecated one.

Closes: #2195
See: #2274
Original Pull Request: #2276

Author: mp911de

src/main/asciidoc/appendix/appendix-command-reference.adoc

@@ -115,6 +115,7 @@
 |RANDOMKEY |X
 |RENAME |X
 |RENAMENX |X
+|REPLICAOF |X
 |RESTORE |X
 |ROLE |-
 |RPOP |X

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

@@ -55,8 +55,8 @@ public Set<RedisClusterNode> getNodes() {
 	}
 
 	/**
-	 * Get all nodes (master and slave) in cluster where {@code link-state} is {@literal connected} and {@code flags} does
-	 * not contain {@literal fail} or {@literal fail?}.
+	 * Get all nodes (master and replica) in cluster where {@code link-state} is {@literal connected} and {@code flags}
+	 * does not contain {@literal fail} or {@literal fail?}.
 	 *
 	 * @return never {@literal null}.
 	 */
@@ -105,7 +105,7 @@ public Set<RedisClusterNode> getMasterNodes() {
 	}
 
 	/**
-	 * Get the {@link RedisClusterNode}s (master and slave) serving s specific slot.
+	 * Get the {@link RedisClusterNode}s (master and replica) serving s specific slot.
 	 *
 	 * @param slot
 	 * @return never {@literal null}.

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

@@ -2444,13 +2444,13 @@ public List<RedisClientInfo> getClientList() {
 	}
 
 	@Override
-	public void slaveOf(String host, int port) {
-		this.delegate.slaveOf(host, port);
+	public void replicaOf(String host, int port) {
+		this.delegate.replicaOf(host, port);
 	}
 
 	@Override
-	public void slaveOfNoOne() {
-		this.delegate.slaveOfNoOne();
+	public void replicaOfNoOne() {
+		this.delegate.replicaOfNoOne();
 	}
 
 	@Override

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

@@ -1755,15 +1755,15 @@ default List<RedisClientInfo> getClientList() {
 	/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
 	@Override
 	@Deprecated
-	default void slaveOf(String host, int port) {
-		serverCommands().slaveOf(host, port);
+	default void replicaOf(String host, int port) {
+		serverCommands().replicaOf(host, port);
 	}
 
 	/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */
 	@Override
 	@Deprecated
-	default void slaveOfNoOne() {
-		serverCommands().slaveOfNoOne();
+	default void replicaOfNoOne() {
+		serverCommands().replicaOfNoOne();
 	}
 
 	/** @deprecated in favor of {@link RedisConnection#serverCommands()}. */

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

@@ -46,22 +46,22 @@ public interface ReactiveClusterCommands {
 	Flux<RedisClusterNode> clusterGetNodes();
 
 	/**
-	 * Retrieve information about connected slaves for given master node.
+	 * Retrieve information about connected replicas for given master node.
 	 *
 	 * @param master must not be {@literal null}.
 	 * @return a {@link Flux} emitting {@link RedisClusterNode cluster nodes}, an {@link Flux#empty() empty one} if none
 	 *         found.
-	 * @see <a href="https://redis.io/commands/cluster-slaves">Redis Documentation: CLUSTER SLAVES</a>
+	 * @see <a href="https://redis.io/commands/cluster-replicas">Redis Documentation: CLUSTER REPLICAS</a>
 	 */
-	Flux<RedisClusterNode> clusterGetSlaves(RedisClusterNode master);
+	Flux<RedisClusterNode> clusterGetReplicas(RedisClusterNode master);
 
 	/**
-	 * Retrieve information about masters and their connected slaves.
+	 * Retrieve information about masters and their connected replicas.
 	 *
 	 * @return never {@literal null}.
-	 * @see <a href="https://redis.io/commands/cluster-slaves">Redis Documentation: CLUSTER SLAVES</a>
+	 * @see <a href="https://redis.io/commands/cluster-replicas">Redis Documentation: CLUSTER REPLICAS</a>
 	 */
-	Mono<Map<RedisClusterNode, Collection<RedisClusterNode>>> clusterGetMasterSlaveMap();
+	Mono<Map<RedisClusterNode, Collection<RedisClusterNode>>> clusterGetMasterReplicaMap();
 
 	/**
 	 * Find the slot for a given {@code key}.
@@ -184,7 +184,7 @@ public interface ReactiveClusterCommands {
 	Flux<ByteBuffer> clusterGetKeysInSlot(int slot, int count);
 
 	/**
-	 * Assign a {@literal slave} to given {@literal master}.
+	 * Assign a {@literal replica} to given {@literal master}.
 	 *
 	 * @param master must not be {@literal null}.
 	 * @param replica must not be {@literal null}.

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

@@ -41,21 +41,21 @@ public interface RedisClusterCommands {
 	Iterable<RedisClusterNode> clusterGetNodes();
 
 	/**
-	 * Retrieve information about connected slaves for given master node.
+	 * Retrieve information about connected replicas for given master node.
 	 *
 	 * @param master must not be {@literal null}.
 	 * @return never {@literal null}.
-	 * @see <a href="https://redis.io/commands/cluster-slaves">Redis Documentation: CLUSTER SLAVES</a>
+	 * @see <a href="https://redis.io/commands/cluster-replicas">Redis Documentation: CLUSTER REPLICAS</a>
 	 */
-	Collection<RedisClusterNode> clusterGetSlaves(RedisClusterNode master);
+	Collection<RedisClusterNode> clusterGetReplicas(RedisClusterNode master);
 
 	/**
-	 * Retrieve information about masters and their connected slaves.
+	 * Retrieve information about masters and their connected replicas.
 	 *
 	 * @return never {@literal null}.
-	 * @see <a href="https://redis.io/commands/cluster-slaves">Redis Documentation: CLUSTER SLAVES</a>
+	 * @see <a href="https://redis.io/commands/cluster-replicas">Redis Documentation: CLUSTER REPLICAS</a>
 	 */
-	Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap();
+	Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterReplicaMap();
 
 	/**
 	 * Find the slot for a given {@code key}.
@@ -171,7 +171,7 @@ public interface RedisClusterCommands {
 	List<byte[]> clusterGetKeysInSlot(int slot, Integer count);
 
 	/**
-	 * Assign a {@literal slave} to given {@literal master}.
+	 * Assign a {@literal replica} to given {@literal master}.
 	 *
 	 * @param master must not be {@literal null}.
 	 * @param replica must not be {@literal null}.

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

@@ -242,7 +242,7 @@ public enum LinkState {
 	 */
 	public static enum Flag {
 
-		MYSELF("myself"), MASTER("master"), SLAVE("slave"), FAIL("fail"), PFAIL("fail?"), HANDSHAKE("handshake"), NOADDR(
+		MYSELF("myself"), MASTER("master"), REPLICA("slave"), FAIL("fail"), PFAIL("fail?"), HANDSHAKE("handshake"), NOADDR(
 				"noaddr"), NOFLAGS("noflags");
 
 		private String raw;
@@ -297,11 +297,6 @@ public RedisClusterNodeBuilder promotedAs(NodeType nodeType) {
 			return this;
 		}
 
-		public RedisClusterNodeBuilder slaveOf(String masterId) {
-			super.slaveOf(masterId);
-			return this;
-		}
-
 		@Override
 		public RedisClusterNodeBuilder replicaOf(String masterId) {
 			super.replicaOf(masterId);

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

@@ -482,8 +482,7 @@ interface ClusterConfiguration extends WithPassword {
 	}
 
 	/**
-	 * Configuration interface suitable for Redis master/slave environments with fixed hosts. <br/>
-	 * Redis is undergoing a nomenclature change where the term replica is used synonymously to slave.
+	 * Configuration interface suitable for Redis master/replica environments with fixed hosts.
 	 *
 	 * @author Christoph Strobl
 	 * @author Mark Paluch

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

@@ -142,20 +142,12 @@ public boolean isMaster() {
 		return ObjectUtils.nullSafeEquals(NodeType.MASTER, getType());
 	}
 
-	/**
-	 * @return
-	 * @since 1.7
-	 */
-	public boolean isSlave() {
-		return isReplica();
-	}
-
 	/**
 	 * @return
 	 * @since 2.1
 	 */
 	public boolean isReplica() {
-		return ObjectUtils.nullSafeEquals(NodeType.SLAVE, getType());
+		return ObjectUtils.nullSafeEquals(NodeType.REPLICA, getType());
 	}
 
 	/**
@@ -214,7 +206,7 @@ public boolean equals(Object obj) {
 	 * @since 1.7
 	 */
 	public enum NodeType {
-		MASTER, SLAVE
+		MASTER, REPLICA
 	}
 
 	/**
@@ -279,17 +271,6 @@ public RedisNodeBuilder promotedAs(NodeType type) {
 			return this;
 		}
 
-		/**
-		 * Set the id of the master node.
-		 *
-		 * @param masterId
-		 * @return
-		 * @since 1.7
-		 */
-		public RedisNodeBuilder slaveOf(String masterId) {
-			return replicaOf(masterId);
-		}
-
 		/**
 		 * Set the id of the master node.
 		 *

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

@@ -42,12 +42,12 @@ public interface RedisSentinelCommands {
 	Collection<RedisServer> masters();
 
 	/**
-	 * Show list of slaves for given {@literal master}.
+	 * Show list of replicas for given {@literal master}.
 	 *
 	 * @param master must not be {@literal null}.
 	 * @return Collection of {@link RedisServer}s. Never {@literal null}.
 	 */
-	Collection<RedisServer> slaves(NamedNode master);
+	Collection<RedisServer> replicas(NamedNode master);
 
 	/**
 	 * Removes given {@literal master}. The server will no longer be monitored and will no longer be returned by