Polishing.

Replace instanceof check with pattern variable in production code.
Add missing Deprecated annotations.

See #2967
Original pull request: #2971

Author: mp911de

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

@@ -151,10 +151,9 @@ public boolean equals(@Nullable Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof BitFieldSubCommands)) {
+		if (!(o instanceof BitFieldSubCommands that)) {
 			return false;
 		}
-		BitFieldSubCommands that = (BitFieldSubCommands) o;
 		return ObjectUtils.nullSafeEquals(subCommands, that.subCommands);
 	}
 
@@ -437,10 +436,9 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof Offset)) {
+			if (!(o instanceof Offset that)) {
 				return false;
 			}
-			Offset that = (Offset) o;
 			if (offset != that.offset) {
 				return false;
 			}
@@ -549,10 +547,9 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof BitFieldType)) {
+			if (!(o instanceof BitFieldType that)) {
 				return false;
 			}
-			BitFieldType that = (BitFieldType) o;
 			if (signed != that.signed) {
 				return false;
 			}
@@ -597,10 +594,9 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof AbstractBitFieldSubCommand)) {
+			if (!(o instanceof AbstractBitFieldSubCommand that)) {
 				return false;
 			}
-			AbstractBitFieldSubCommand that = (AbstractBitFieldSubCommand) o;
 			if (!ObjectUtils.nullSafeEquals(getClass(), that.getClass())) {
 				return false;
 			}
@@ -680,13 +676,12 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof BitFieldSet)) {
+			if (!(o instanceof BitFieldSet that)) {
 				return false;
 			}
 			if (!super.equals(o)) {
 				return false;
 			}
-			BitFieldSet that = (BitFieldSet) o;
 			if (value != that.value) {
 				return false;
 			}
@@ -832,10 +827,9 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof BitFieldIncrBy)) {
+			if (!(o instanceof BitFieldIncrBy that)) {
 				return false;
 			}
-			BitFieldIncrBy that = (BitFieldIncrBy) o;
 			if (value != that.value) {
 				return false;
 			}

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

@@ -108,10 +108,9 @@ public boolean equals(@Nullable Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof RedisSocketConfiguration)) {
+		if (!(o instanceof RedisSocketConfiguration that)) {
 			return false;
 		}
-		RedisSocketConfiguration that = (RedisSocketConfiguration) o;
 		if (database != that.database) {
 			return false;
 		}

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

@@ -137,10 +137,9 @@ public boolean equals(@Nullable Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof RedisStandaloneConfiguration)) {
+		if (!(o instanceof RedisStandaloneConfiguration that)) {
 			return false;
 		}
-		RedisStandaloneConfiguration that = (RedisStandaloneConfiguration) o;
 		if (port != that.port) {
 			return false;
 		}

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

@@ -159,10 +159,9 @@ public boolean equals(@Nullable Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof RedisStaticMasterReplicaConfiguration)) {
+		if (!(o instanceof RedisStaticMasterReplicaConfiguration that)) {
 			return false;
 		}
-		RedisStaticMasterReplicaConfiguration that = (RedisStaticMasterReplicaConfiguration) o;
 		if (database != that.database) {
 			return false;
 		}

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

@@ -246,10 +246,9 @@ public boolean equals(@Nullable Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof XAddOptions)) {
+			if (!(o instanceof XAddOptions that)) {
 				return false;
 			}
-			XAddOptions that = (XAddOptions) o;
 			if (nomkstream != that.nomkstream) {
 				return false;
 			}

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

@@ -51,10 +51,9 @@ public boolean equals(@Nullable Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof SentinelMasterId)) {
+		if (!(o instanceof SentinelMasterId that)) {
 			return false;
 		}
-		SentinelMasterId that = (SentinelMasterId) o;
 		return ObjectUtils.nullSafeEquals(name, that.name);
 	}
 

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

@@ -748,9 +748,8 @@ private static GeoSearchParam getGeoSearchParam(GeoShape predicate, GeoSearchPar
 			return param;
 		}
 
-		if (predicate instanceof BoxShape) {
+		if (predicate instanceof BoxShape boxPredicate) {
 
-			BoxShape boxPredicate = (BoxShape) predicate;
 			BoundingBox boundingBox = boxPredicate.getBoundingBox();
 
 			param.byBox(boundingBox.getWidth().getValue(), boundingBox.getHeight().getValue(),
@@ -770,9 +769,8 @@ private static void configureGeoReference(GeoReference<byte[]> reference, GeoSea
 			return;
 		}
 
-		if (reference instanceof GeoReference.GeoCoordinateReference) {
+		if (reference instanceof GeoReference.GeoCoordinateReference<?> coordinates) {
 
-			GeoReference.GeoCoordinateReference<?> coordinates = (GeoReference.GeoCoordinateReference<?>) reference;
 			param.fromLonLat(coordinates.getLongitude(), coordinates.getLatitude());
 			return;
 		}

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

@@ -96,9 +96,8 @@ static List<Object> mapToList(Map<String, Object> map) {
 
 			if (v instanceof StreamEntryID) {
 				sources.add(v.toString());
-			} else if (v instanceof StreamEntry) {
+			} else if (v instanceof StreamEntry streamEntry) {
 				List<Object> entries = new ArrayList<>(2);
-				StreamEntry streamEntry = (StreamEntry) v;
 				entries.add(streamEntry.getID().toString());
 				entries.add(streamEntry.getFields());
 				sources.add(entries);

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

@@ -863,9 +863,8 @@ static GeoSearch.GeoPredicate toGeoPredicate(GeoShape predicate) {
 			return GeoSearch.byRadius(radius.getValue(), toGeoArgsUnit(radius.getMetric()));
 		}
 
-		if (predicate instanceof BoxShape) {
+		if (predicate instanceof BoxShape boxPredicate) {
 
-			BoxShape boxPredicate = (BoxShape) predicate;
 			BoundingBox boundingBox = boxPredicate.getBoundingBox();
 
 			return GeoSearch.byBox(boundingBox.getWidth().getValue(), boundingBox.getHeight().getValue(),
@@ -881,9 +880,7 @@ static <T> GeoSearch.GeoRef<T> toGeoRef(GeoReference<T> reference) {
 			return GeoSearch.fromMember(((GeoMemberReference<T>) reference).getMember());
 		}
 
-		if (reference instanceof GeoReference.GeoCoordinateReference) {
-
-			GeoCoordinateReference<?> coordinates = (GeoCoordinateReference<?>) reference;
+		if (reference instanceof GeoCoordinateReference<?> coordinates) {
 
 			return GeoSearch.fromCoordinates(coordinates.getLongitude(), coordinates.getLatitude());
 		}

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

@@ -165,9 +165,8 @@ public void release(StatefulConnection<?, ?> connection) {
 
 	private void discardIfNecessary(StatefulConnection<?, ?> connection) {
 
-		if (connection instanceof StatefulRedisConnection) {
+		if (connection instanceof StatefulRedisConnection<?, ?> redisConnection) {
 
-			StatefulRedisConnection<?, ?> redisConnection = (StatefulRedisConnection<?, ?>) connection;
 			if (redisConnection.isMulti()) {
 				redisConnection.async().discard();
 			}