Refactor code with instanceof pattern variable.

In some cases, we currently use the traditional `instanceof` checks followed by explicit type casting.
With the introduction of pattern matching in recent Java versions, we can refactor these checks to make the code more concise and readable.

Original pull request #1868

Author: arefbehboudi

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/AggregateChangeExecutor.java

@@ -81,32 +81,32 @@ <T> void executeDelete(AggregateChange<T> aggregateChange) {
 	private void execute(DbAction<?> action, JdbcAggregateChangeExecutionContext executionContext) {
 
 		try {
-			if (action instanceof DbAction.InsertRoot) {
-				executionContext.executeInsertRoot((DbAction.InsertRoot<?>) action);
-			} else if (action instanceof DbAction.BatchInsertRoot<?>) {
-				executionContext.executeBatchInsertRoot((DbAction.BatchInsertRoot<?>) action);
-			} else if (action instanceof DbAction.Insert) {
-				executionContext.executeInsert((DbAction.Insert<?>) action);
-			} else if (action instanceof DbAction.BatchInsert) {
-				executionContext.executeBatchInsert((DbAction.BatchInsert<?>) action);
-			} else if (action instanceof DbAction.UpdateRoot) {
-				executionContext.executeUpdateRoot((DbAction.UpdateRoot<?>) action);
-			} else if (action instanceof DbAction.Delete) {
-				executionContext.executeDelete((DbAction.Delete<?>) action);
-			} else if (action instanceof DbAction.BatchDelete<?>) {
-				executionContext.executeBatchDelete((DbAction.BatchDelete<?>) action);
-			} else if (action instanceof DbAction.DeleteAll) {
-				executionContext.executeDeleteAll((DbAction.DeleteAll<?>) action);
-			} else if (action instanceof DbAction.DeleteRoot) {
-				executionContext.executeDeleteRoot((DbAction.DeleteRoot<?>) action);
-			} else if (action instanceof DbAction.BatchDeleteRoot) {
-				executionContext.executeBatchDeleteRoot((DbAction.BatchDeleteRoot<?>) action);
-			} else if (action instanceof DbAction.DeleteAllRoot) {
-				executionContext.executeDeleteAllRoot((DbAction.DeleteAllRoot<?>) action);
-			} else if (action instanceof DbAction.AcquireLockRoot) {
-				executionContext.executeAcquireLock((DbAction.AcquireLockRoot<?>) action);
-			} else if (action instanceof DbAction.AcquireLockAllRoot) {
-				executionContext.executeAcquireLockAllRoot((DbAction.AcquireLockAllRoot<?>) action);
+			if (action instanceof DbAction.InsertRoot<?> insertRoot) {
+				executionContext.executeInsertRoot(insertRoot);
+			} else if (action instanceof DbAction.BatchInsertRoot<?> batchInsertRoot) {
+				executionContext.executeBatchInsertRoot(batchInsertRoot);
+			} else if (action instanceof DbAction.Insert<?> insert) {
+				executionContext.executeInsert(insert);
+			} else if (action instanceof DbAction.BatchInsert<?> batchInsert) {
+				executionContext.executeBatchInsert(batchInsert);
+			} else if (action instanceof DbAction.UpdateRoot<?> updateRoot) {
+				executionContext.executeUpdateRoot(updateRoot);
+			} else if (action instanceof DbAction.Delete<?> delete) {
+				executionContext.executeDelete(delete);
+			} else if (action instanceof DbAction.BatchDelete<?> batchDelete) {
+				executionContext.executeBatchDelete(batchDelete);
+			} else if (action instanceof DbAction.DeleteAll<?> deleteAll) {
+				executionContext.executeDeleteAll(deleteAll);
+			} else if (action instanceof DbAction.DeleteRoot<?> deleteRoot) {
+				executionContext.executeDeleteRoot(deleteRoot);
+			} else if (action instanceof DbAction.BatchDeleteRoot<?> batchDeleteRoot) {
+				executionContext.executeBatchDeleteRoot(batchDeleteRoot);
+			} else if (action instanceof DbAction.DeleteAllRoot<?> deleteAllRoot) {
+				executionContext.executeDeleteAllRoot(deleteAllRoot);
+			} else if (action instanceof DbAction.AcquireLockRoot<?> acquireLockRoot) {
+				executionContext.executeAcquireLock(acquireLockRoot);
+			} else if (action instanceof DbAction.AcquireLockAllRoot<?> acquireLockAllRoot) {
+				executionContext.executeAcquireLockAllRoot(acquireLockAllRoot);
 			} else {
 				throw new RuntimeException("unexpected action");
 			}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java

@@ -312,8 +312,8 @@ private <S> Object setIdAndCascadingProperties(DbAction.WithEntity<S> action, @N
 	@SuppressWarnings("unchecked")
 	private PersistentPropertyPath<?> getRelativePath(DbAction<?> action, PersistentPropertyPath<?> pathToValue) {
 
-		if (action instanceof DbAction.Insert) {
-			return pathToValue.getExtensionForBaseOf(((DbAction.Insert) action).getPropertyPath());
+		if (action instanceof DbAction.Insert insert) {
+			return pathToValue.getExtensionForBaseOf(insert.getPropertyPath());
 		}
 
 		if (action instanceof DbAction.InsertRoot) {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/MappingJdbcConverter.java

@@ -192,9 +192,9 @@ public Object readValue(@Nullable Object value, TypeInformation<?> type) {
 			return value;
 		}
 
-		if (value instanceof Array) {
+		if (value instanceof Array array) {
 			try {
-				return super.readValue(((Array) value).getArray(), type);
+				return super.readValue(array.getArray(), type);
 			} catch (SQLException | ConverterNotFoundException e) {
 				LOG.info("Failed to extract a value of type %s from an Array; Attempting to use standard conversions", e);
 			}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java

@@ -147,7 +147,7 @@ Expression getMappedObject(Expression expression, @Nullable RelationalPersistent
 			Assert.state(table != null, String.format("The column %s must have a table set", column));
 
 			Column columnFromTable = table.column(field.getMappedColumnName());
-			return column instanceof Aliased ? columnFromTable.as(((Aliased) column).getAlias()) : columnFromTable;
+			return column instanceof Aliased aliased ? columnFromTable.as(aliased.getAlias()) : columnFromTable;
 		}
 
 		if (expression instanceof SimpleFunction function) {
@@ -161,7 +161,7 @@ Expression getMappedObject(Expression expression, @Nullable RelationalPersistent
 
 			SimpleFunction mappedFunction = SimpleFunction.create(function.getFunctionName(), mappedArguments);
 
-			return function instanceof Aliased ? mappedFunction.as(((Aliased) function).getAlias()) : mappedFunction;
+			return function instanceof Aliased aliased ? mappedFunction.as(aliased.getAlias()) : mappedFunction;
 		}
 
 		throw new IllegalArgumentException(String.format("Cannot map %s", expression));

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessorPropertyAccessor.java

@@ -37,7 +37,7 @@ public Class<?>[] getSpecificTargetClasses() {
 
 	@Override
 	public boolean canRead(EvaluationContext context, @Nullable Object target, String name) {
-		return target instanceof ResultSetAccessor && ((ResultSetAccessor) target).hasValue(name);
+		return target instanceof ResultSetAccessor resultSetAccessor && resultSetAccessor.hasValue(name);
 	}
 
 	@Override

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java

@@ -491,8 +491,7 @@ public ContentNoId getEmbedded() {
 
 		public boolean equals(final Object o) {
 			if (o == this) return true;
-			if (!(o instanceof DummyEntity)) return false;
-			final DummyEntity other = (DummyEntity) o;
+			if (!(o instanceof DummyEntity other)) return false;
 			final Object this$rootId = this.getRootId();
 			final Object other$rootId = other.getRootId();
 			if (this$rootId == null ? other$rootId != null : !this$rootId.equals(other$rootId)) return false;
@@ -623,8 +622,7 @@ public Map<String, Tag> getTagMap() {
 
 		public boolean equals(final Object o) {
 			if (o == this) return true;
-			if (!(o instanceof Content)) return false;
-			final Content other = (Content) o;
+			if (!(o instanceof Content other)) return false;
 			final Object this$id = this.getId();
 			final Object other$id = other.getId();
 			if (this$id == null ? other$id != null : !this$id.equals(other$id)) return false;
@@ -725,8 +723,7 @@ public Map<String, Tag> getTagMap() {
 
 		public boolean equals(final Object o) {
 			if (o == this) return true;
-			if (!(o instanceof ContentNoId)) return false;
-			final ContentNoId other = (ContentNoId) o;
+			if (!(o instanceof ContentNoId other)) return false;
 			final Object this$single = this.getSingle();
 			final Object other$single = other.getSingle();
 			if (this$single == null ? other$single != null : !this$single.equals(other$single)) return false;
@@ -805,8 +802,7 @@ public String getName() {
 
 		public boolean equals(final Object o) {
 			if (o == this) return true;
-			if (!(o instanceof Tag)) return false;
-			final Tag other = (Tag) o;
+			if (!(o instanceof Tag other)) return false;
 			final Object this$id = this.getId();
 			final Object other$id = other.getId();
 			if (this$id == null ? other$id != null : !this$id.equals(other$id)) return false;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java

@@ -941,8 +941,8 @@ void mappingMapKeyToChildShouldNotResultInDuplicateColumn() {
 	@Nullable
 	private SqlIdentifier getAlias(Object maybeAliased) {
 
-		if (maybeAliased instanceof Aliased) {
-			return ((Aliased) maybeAliased).getAlias();
+		if (maybeAliased instanceof Aliased aliased) {
+			return aliased.getAlias();
 		}
 		return null;
 	}

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java

@@ -66,8 +66,8 @@ public ApplicationListener<?> idSetting() {
 
 			return (ApplicationListener<BeforeConvertEvent>) event -> {
 
-				if (event.getEntity() instanceof DummyEntity) {
-					setIds((DummyEntity) event.getEntity());
+				if (event.getEntity() instanceof DummyEntity dummyEntity) {
+					setIds(dummyEntity);
 				}
 			};
 		}