Replace use of String.format(..) with formatted Strings.

Closes spring-projects#2751

Author: jxblum

src/main/java/org/springframework/data/redis/ClusterRedirectException.java

@@ -43,7 +43,7 @@ public class ClusterRedirectException extends DataRetrievalFailureException {
 	 */
 	public ClusterRedirectException(int slot, String targetHost, int targetPort, Throwable e) {
 
-		super(String.format("Redirect: slot %s to %s:%s.", slot, targetHost, targetPort), e);
+		super("Redirect: slot %s to %s:%s.".formatted(slot, targetHost, targetPort), e);
 
 		this.slot = slot;
 		this.host = targetHost;

src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java

@@ -382,9 +382,8 @@ private void checkAndPotentiallyWaitUntilUnlocked(String name, RedisConnection c
 			// Re-interrupt current Thread to allow other participants to react.
 			Thread.currentThread().interrupt();
 
-			String message = String.format("Interrupted while waiting to unlock cache %s", name);
-
-			throw new PessimisticLockingFailureException(message, ex);
+			throw new PessimisticLockingFailureException("Interrupted while waiting to unlock cache %s"
+					.formatted(name), ex);
 		} finally {
 			this.statistics.incLockTime(name, System.nanoTime() - lockWaitTimeNs);
 		}

src/main/java/org/springframework/data/redis/cache/RedisCache.java

@@ -324,12 +324,9 @@ private Object processAndCheckValue(@Nullable Object value) {
 		Object cacheValue = preProcessCacheValue(value);
 
 		if (nullCacheValueIsNotAllowed(cacheValue)) {
-
-			String message = String.format("Cache '%s' does not allow 'null' values; Avoid storing null"
+			throw new IllegalArgumentException(("Cache '%s' does not allow 'null' values; Avoid storing null"
 					+ " via '@Cacheable(unless=\"#result == null\")' or configure RedisCache to allow 'null'"
-					+ " via RedisCacheConfiguration", getName());
-
-			throw new IllegalArgumentException(message);
+					+ " via RedisCacheConfiguration").formatted(getName()));
 		}
 
 		return cacheValue;
@@ -440,11 +437,9 @@ protected String convertKey(Object key) {
 			return key.toString();
 		}
 
-		String message = String.format("Cannot convert cache key %s to String; Please register a suitable Converter"
-				+ " via 'RedisCacheConfiguration.configureKeyConverters(...)' or override '%s.toString()'",
-				source, key.getClass().getName());
-
-		throw new IllegalStateException(message);
+		throw new IllegalStateException(("Cannot convert cache key %s to String; Please register a suitable Converter"
+				+ " via 'RedisCacheConfiguration.configureKeyConverters(...)' or override '%s.toString()'")
+				.formatted(source, key.getClass().getName()));
 	}
 
 	private CompletableFuture<byte[]> retrieveValue(Object key) {
@@ -502,7 +497,7 @@ private String convertCollectionLikeOrMapKey(Object key, TypeDescriptor source)
 			return "[" + stringJoiner + "]";
 		}
 
-		throw new IllegalArgumentException(String.format("Cannot convert cache key [%s] to String", key));
+		throw new IllegalArgumentException("Cannot convert cache key [%s] to String".formatted(key));
 	}
 
 	private byte[] createAndConvertCacheKey(Object key) {

src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java

@@ -424,11 +424,9 @@ public void addCacheKeyConverter(Converter<?, String> cacheKeyConverter) {
 	public void configureKeyConverters(Consumer<ConverterRegistry> registryConsumer) {
 
 		if (!(getConversionService() instanceof ConverterRegistry)) {
-
-			String message = "'%s' returned by getConversionService() does not allow Converter registration;"
-					+ " Please make sure to provide a ConversionService that implements ConverterRegistry";
-
-			throw new IllegalStateException(String.format(message, getConversionService().getClass().getName()));
+			throw new IllegalStateException(("'%s' returned by getConversionService() does not allow Converter registration;"
+					+ " Please make sure to provide a ConversionService that implements ConverterRegistry")
+					.formatted(getConversionService().getClass().getName()));
 		}
 
 		registryConsumer.accept((ConverterRegistry) getConversionService());

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

@@ -130,12 +130,9 @@ private <S, T> NodeResult<T> executeCommandOnSingleNode(ClusterCommandCallback<S
 		Assert.notNull(node, "RedisClusterNode must not be null");
 
 		if (redirectCount > this.maxRedirects) {
-
-			String message = String.format("Cannot follow Cluster Redirects over more than %s legs; "
-					+ "Consider increasing the number of redirects to follow; Current value is: %s.",
-							redirectCount, this.maxRedirects);
-
-			throw new TooManyClusterRedirectionsException(message);
+			throw new TooManyClusterRedirectionsException(("Cannot follow Cluster Redirects over more than %s legs;"
+					+ " Consider increasing the number of redirects to follow; Current value is: %s")
+					.formatted(redirectCount, this.maxRedirects));
 		}
 
 		RedisClusterNode nodeToUse = lookupNode(node);
@@ -178,7 +175,7 @@ private RedisClusterNode lookupNode(RedisClusterNode node) {
 		try {
 			return topologyProvider.getTopology().lookup(node);
 		} catch (ClusterStateFailureException ex) {
-			throw new IllegalArgumentException(String.format("Node %s is unknown to cluster", node), ex);
+			throw new IllegalArgumentException("Node %s is unknown to cluster".formatted(node), ex);
 		}
 	}
 
@@ -215,7 +212,7 @@ public <S, T> MultiNodeResult<T> executeCommandAsyncOnNodes(ClusterCommandCallba
 			try {
 				resolvedRedisClusterNodes.add(topology.lookup(node));
 			} catch (ClusterStateFailureException ex) {
-				throw new IllegalArgumentException(String.format("Node %s is unknown to cluster", node), ex);
+				throw new IllegalArgumentException("Node %s is unknown to cluster".formatted(node), ex);
 			}
 		}
 

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

@@ -140,8 +140,8 @@ public RedisClusterNode getKeyServingMasterNode(byte[] key) {
 			}
 		}
 
-		throw new ClusterStateFailureException(
-				String.format("Could not find master node serving slot %s for key '%s',", slot, Arrays.toString(key)));
+		throw new ClusterStateFailureException("Could not find master node serving slot %s for key '%s',"
+				.formatted(slot, Arrays.toString(key)));
 	}
 
 	/**
@@ -160,8 +160,8 @@ public RedisClusterNode lookup(String host, int port) {
 			}
 		}
 
-		throw new ClusterStateFailureException(
-				String.format("Could not find node at %s:%s; Is your cluster info up to date", host, port));
+		throw new ClusterStateFailureException("Could not find node at %s:%d; Is your cluster info up to date"
+				.formatted(host, port));
 	}
 
 	/**
@@ -181,8 +181,8 @@ public RedisClusterNode lookup(String nodeId) {
 			}
 		}
 
-		throw new ClusterStateFailureException(
-				String.format("Could not find node at %s; Is your cluster info up to date", nodeId));
+		throw new ClusterStateFailureException("Could not find node at %s; Is your cluster info up to date"
+				.formatted(nodeId));
 	}
 
 	/**
@@ -209,8 +209,8 @@ public RedisClusterNode lookup(RedisClusterNode node) {
 			return lookup(node.getId());
 		}
 
-		throw new ClusterStateFailureException(
-				String.format("Could not find node at %s; Have you provided either host and port or the nodeId", node));
+		throw new ClusterStateFailureException(("Could not find node at %s;"
+				+ " Have you provided either host and port or the nodeId").formatted(node));
 	}
 
 	/**

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

@@ -102,11 +102,11 @@ public static RedisNode fromString(String hostPortString) {
 		try {
 			port = Integer.parseInt(portString);
 		} catch (RuntimeException ignore) {
-			throw new IllegalArgumentException(String.format("Unparseable port number: %s", hostPortString));
+			throw new IllegalArgumentException("Unparseable port number: %s".formatted(hostPortString));
 		}
 
 		if (!isValidPort(port)) {
-			throw new IllegalArgumentException(String.format("Port number out of range: %s", hostPortString));
+			throw new IllegalArgumentException("Port number out of range: %s".formatted(hostPortString));
 		}
 
 		return new RedisNode(host, port);
@@ -122,28 +122,28 @@ public static RedisNode fromString(String hostPortString) {
 	private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
 
 		if (hostPortString.charAt(0) != '[') {
-			throw new IllegalArgumentException(
-					String.format("Bracketed host-port string must start with a bracket: %s", hostPortString));
+			throw new IllegalArgumentException("Bracketed host-port string must start with a bracket: %s"
+					.formatted(hostPortString));
 		}
 
 		int colonIndex = hostPortString.indexOf(':');
 		int closeBracketIndex = hostPortString.lastIndexOf(']');
 
 		if (!(colonIndex > -1 && closeBracketIndex > colonIndex)) {
-			throw new IllegalArgumentException(String.format("Invalid bracketed host/port: %s", hostPortString));
+			throw new IllegalArgumentException("Invalid bracketed host/port: %s".formatted(hostPortString));
 		}
 
 		String host = hostPortString.substring(1, closeBracketIndex);
 		if (closeBracketIndex + 1 == hostPortString.length()) {
 			return new String[] { host, "" };
 		} else {
 			if (!(hostPortString.charAt(closeBracketIndex + 1) == ':')) {
-				throw new IllegalArgumentException(
-						String.format("Only a colon may follow a close bracket: %s", hostPortString));
+				throw new IllegalArgumentException("Only a colon may follow a close bracket: %s"
+						.formatted(hostPortString));
 			}
 			for (int i = closeBracketIndex + 2; i < hostPortString.length(); ++i) {
 				if (!Character.isDigit(hostPortString.charAt(i))) {
-					throw new IllegalArgumentException(String.format("Port must be numeric: %s", hostPortString));
+					throw new IllegalArgumentException("Port must be numeric: %s".formatted(hostPortString));
 				}
 			}
 			return new String[] { host, hostPortString.substring(closeBracketIndex + 2) };

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

@@ -140,7 +140,7 @@ public Optional<char[]> toOptional() {
 
 	@Override
 	public String toString() {
-		return String.format("%s[%s]", getClass().getSimpleName(), isPresent() ? "*****" : "<none>");
+		return "%s[%s]".formatted(getClass().getSimpleName(), isPresent() ? "*****" : "<none>");
 	}
 
 	@Override

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

@@ -223,7 +223,7 @@ public int getDatabase() {
 	@Override
 	public void setDatabase(int index) {
 
-		Assert.isTrue(index >= 0, () -> String.format("Invalid DB index '%d'; non-negative index required", index));
+		Assert.isTrue(index >= 0, () -> "Invalid DB index '%d'; non-negative index required".formatted(index));
 
 		this.database = index;
 	}

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

@@ -74,7 +74,7 @@ public int getDatabase() {
 	@Override
 	public void setDatabase(int index) {
 
-		Assert.isTrue(index >= 0, () -> String.format("Invalid DB index '%s' (a positive index required)", index));
+		Assert.isTrue(index >= 0, () -> "Invalid DB index '%s'; non-negative index required".formatted(index));
 
 		this.database = index;
 	}