Use pattern matching variables where appropriate

fmbenhassine · fmbenhassine · commit 0f44e2bad1f1 · 2023-06-12T15:47:57.000+02:00
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
  *
  * @author Lucas Ward
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 @SuppressWarnings("serial")
@@ -122,10 +123,9 @@ public boolean equals(Object other) {
 		if (other == null) {
 			return false;
 		}
-		if (!(other instanceof Entity)) {
+		if (!(other instanceof Entity entity)) {
 			return false;
 		}
-		Entity entity = (Entity) other;
 		if (id == null || entity.getId() == null) {
 			return false;
 		}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java
@@ -90,15 +90,14 @@ public Class<T> getType() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof JobParameter)) {
+		if (!(obj instanceof JobParameter rhs)) {
 			return false;
 		}
 
 		if (this == obj) {
 			return true;
 		}
 
-		JobParameter rhs = (JobParameter) obj;
 		return type == rhs.type && value.equals(rhs.value);
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,10 +212,9 @@ public String toString() {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof StepContribution)) {
+		if (!(obj instanceof StepContribution other)) {
 			return false;
 		}
-		StepContribution other = (StepContribution) obj;
 		return toString().equals(other.toString());
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -495,10 +495,9 @@ public void addFailureException(Throwable throwable) {
 	public boolean equals(Object obj) {
 
 		Object jobExecutionId = getJobExecutionId();
-		if (jobExecutionId == null || !(obj instanceof StepExecution) || getId() == null) {
+		if (jobExecutionId == null || !(obj instanceof StepExecution other) || getId() == null) {
 			return super.equals(obj);
 		}
-		StepExecution other = (StepExecution) obj;
 
 		return stepName.equals(other.getStepName()) && (jobExecutionId.equals(other.getJobExecutionId()))
 				&& getId().equals(other.getId());
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		if (bean instanceof AutomaticJobRegistrar) {
-			AutomaticJobRegistrar automaticJobRegistrar = (AutomaticJobRegistrar) bean;
+		if (bean instanceof AutomaticJobRegistrar automaticJobRegistrar) {
 			automaticJobRegistrar.setJobLoader(new DefaultJobLoader(this.beanFactory.getBean(JobRegistry.class)));
 			for (ApplicationContextFactory factory : this.beanFactory.getBeansOfType(ApplicationContextFactory.class)
 				.values()) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
  * {@link Job} to launch.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class JobRegistryBeanPostProcessor
@@ -126,8 +127,7 @@ public void destroy() throws Exception {
 	 */
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		if (bean instanceof Job) {
-			Job job = (Job) bean;
+		if (bean instanceof Job job) {
 			try {
 				String groupName = this.groupName;
 				if (beanFactory != null && beanFactory.containsBean(beanName)) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
@@ -172,9 +172,8 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
 		NodeList children = element.getChildNodes();
 		for (int i = 0; i < children.getLength(); i++) {
 			Node node = children.item(i);
-			if (node instanceof Element) {
+			if (node instanceof Element child) {
 				String nodeName = node.getLocalName();
-				Element child = (Element) node;
 				switch (nodeName) {
 					case STEP_ELE -> {
 						stateTransitions.addAll(stepParser.parse(child, parserContext, jobFactoryRef));
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
  * @author Dave Syer
  * @author Thomas Risberg
  * @author Josh Long
+ * @author Mahmoud Ben Hassine
  * @see JobParser
  * @since 2.0
  */
@@ -109,8 +110,7 @@ protected AbstractBeanDefinition parseStep(Element stepElement, ParserContext pa
 		for (int i = 0; i < children.getLength(); i++) {
 			Node nd = children.item(i);
 
-			if (nd instanceof Element) {
-				Element nestedElement = (Element) nd;
+			if (nd instanceof Element nestedElement) {
 				String name = nestedElement.getLocalName();
 
 				if (TASKLET_ELE.equals(name)) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -800,12 +800,10 @@ public void setListeners(Object[] listeners) {
 				SkipListener<I, O> skipListener = (SkipListener<I, O>) listener;
 				skipListeners.add(skipListener);
 			}
-			if (listener instanceof StepExecutionListener) {
-				StepExecutionListener stepExecutionListener = (StepExecutionListener) listener;
+			if (listener instanceof StepExecutionListener stepExecutionListener) {
 				stepExecutionListeners.add(stepExecutionListener);
 			}
-			if (listener instanceof ChunkListener) {
-				ChunkListener chunkListener = (ChunkListener) listener;
+			if (listener instanceof ChunkListener chunkListener) {
 				chunkListeners.add(chunkListener);
 			}
 			if (listener instanceof ItemReadListener) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
  *
  * @author Dan Garrette
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.0
  */
 public class FlowExecutionStatus implements Comparable<FlowExecutionStatus> {
@@ -127,10 +128,9 @@ public boolean equals(Object object) {
 		if (object == this) {
 			return true;
 		}
-		if (!(object instanceof FlowExecutionStatus)) {
+		if (!(object instanceof FlowExecutionStatus other)) {
 			return false;
 		}
-		FlowExecutionStatus other = (FlowExecutionStatus) object;
 		return name.equals(other.name);
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,8 +95,7 @@ private void init() {
 	private void findSteps(Flow flow, Map<String, Step> map) {
 
 		for (State state : flow.getStates()) {
-			if (state instanceof StepLocator) {
-				StepLocator locator = (StepLocator) state;
+			if (state instanceof StepLocator locator) {
 				for (String name : locator.getStepNames()) {
 					map.put(name, locator.getStep(name));
 				}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
  * which returns ExitStatus.
  *
  * @author Lucas Ward
+ * @author Mahmoud Ben Hassine
  * @since 2.0
  * @see MethodInvoker
  */
@@ -86,10 +87,9 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof MethodInvokerMethodInterceptor)) {
+		if (!(obj instanceof MethodInvokerMethodInterceptor other)) {
 			return false;
 		}
-		MethodInvokerMethodInterceptor other = (MethodInvokerMethodInterceptor) obj;
 		return invokerMap.equals(other.invokerMap);
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/BatchScopeSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * ScopeSupport.
  *
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  * @since 3.0
  */
 public abstract class BatchScopeSupport implements Scope, BeanFactoryPostProcessor, Ordered {
@@ -194,8 +195,7 @@ protected Object resolveValue(Object value) {
 				definition = (BeanDefinition) value;
 				beanName = BeanDefinitionReaderUtils.generateBeanName(definition, registry);
 			}
-			else if (value instanceof BeanDefinitionHolder) {
-				BeanDefinitionHolder holder = (BeanDefinitionHolder) value;
+			else if (value instanceof BeanDefinitionHolder holder) {
 				definition = holder.getBeanDefinition();
 				beanName = holder.getBeanName();
 			}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/JobContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,13 +201,12 @@ public String getId() {
 	 */
 	@Override
 	public boolean equals(Object other) {
-		if (!(other instanceof JobContext)) {
+		if (!(other instanceof JobContext context)) {
 			return false;
 		}
 		if (other == this) {
 			return true;
 		}
-		JobContext context = (JobContext) other;
 		if (context.jobExecution == jobExecution) {
 			return true;
 		}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -243,13 +243,12 @@ public String getId() {
 	 */
 	@Override
 	public boolean equals(Object other) {
-		if (!(other instanceof StepContext)) {
+		if (!(other instanceof StepContext context)) {
 			return false;
 		}
 		if (other == this) {
 			return true;
 		}
-		StepContext context = (StepContext) other;
 		if (context.stepExecution == stepExecution) {
 			return true;
 		}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/Chunk.java
@@ -216,10 +216,9 @@ public boolean equals(Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		if (!(obj instanceof Chunk)) {
+		if (!(obj instanceof Chunk<?> other)) {
 			return false;
 		}
-		Chunk<?> other = (Chunk<?>) obj;
 		return Objects.equals(this.items, other.items) && Objects.equals(this.skips, other.skips)
 				&& Objects.equals(this.errors, other.errors) && Objects.equals(this.userData, other.userData)
 				&& this.end == other.end && this.busy == other.busy;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
  *
  * @author Rob Harrop
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  */
 public class DefaultFieldSet implements FieldSet {
 
@@ -669,8 +670,7 @@ public String toString() {
 	 */
 	@Override
 	public boolean equals(Object object) {
-		if (object instanceof DefaultFieldSet) {
-			DefaultFieldSet fs = (DefaultFieldSet) object;
+		if (object instanceof DefaultFieldSet fs) {
 
 			if (this.tokens == null) {
 				return fs.tokens == null;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,8 +53,7 @@ public class JmsItemReader<T> implements ItemReader<T>, InitializingBean {
 	 */
 	public void setJmsTemplate(JmsOperations jmsTemplate) {
 		this.jmsTemplate = jmsTemplate;
-		if (jmsTemplate instanceof JmsTemplate) {
-			JmsTemplate template = (JmsTemplate) jmsTemplate;
+		if (jmsTemplate instanceof JmsTemplate template) {
 			Assert.isTrue(template.getReceiveTimeout() != JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT,
 					"JmsTemplate must have a receive timeout!");
 			Assert.isTrue(template.getDefaultDestination() != null || template.getDefaultDestinationName() != null,
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,8 +49,7 @@ public class JmsItemWriter<T> implements ItemWriter<T> {
 	 */
 	public void setJmsTemplate(JmsOperations jmsTemplate) {
 		this.jmsTemplate = jmsTemplate;
-		if (jmsTemplate instanceof JmsTemplate) {
-			JmsTemplate template = (JmsTemplate) jmsTemplate;
+		if (jmsTemplate instanceof JmsTemplate template) {
 			Assert.isTrue(template.getDefaultDestination() != null || template.getDefaultDestinationName() != null,
 					"JmsTemplate must have a defaultDestination or defaultDestinationName!");
 		}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java
diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2022 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -27,6 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Lucas Ward`
`29`	`29`	`* @author Dave Syer`
	`30`	`+ * @author Mahmoud Ben Hassine`
`30`	`31`	`*`
`31`	`32`	`*/`
`32`	`33`	`@SuppressWarnings("serial")`
`@@ -122,10 +123,9 @@ public boolean equals(Object other) {`
`122`	`123`	`if (other == null) {`
`123`	`124`	`return false;`
`124`	`125`	`}`
`125`		`- if (!(other instanceof Entity)) {`
	`126`	`+ if (!(other instanceof Entity entity)) {`
`126`	`127`	`return false;`
`127`	`128`	`}`
`128`		`- Entity entity = (Entity) other;`
`129`	`129`	`if (id == null \|\| entity.getId() == null) {`
`130`	`130`	`return false;`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,14 @@ public Class<T> getType() {`
`90`	`90`
`91`	`91`	`@Override`
`92`	`92`	`public boolean equals(Object obj) {`
`93`		`- if (!(obj instanceof JobParameter)) {`
	`93`	`+ if (!(obj instanceof JobParameter rhs)) {`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (this == obj) {`
`98`	`98`	`return true;`
`99`	`99`	`}`
`100`	`100`
`101`		`- JobParameter rhs = (JobParameter) obj;`
`102`	`101`	`return type == rhs.type && value.equals(rhs.value);`
`103`	`102`	`}`
`104`	`103`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2013 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -20,6 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Dan Garrette`
`22`	`22`	`* @author Dave Syer`
	`23`	`+ * @author Mahmoud Ben Hassine`
`23`	`24`	`* @since 2.0`
`24`	`25`	`*/`
`25`	`26`	`public class FlowExecutionStatus implements Comparable<FlowExecutionStatus> {`
`@@ -127,10 +128,9 @@ public boolean equals(Object object) {`
`127`	`128`	`if (object == this) {`
`128`	`129`	`return true;`
`129`	`130`	`}`
`130`		`- if (!(object instanceof FlowExecutionStatus)) {`
	`131`	`+ if (!(object instanceof FlowExecutionStatus other)) {`
`131`	`132`	`return false;`
`132`	`133`	`}`
`133`		`- FlowExecutionStatus other = (FlowExecutionStatus) object;`
`134`	`134`	`return name.equals(other.name);`
`135`	`135`	`}`
`136`	`136`