Throw IllegalStateException from afterPropertiesSet

Consistently use Assert.state in the afterPropertiesSet()
methods to throw IllegalStateException instead of
IllegalArgumentException when some properties are missing
and/or invalid.

Resolves #2244

Author: danilopiazza

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java

@@ -278,7 +278,7 @@ private void doUnregister(String jobName) {
 
 	@Override
 	public void afterPropertiesSet() {
-		Assert.notNull(jobRegistry, "Job registry could not be null.");
+		Assert.state(jobRegistry != null, "Job registry could not be null.");
 	}
 
 }

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java

@@ -98,7 +98,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(jobRegistry, "JobRegistry must not be null");
+		Assert.state(jobRegistry != null, "JobRegistry must not be null");
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java

@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Convenience factory for {@link SimpleFlow} instances for use in the XML namespace. It
@@ -94,7 +95,7 @@ public void setStateTransitions(List<StateTransition> stateTransitions) {
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.hasText(name, "The flow must have a name");
+		Assert.state(StringUtils.hasText(name), "The flow must have a name");
 
 		if (flowType == null) {
 			flowType = SimpleFlow.class;

spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java

@@ -153,7 +153,7 @@ public void setConversionService(@NonNull ConfigurableConversionService conversi
 	@Override
 	public void afterPropertiesSet() throws Exception {
 
-		Assert.notNull(dataSource, "DataSource must not be null.");
+		Assert.state(dataSource != null, "DataSource must not be null.");
 
 		if (jdbcOperations == null) {
 			jdbcOperations = new JdbcTemplate(dataSource);

spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java

@@ -128,7 +128,7 @@ public void setJobParametersValidator(JobParametersValidator jobParametersValida
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(jobRepository, "JobRepository must be set");
+		Assert.state(jobRepository != null, "JobRepository must be set");
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2022 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.
@@ -60,8 +60,8 @@ public void setValidators(List<JobParametersValidator> validators) {
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(validators, "The 'validators' may not be null");
-		Assert.notEmpty(validators, "The 'validators' may not be empty");
+		Assert.state(validators != null, "The 'validators' may not be null");
+		Assert.state(!validators.isEmpty(), "The 'validators' may not be empty");
 	}
 
 }

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java

@@ -110,10 +110,10 @@ public class SimpleJobOperator implements JobOperator, InitializingBean {
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(jobLauncher, "JobLauncher must be provided");
-		Assert.notNull(jobRegistry, "JobLocator must be provided");
-		Assert.notNull(jobExplorer, "JobExplorer must be provided");
-		Assert.notNull(jobRepository, "JobRepository must be provided");
+		Assert.state(jobLauncher != null, "JobLauncher must be provided");
+		Assert.state(jobRegistry != null, "JobLocator must be provided");
+		Assert.state(jobExplorer != null, "JobExplorer must be provided");
+		Assert.state(jobRepository != null, "JobRepository must be provided");
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -196,7 +196,7 @@ public void setMetaDataMap(Map<String, String> metaDataMap) {
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(delegate, "Delegate must not be null");
+		Assert.state(delegate != null, "Delegate must not be null");
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2022 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.
@@ -25,6 +25,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * This class can be used to automatically promote items from the {@link Step}
@@ -77,10 +78,10 @@ public ExitStatus afterStep(StepExecution stepExecution) {
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(this.keys, "The 'keys' property must be provided");
-		Assert.notEmpty(this.keys, "The 'keys' property must not be empty");
-		Assert.notNull(this.statuses, "The 'statuses' property must be provided");
-		Assert.notEmpty(this.statuses, "The 'statuses' property must not be empty");
+		Assert.state(this.keys != null, "The 'keys' property must be provided");
+		Assert.state(!ObjectUtils.isEmpty(this.keys), "The 'keys' property must not be empty");
+		Assert.state(this.statuses != null, "The 'statuses' property must be provided");
+		Assert.state(!ObjectUtils.isEmpty(this.statuses), "The 'statuses' property must not be empty");
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2022 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.
@@ -78,8 +78,8 @@ public void setStepExecutionSplitter(StepExecutionSplitter stepExecutionSplitter
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		Assert.notNull(stepExecutionSplitter, "StepExecutionSplitter must be provided");
-		Assert.notNull(partitionHandler, "PartitionHandler must be provided");
+		Assert.state(stepExecutionSplitter != null, "StepExecutionSplitter must be provided");
+		Assert.state(partitionHandler != null, "PartitionHandler must be provided");
 		super.afterPropertiesSet();
 	}