diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java index a8e7af03c..652bafc2d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java @@ -278,7 +278,7 @@ public class DefaultJobLoader implements JobLoader, InitializingBean { @Override public void afterPropertiesSet() { - Assert.notNull(jobRegistry, "Job registry could not be null."); + Assert.state(jobRegistry != null, "Job registry could not be null."); } } 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 index 6bcb32b0e..d62a8c124 100644 --- 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 @@ -98,7 +98,7 @@ public class JobRegistryBeanPostProcessor */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(jobRegistry, "JobRegistry must not be null"); + Assert.state(jobRegistry != null, "JobRegistry must not be null"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java index 8e383e695..37e7a05ee 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java @@ -33,6 +33,7 @@ import org.springframework.batch.core.job.flow.support.state.StepState; 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 class SimpleFlowFactoryBean implements FactoryBean, Initializ */ @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; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java index fe3c5b9f9..36553fe50 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java @@ -153,7 +153,7 @@ public class JobExplorerFactoryBean extends AbstractJobExplorerFactoryBean imple @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); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index 2d69bc9c6..b125f0982 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -128,7 +128,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, In */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(jobRepository, "JobRepository must be set"); + Assert.state(jobRepository != null, "JobRepository must be set"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java index 86ba78749..8ed88989d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java +++ b/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 class CompositeJobParametersValidator implements JobParametersValidator, @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"); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java index 47f98cdef..ca67fa9aa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java +++ b/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"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java index 83b56eb29..c4b6bd9f7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java +++ b/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 abstract class AbstractListenerFactoryBean implements FactoryBean "'" + databaseType + "' is an unsupported database type. The supported database types are " + StringUtils.arrayToCommaDelimitedString(incrementerFactory.getSupportedIncrementerTypes())); if (clobType != null) { - Assert.isTrue(isValidTypes(clobType), "lobType must be a value from the java.sql.Types class"); + Assert.state(isValidTypes(clobType), "lobType must be a value from the java.sql.Types class"); } if (this.conversionService == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java index fddf2fbe3..813b6eb40 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java @@ -99,7 +99,7 @@ public class SimpleChunkProcessor implements ChunkProcessor, Initializi */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(itemWriter, "ItemWriter must be set"); + Assert.state(itemWriter != null, "ItemWriter must be set"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java index 120ea42c6..ccdf99791 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2019 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. @@ -49,7 +49,7 @@ public class CallableTaskletAdapter implements Tasklet, InitializingBean { */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(callable, "A Callable is required"); + Assert.state(callable != null, "A Callable is required"); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java index cd1ceb819..9dedb00f3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java @@ -37,6 +37,8 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; /** * {@link Tasklet} that executes a system command. @@ -190,14 +192,13 @@ public class SystemCommandTasklet implements StepExecutionListener, StoppableTas @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(commandRunner, "CommandRunner must be set"); - Assert.notNull(cmdArray, "'cmdArray' property value must not be null"); - Assert.notEmpty(cmdArray, "'cmdArray' property value is required with at least 1 element"); - Assert.noNullElements(cmdArray, "'cmdArray' property value must not contain be null elements"); - Assert.hasLength(cmdArray[0], "'cmdArray' property value is required with at least 1 element"); - Assert.notNull(systemProcessExitCodeMapper, "SystemProcessExitCodeMapper must be set"); - Assert.isTrue(timeout > 0, "timeout value must be greater than zero"); - Assert.notNull(taskExecutor, "taskExecutor is required"); + Assert.state(commandRunner != null, "CommandRunner must be set"); + Assert.state(cmdArray != null, "'cmdArray' property value must not be null"); + Assert.state(!ObjectUtils.isEmpty(cmdArray), "'cmdArray' property value is required with at least 1 element"); + Assert.state(StringUtils.hasText(cmdArray[0]), "'cmdArray' property value is required with at least 1 element"); + Assert.state(systemProcessExitCodeMapper != null, "SystemProcessExitCodeMapper must be set"); + Assert.state(timeout > 0, "timeout value must be greater than zero"); + Assert.state(taskExecutor != null, "taskExecutor is required"); stoppable = jobExplorer != null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java index 923ac92bb..6a1a495b5 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessorTests.java @@ -38,7 +38,7 @@ class JobRegistryBeanPostProcessorTests { @Test void testInitializationFails() { - Exception exception = assertThrows(IllegalArgumentException.class, processor::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, processor::afterPropertiesSet); assertTrue(exception.getMessage().contains("JobRegistry")); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java index e081f0fa5..48a26cef3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java @@ -84,7 +84,7 @@ class JobExplorerFactoryBeanTests { void testMissingDataSource() { factory.setDataSource(null); - Exception exception = assertThrows(IllegalArgumentException.class, factory::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, factory::afterPropertiesSet); String message = exception.getMessage(); assertTrue(message.contains("DataSource"), "Wrong message: " + message); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java index 8d1274b52..767df315e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java @@ -41,13 +41,13 @@ class CompositeJobParametersValidatorTests { @Test void testValidatorsCanNotBeNull() { compositeJobParametersValidator.setValidators(null); - assertThrows(IllegalArgumentException.class, compositeJobParametersValidator::afterPropertiesSet); + assertThrows(IllegalStateException.class, compositeJobParametersValidator::afterPropertiesSet); } @Test void testValidatorsCanNotBeEmpty() { compositeJobParametersValidator.setValidators(new ArrayList<>()); - assertThrows(IllegalArgumentException.class, compositeJobParametersValidator::afterPropertiesSet); + assertThrows(IllegalStateException.class, compositeJobParametersValidator::afterPropertiesSet); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java index 6742b4024..163a6545c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java @@ -120,7 +120,7 @@ class ExtendedAbstractJobTests { @Test void testAfterPropertiesSet() { job.setJobRepository(null); - Exception exception = assertThrows(IllegalArgumentException.class, () -> job.afterPropertiesSet()); + Exception exception = assertThrows(IllegalStateException.class, () -> job.afterPropertiesSet()); assertTrue(exception.getMessage().contains("JobRepository")); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java index 7c230b0ab..c8fe49f83 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java @@ -141,7 +141,7 @@ class SimpleJobOperatorTests { @Test void testMandatoryProperties() { jobOperator = new SimpleJobOperator(); - assertThrows(IllegalArgumentException.class, jobOperator::afterPropertiesSet); + assertThrows(IllegalStateException.class, jobOperator::afterPropertiesSet); } /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java index 10621d5cc..7544e0c14 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java @@ -247,7 +247,7 @@ class ExecutionContextPromotionListenerTests { void keysMustBeSet() { ExecutionContextPromotionListener listener = new ExecutionContextPromotionListener(); // didn't set the keys, same as listener.setKeys(null); - assertThrows(IllegalArgumentException.class, listener::afterPropertiesSet); + assertThrows(IllegalStateException.class, listener::afterPropertiesSet); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java index f3d439e1c..425da4ba6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java @@ -241,7 +241,7 @@ class JobRepositoryFactoryBeanTests { void testMissingDataSource() { factory.setDataSource(null); - Exception exception = assertThrows(IllegalArgumentException.class, factory::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, factory::afterPropertiesSet); String message = exception.getMessage(); assertTrue(message.contains("DataSource"), "Wrong message: " + message); @@ -255,7 +255,7 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("mockDb")).thenReturn(true); when(incrementerFactory.getSupportedIncrementerTypes()).thenReturn(new String[0]); - Exception exception = assertThrows(IllegalArgumentException.class, () -> factory.afterPropertiesSet()); + Exception exception = assertThrows(IllegalStateException.class, () -> factory.afterPropertiesSet()); String message = exception.getMessage(); assertTrue(message.contains("TransactionManager"), "Wrong message: " + message); @@ -268,7 +268,7 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("foo")).thenReturn(false); when(incrementerFactory.getSupportedIncrementerTypes()).thenReturn(new String[0]); - Exception exception = assertThrows(IllegalArgumentException.class, () -> factory.afterPropertiesSet()); + Exception exception = assertThrows(IllegalStateException.class, () -> factory.afterPropertiesSet()); String message = exception.getMessage(); assertTrue(message.contains("foo"), "Wrong message: " + message); @@ -363,7 +363,7 @@ class JobRepositoryFactoryBeanTests { @Test void testInvalidCustomLobType() { factory.setClobType(Integer.MAX_VALUE); - assertThrows(IllegalArgumentException.class, this::testCreateRepository); + assertThrows(IllegalStateException.class, this::testCreateRepository); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java index 8d4773cda..3792b17a3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java @@ -40,7 +40,7 @@ class CallableTaskletAdapterTests { @Test void testAfterPropertiesSet() { - assertThrows(IllegalArgumentException.class, adapter::afterPropertiesSet); + assertThrows(IllegalStateException.class, adapter::afterPropertiesSet); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java index 185de0f20..08ceb3f7a 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java @@ -187,7 +187,7 @@ class SystemCommandTaskletIntegrationTests { @Test public void testCommandRunnerNotSet() throws Exception { tasklet.setCommandRunner(null); - assertThrows(IllegalArgumentException.class, tasklet::afterPropertiesSet); + assertThrows(IllegalStateException.class, tasklet::afterPropertiesSet); } /* @@ -196,10 +196,10 @@ class SystemCommandTaskletIntegrationTests { @Test void testCommandNotSet() { tasklet.setCommand(null); - assertThrows(IllegalArgumentException.class, tasklet::afterPropertiesSet); + assertThrows(IllegalStateException.class, tasklet::afterPropertiesSet); tasklet.setCommand(""); - assertThrows(IllegalArgumentException.class, tasklet::afterPropertiesSet); + assertThrows(IllegalStateException.class, tasklet::afterPropertiesSet); } /* @@ -209,7 +209,7 @@ class SystemCommandTaskletIntegrationTests { void testTimeoutNotSet() { tasklet.setCommand("not-empty placeholder"); tasklet.setTimeout(0); - assertThrows(IllegalArgumentException.class, tasklet::afterPropertiesSet); + assertThrows(IllegalStateException.class, tasklet::afterPropertiesSet); } /* diff --git a/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java index 7faa3f67f..0a344cb8b 100644 --- a/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java +++ b/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java @@ -76,7 +76,7 @@ public class DataSourceInitializer implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(dataSource, "A DataSource is required"); + Assert.state(dataSource != null, "A DataSource is required"); initialize(); } diff --git a/spring-batch-docs/src/main/asciidoc/step.adoc b/spring-batch-docs/src/main/asciidoc/step.adoc index 6b92c7c9f..dc78f7746 100644 --- a/spring-batch-docs/src/main/asciidoc/step.adoc +++ b/spring-batch-docs/src/main/asciidoc/step.adoc @@ -1397,7 +1397,7 @@ public class FileDeletingTasklet implements Tasklet, InitializingBean { } public void afterPropertiesSet() throws Exception { - Assert.notNull(directory, "directory must be set"); + Assert.state(directory != null, "directory must be set"); } } ---- diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/KeyValueItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/KeyValueItemWriter.java index 1b5997f13..16fabe883 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/KeyValueItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/KeyValueItemWriter.java @@ -93,7 +93,7 @@ public abstract class KeyValueItemWriter implements ItemWriter, Initial */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(itemKeyMapper, "itemKeyMapper requires a Converter type."); + Assert.state(itemKeyMapper != null, "itemKeyMapper requires a Converter type."); init(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java index 3152a6546..fc96aa521 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 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. @@ -26,6 +26,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.MethodInvoker; +import org.springframework.util.StringUtils; /** * Superclass for delegating classes which dynamically call a custom method of injected @@ -126,8 +127,8 @@ public abstract class AbstractMethodInvokingDelegator implements Initializing @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(targetObject, "targetObject must not be null"); - Assert.hasLength(targetMethod, "targetMethod must not be empty"); + Assert.state(targetObject != null, "targetObject must not be null"); + Assert.state(StringUtils.hasText(targetMethod), "targetMethod must not be empty"); Assert.state(targetClassDeclaresTargetMethod(), "target class must declare a method with matching name and parameter types"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java index 609d6f3d0..8c817ab45 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java @@ -24,6 +24,7 @@ import org.springframework.batch.item.ItemWriter; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; /** * Delegates processing to a custom method - extracts property values from item object and @@ -62,7 +63,8 @@ public class PropertyExtractingDelegatingItemWriter extends AbstractMethodInv @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - Assert.notEmpty(fieldsUsedAsTargetMethodArguments, "fieldsUsedAsTargetMethodArguments must not be empty"); + Assert.state(!ObjectUtils.isEmpty(fieldsUsedAsTargetMethodArguments), + "fieldsUsedAsTargetMethodArguments must not be empty"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java index 4ce7c96e4..b5f9543e2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java @@ -30,6 +30,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.MethodInvoker; +import org.springframework.util.StringUtils; /** *

@@ -129,7 +130,7 @@ public class RepositoryItemWriter implements ItemWriter, InitializingBean public void afterPropertiesSet() throws Exception { Assert.state(repository != null, "A CrudRepository implementation is required"); if (this.methodName != null) { - Assert.hasText(this.methodName, "methodName must not be empty."); + Assert.state(StringUtils.hasText(this.methodName), "methodName must not be empty."); } else { logger.debug("No method name provided, CrudRepository.saveAll will be used."); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java index e3bd731fb..a926bb3d7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.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. @@ -154,7 +154,7 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(dataSource, "DataSource must be provided"); + Assert.state(dataSource != null, "DataSource must be provided"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java index 0ede0eb5d..e2cb8f6e9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java @@ -91,7 +91,7 @@ public abstract class AbstractPagingItemReader extends AbstractItemCountingIt */ @Override public void afterPropertiesSet() throws Exception { - Assert.isTrue(pageSize > 0, "pageSize must be greater than zero"); + Assert.state(pageSize > 0, "pageSize must be greater than zero"); } @Nullable diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java index e79a4b01e..972cbb297 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 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. @@ -316,7 +316,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(dataSource, "DataSource is required"); + Assert.state(dataSource != null, "DataSource is required"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java index fc4faef6e..6911572c4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java @@ -101,7 +101,7 @@ public class HibernateItemReaderHelper implements InitializingBean { Assert.state(sessionFactory != null, "A SessionFactory must be provided"); if (queryProvider == null) { - Assert.notNull(sessionFactory, "session factory must be set"); + Assert.state(sessionFactory != null, "session factory must be set"); Assert.state(StringUtils.hasText(queryString) ^ StringUtils.hasText(queryName), "queryString or queryName must be set"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java index 8b0a6a764..290ee6ef8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java @@ -142,8 +142,8 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { */ @Override public void afterPropertiesSet() { - Assert.notNull(namedParameterJdbcTemplate, "A DataSource or a NamedParameterJdbcTemplate is required."); - Assert.notNull(sql, "An SQL statement is required."); + Assert.state(namedParameterJdbcTemplate != null, "A DataSource or a NamedParameterJdbcTemplate is required."); + Assert.state(sql != null, "An SQL statement is required."); List namedParameters = new ArrayList<>(); parameterCount = JdbcParameterUtils.countParameterPlaceholders(sql, namedParameters); if (namedParameters.size() > 0) { @@ -154,7 +154,7 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { usingNamedParameters = true; } if (!usingNamedParameters) { - Assert.notNull(itemPreparedStatementSetter, + Assert.state(itemPreparedStatementSetter != null, "Using SQL statement with '?' placeholders requires an ItemPreparedStatementSetter"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java index 844312576..c8d3717de 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.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. @@ -103,8 +103,8 @@ public class JdbcCursorItemReader extends AbstractCursorItemReader { @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - Assert.notNull(sql, "The SQL query must be provided"); - Assert.notNull(rowMapper, "RowMapper must be provided"); + Assert.state(sql != null, "The SQL query must be provided"); + Assert.state(rowMapper != null, "RowMapper must be provided"); } @Override diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java index c5fd0cfc9..0d484f2c4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java @@ -155,14 +155,14 @@ public class JdbcPagingItemReader extends AbstractPagingItemReader impleme @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - Assert.notNull(dataSource, "DataSource may not be null"); + Assert.state(dataSource != null, "DataSource may not be null"); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); if (fetchSize != VALUE_NOT_SET) { jdbcTemplate.setFetchSize(fetchSize); } jdbcTemplate.setMaxRows(getPageSize()); namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); - Assert.notNull(queryProvider, "QueryProvider may not be null"); + Assert.state(queryProvider != null, "QueryProvider may not be null"); queryProvider.init(dataSource); this.firstPageSql = queryProvider.generateFirstPageQuery(getPageSize()); this.remainingPagesSql = queryProvider.generateRemainingPagesQuery(getPageSize()); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java index 8b31239e4..4dbae5361 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-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. @@ -30,6 +30,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; +import org.springframework.util.StringUtils; /** * {@link org.springframework.batch.item.ItemStreamReader} implementation based on JPA @@ -101,9 +102,10 @@ public class JpaCursorItemReader extends AbstractItemCountingItemStreamItemRe @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.entityManagerFactory, "EntityManagerFactory is required"); + Assert.state(this.entityManagerFactory != null, "EntityManagerFactory is required"); if (this.queryProvider == null) { - Assert.hasLength(this.queryString, "Query string is required when queryProvider is null"); + Assert.state(StringUtils.hasLength(this.queryString), + "Query string is required when queryProvider is null"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java index d526af59a..70fd6ec8b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java @@ -75,7 +75,7 @@ public class JpaItemWriter implements ItemWriter, InitializingBean { */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(entityManagerFactory, "An EntityManagerFactory is required"); + Assert.state(entityManagerFactory != null, "An EntityManagerFactory is required"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java index 47ff7d211..1d33e9a6f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java @@ -31,6 +31,7 @@ import org.springframework.batch.item.database.orm.JpaQueryProvider; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; +import org.springframework.util.StringUtils; /** *

@@ -144,8 +145,8 @@ public class JpaPagingItemReader extends AbstractPagingItemReader { super.afterPropertiesSet(); if (queryProvider == null) { - Assert.notNull(entityManagerFactory, "EntityManager is required when queryProvider is null"); - Assert.hasLength(queryString, "Query string is required when queryProvider is null"); + Assert.state(entityManagerFactory != null, "EntityManager is required when queryProvider is null"); + Assert.state(StringUtils.hasLength(queryString), "Query string is required when queryProvider is null"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java index 73a7ccddf..d6f74827a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.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. @@ -143,8 +143,8 @@ public class StoredProcedureItemReader extends AbstractCursorItemReader { @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - Assert.notNull(procedureName, "The name of the stored procedure must be provided"); - Assert.notNull(rowMapper, "RowMapper must be provided"); + Assert.state(procedureName != null, "The name of the stored procedure must be provided"); + Assert.state(rowMapper != null, "RowMapper must be provided"); } @Override diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java index e02495d3a..c2bd2a9a0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java @@ -69,8 +69,8 @@ public class HibernateNativeQueryProvider extends AbstractHibernateQueryProvi } public void afterPropertiesSet() throws Exception { - Assert.isTrue(StringUtils.hasText(sqlQuery), "Native SQL query cannot be empty"); - Assert.notNull(entityClass, "Entity class cannot be NULL"); + Assert.state(StringUtils.hasText(sqlQuery), "Native SQL query cannot be empty"); + Assert.state(entityClass != null, "Entity class cannot be NULL"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNamedQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNamedQueryProvider.java index dc4ea290b..da2bae86f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNamedQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNamedQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-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. @@ -57,8 +57,8 @@ public class JpaNamedQueryProvider extends AbstractJpaQueryProvider { @Override public void afterPropertiesSet() throws Exception { - Assert.isTrue(StringUtils.hasText(this.namedQuery), "Named query cannot be empty"); - Assert.notNull(this.entityClass, "Entity class cannot be NULL"); + Assert.state(StringUtils.hasText(this.namedQuery), "Named query cannot be empty"); + Assert.state(this.entityClass != null, "Entity class cannot be NULL"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java index 9dbf9d5ca..8ed742121 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.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. @@ -53,8 +53,8 @@ public class JpaNativeQueryProvider extends AbstractJpaQueryProvider { @Override public void afterPropertiesSet() throws Exception { - Assert.isTrue(StringUtils.hasText(sqlQuery), "Native SQL query cannot be empty"); - Assert.notNull(entityClass, "Entity class cannot be NULL"); + Assert.state(StringUtils.hasText(sqlQuery), "Native SQL query cannot be empty"); + Assert.state(entityClass != null, "Entity class cannot be NULL"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java index 34545fc57..6a19a371d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java @@ -286,7 +286,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(lineMapper, "LineMapper is required"); + Assert.state(lineMapper != null, "LineMapper is required"); } @Override diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java index 520b41d31..8bee1294a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java @@ -56,7 +56,7 @@ public class FlatFileItemWriter extends AbstractFileItemWriter { */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(lineAggregator, "A LineAggregator must be provided."); + Assert.state(lineAggregator != null, "A LineAggregator must be provided."); if (append) { shouldDeleteIfExists = false; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java index b47ad613e..5392887fa 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 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. @@ -52,8 +52,8 @@ public class DefaultLineMapper implements LineMapper, InitializingBean { @Override public void afterPropertiesSet() { - Assert.notNull(tokenizer, "The LineTokenizer must be set"); - Assert.notNull(fieldSetMapper, "The FieldSetMapper must be set"); + Assert.state(tokenizer != null, "The LineTokenizer must be set"); + Assert.state(fieldSetMapper != null, "The FieldSetMapper must be set"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java index 9d26e6fd8..58f0d3ffd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 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. @@ -68,7 +68,7 @@ public class PatternMatchingCompositeLineMapper implements LineMapper, Ini @Override public void afterPropertiesSet() throws Exception { this.tokenizer.afterPropertiesSet(); - Assert.isTrue(this.patternMatcher != null, "The 'patternMatcher' property must be non-null"); + Assert.state(this.patternMatcher != null, "The 'patternMatcher' property must be non-null"); } public void setTokenizers(Map tokenizers) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java index 6bf43d6ab..083839d2c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 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. @@ -60,7 +60,7 @@ public class BeanWrapperFieldExtractor implements FieldExtractor, Initiali @Override public void afterPropertiesSet() { - Assert.notNull(names, "The 'names' property must be set."); + Assert.state(names != null, "The 'names' property must be set."); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java index 74181a735..717ec49d6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 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. @@ -274,7 +274,7 @@ public class DelimitedLineTokenizer extends AbstractLineTokenizer implements Ini @Override public void afterPropertiesSet() throws Exception { - Assert.hasLength(this.delimiter, "A delimiter is required"); + Assert.state(StringUtils.hasLength(this.delimiter), "A delimiter is required"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java index 25cdd507e..54a061e7f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2019 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. @@ -56,7 +56,7 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini */ @Override public void afterPropertiesSet() throws Exception { - Assert.isTrue(this.tokenizers != null, "The 'tokenizers' property must be non-empty"); + Assert.state(this.tokenizers != null, "The 'tokenizers' property must be non-empty"); } public void setTokenizers(Map tokenizers) { 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 index b55728378..b9591dbf1 100644 --- 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-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. @@ -90,7 +90,7 @@ public class JmsItemReader implements ItemReader, InitializingBean { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.jmsTemplate, "The 'jmsTemplate' is required."); + Assert.state(this.jmsTemplate != null, "The 'jmsTemplate' is required."); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemWriter.java index 3e496a465..c494b9333 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemWriter.java @@ -72,8 +72,8 @@ public class KafkaItemWriter extends KeyValueItemWriter { @Override protected void init() { - Assert.notNull(this.kafkaTemplate, "KafkaTemplate must not be null."); - Assert.notNull(this.kafkaTemplate.getDefaultTopic(), "KafkaTemplate must have the default topic set."); + Assert.state(this.kafkaTemplate != null, "KafkaTemplate must not be null."); + Assert.state(this.kafkaTemplate.getDefaultTopic() != null, "KafkaTemplate must have the default topic set."); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifReader.java index 7e8035f14..3464143c5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2005-2019 the original author or authors. + * Copyright 2005-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. @@ -175,8 +175,8 @@ public class LdifReader extends AbstractItemCountingItemStreamItemReader extends AbstractItemCountingItemStreamItemRead } public void afterPropertiesSet() throws Exception { - Assert.notNull(resource, "A resource is required to parse."); - Assert.notNull(ldifParser, "A parser is required"); + Assert.state(resource != null, "A resource is required to parse."); + Assert.state(ldifParser != null, "A parser is required"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java index c210bb63d..4b23a000f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java @@ -93,8 +93,8 @@ public class CompositeItemProcessor implements ItemProcessor, Initia @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(delegates, "The 'delegates' may not be null"); - Assert.notEmpty(delegates, "The 'delegates' may not be empty"); + Assert.state(delegates != null, "The 'delegates' may not be null"); + Assert.state(!delegates.isEmpty(), "The 'delegates' may not be empty"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java index 5613f16a6..027583343 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java @@ -88,8 +88,8 @@ public class CompositeItemWriter implements ItemStreamWriter, Initializing @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(delegates, "The 'delegates' may not be null"); - Assert.notEmpty(delegates, "The 'delegates' may not be empty"); + Assert.state(delegates != null, "The 'delegates' may not be null"); + Assert.state(!delegates.isEmpty(), "The 'delegates' may not be empty"); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java index 30315ade9..79a0840c5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-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. @@ -139,7 +139,7 @@ public class ScriptItemProcessor implements ItemProcessor, Initializ "Either a script source or script file must be provided, not both"); if (scriptSource != null && scriptEvaluator instanceof StandardScriptEvaluator) { - Assert.isTrue(StringUtils.hasLength(language), + Assert.state(StringUtils.hasLength(language), "Language must be provided when using the default ScriptEvaluator and raw source code"); ((StandardScriptEvaluator) scriptEvaluator).setLanguage(language); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java index 7f8f75dfb..5b79c401e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-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. @@ -71,7 +71,7 @@ public class SynchronizedItemStreamReader implements ItemStreamReader, Ini @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.delegate, "A delegate item reader is required"); + Assert.state(this.delegate != null, "A delegate item reader is required"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java index 2cfe6fc3f..f655bdac5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java @@ -82,7 +82,7 @@ public class SynchronizedItemStreamWriter implements ItemStreamWriter, Ini @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(this.delegate, "A delegate item writer is required"); + Assert.state(this.delegate != null, "A delegate item writer is required"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java index d4b8e5d0a..4db6e7bb7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 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. @@ -85,7 +85,7 @@ public class SpringValidator implements Validator, InitializingBean { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(validator, "validator must be set"); + Assert.state(validator != null, "validator must be set"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java index d48cd882d..4b1e2aeef 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2019 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. @@ -91,7 +91,7 @@ public class ValidatingItemProcessor implements ItemProcessor, Initiali @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(validator, "Validator must not be null."); + Assert.state(validator != null, "Validator must not be null."); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java index 9a91b2876..39d4615e5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java @@ -160,10 +160,10 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(unmarshaller, "The Unmarshaller must not be null."); - Assert.notEmpty(fragmentRootElementNames, "The FragmentRootElementNames must not be empty"); + Assert.state(unmarshaller != null, "The Unmarshaller must not be null."); + Assert.state(!fragmentRootElementNames.isEmpty(), "The FragmentRootElementNames must not be empty"); for (QName fragmentRootElementName : fragmentRootElementNames) { - Assert.hasText(fragmentRootElementName.getLocalPart(), + Assert.state(StringUtils.hasText(fragmentRootElementName.getLocalPart()), "The FragmentRootElementNames must not contain empty elements"); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java index 8bf4ce9f3..8af557693 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java @@ -367,7 +367,7 @@ public class StaxEventItemWriter extends AbstractItemStreamItemWriter */ @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(marshaller, "A Marshaller is required"); + Assert.state(marshaller != null, "A Marshaller is required"); if (rootTagName.contains("{")) { rootTagNamespace = rootTagName.replaceAll("\\{(.*)\\}.*", "$1"); rootTagName = rootTagName.replaceAll("\\{.*\\}(.*)", "$1"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java index d62f06ab0..83e389d27 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java @@ -60,7 +60,7 @@ class RepositoryItemWriterTests { writer.setRepository(repository); writer.setMethodName(""); - Exception exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); assertEquals("methodName must not be empty.", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java index 711679fb7..5ac931037 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java @@ -231,7 +231,7 @@ class ExtendedConnectionDataSourceProxyTests { void delegateIsRequired() { ExtendedConnectionDataSourceProxy tested = new ExtendedConnectionDataSourceProxy(null); - assertThrows(IllegalArgumentException.class, tested::afterPropertiesSet); + assertThrows(IllegalStateException.class, tested::afterPropertiesSet); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java index 21e375a9c..ef7561f50 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java @@ -85,17 +85,17 @@ class JdbcBatchItemWriterClassicTests { @Test void testAfterPropertiesSet() { writer = new JdbcBatchItemWriter<>(); - Exception exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); assertTrue(exception.getMessage().contains("NamedParameterJdbcTemplate"), "Message does not contain ' NamedParameterJdbcTemplate'."); writer.setJdbcTemplate(new NamedParameterJdbcTemplate(jdbcTemplate)); - exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); String message = exception.getMessage(); assertTrue(message.toLowerCase().contains("sql"), "Message does not contain 'sql'."); writer.setSql("select * from foo where id = ?"); - exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); assertTrue(exception.getMessage().contains("ItemPreparedStatementSetter"), "Message does not contain 'ItemPreparedStatementSetter'."); 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 index 1d5939e2e..30ffdce93 100644 --- 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 @@ -101,13 +101,13 @@ public class JdbcBatchItemWriterNamedParameterTests { @Test void testAfterPropertiesSet() { writer = new JdbcBatchItemWriter<>(); - Exception exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); String message = exception.getMessage(); assertTrue(message.contains("NamedParameterJdbcTemplate"), "Message does not contain 'NamedParameterJdbcTemplate'."); writer.setJdbcTemplate(namedParameterJdbcOperations); - exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); message = exception.getMessage().toLowerCase(); assertTrue(message.contains("sql"), "Message does not contain 'sql'."); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java index 4d523519f..d9e78bc90 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java @@ -61,7 +61,7 @@ class JpaItemWriterTests { @Test void testAfterPropertiesSet() { writer = new JpaItemWriter<>(); - Exception exception = assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + Exception exception = assertThrows(IllegalStateException.class, writer::afterPropertiesSet); String message = exception.getMessage(); assertTrue(message.contains("EntityManagerFactory"), "Wrong message for exception: " + message); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index e96440b7a..c0c74d86b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -545,7 +545,7 @@ class FlatFileItemWriterTests { @Test void testAfterPropertiesSetChecksMandatory() { writer = new FlatFileItemWriter<>(); - assertThrows(IllegalArgumentException.class, writer::afterPropertiesSet); + assertThrows(IllegalStateException.class, writer::afterPropertiesSet); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java index ea8fb42bc..47ee5aecc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java @@ -35,13 +35,13 @@ class DefaultLineMapperTests { @Test void testMandatoryTokenizer() { - assertThrows(IllegalArgumentException.class, tested::afterPropertiesSet); + assertThrows(IllegalStateException.class, tested::afterPropertiesSet); } @Test void testMandatoryMapper() { tested.setLineTokenizer(new DelimitedLineTokenizer()); - assertThrows(IllegalArgumentException.class, tested::afterPropertiesSet); + assertThrows(IllegalStateException.class, tested::afterPropertiesSet); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java index eb375456c..4696559dc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java @@ -140,7 +140,7 @@ class DelimitedLineTokenizerTests { @Test void testDelimitedLineTokenizerEmptyString() { DelimitedLineTokenizer tokenizer = new DelimitedLineTokenizer(""); - assertThrows(IllegalArgumentException.class, tokenizer::afterPropertiesSet); + assertThrows(IllegalStateException.class, tokenizer::afterPropertiesSet); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java index 78f54061f..4a5e3159c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java @@ -38,7 +38,7 @@ class PatternMatchingCompositeLineTokenizerTests { @Test void testNoTokenizers() { - assertThrows(IllegalArgumentException.class, tokenizer::afterPropertiesSet); + assertThrows(IllegalStateException.class, tokenizer::afterPropertiesSet); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/KafkaItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/KafkaItemWriterTests.java index 069376803..ddebe9d80 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/KafkaItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/KafkaItemWriterTests.java @@ -69,11 +69,11 @@ class KafkaItemWriterTests { void testAfterPropertiesSet() { this.writer = new KafkaItemWriter<>(); - Exception exception = assertThrows(IllegalArgumentException.class, () -> this.writer.afterPropertiesSet()); + Exception exception = assertThrows(IllegalStateException.class, () -> this.writer.afterPropertiesSet()); assertEquals("itemKeyMapper requires a Converter type.", exception.getMessage()); this.writer.setItemKeyMapper(this.itemKeyMapper); - exception = assertThrows(IllegalArgumentException.class, () -> this.writer.afterPropertiesSet()); + exception = assertThrows(IllegalStateException.class, () -> this.writer.afterPropertiesSet()); assertEquals("KafkaTemplate must not be null.", exception.getMessage()); this.writer.setKafkaTemplate(this.kafkaTemplate); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java index b82040c09..f8d15de35 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java @@ -103,11 +103,11 @@ class CompositeItemProcessorTests { // value not set composite.setDelegates(null); - assertThrows(IllegalArgumentException.class, composite::afterPropertiesSet); + assertThrows(IllegalStateException.class, composite::afterPropertiesSet); // empty list composite.setDelegates(new ArrayList>()); - assertThrows(IllegalArgumentException.class, composite::afterPropertiesSet); + assertThrows(IllegalStateException.class, composite::afterPropertiesSet); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamWriterTests.java index 6df1ab650..20c6b7508 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamWriterTests.java @@ -36,7 +36,7 @@ class SynchronizedItemStreamWriterTests extends AbstractSynchronizedItemStreamWr @Test void testDelegateIsNotNullWhenPropertiesSet() { - final Exception expectedException = assertThrows(IllegalArgumentException.class, + final Exception expectedException = assertThrows(IllegalStateException.class, () -> ((InitializingBean) new SynchronizedItemStreamWriter<>()).afterPropertiesSet()); assertEquals("A delegate item writer is required", expectedException.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java index f8f4d8e9d..a13e49d64 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java @@ -44,7 +44,7 @@ class SpringValidatorTests { @Test void testNullValidator() { validator.setValidator(null); - assertThrows(IllegalArgumentException.class, validator::afterPropertiesSet); + assertThrows(IllegalStateException.class, validator::afterPropertiesSet); } /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index 858e20fcf..c46b9321e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -116,11 +116,11 @@ class StaxEventItemReaderTests { source = createNewInputSource(); source.setFragmentRootElementName(""); - assertThrows(IllegalArgumentException.class, source::afterPropertiesSet); + assertThrows(IllegalStateException.class, source::afterPropertiesSet); source = createNewInputSource(); source.setUnmarshaller(null); - assertThrows(IllegalArgumentException.class, source::afterPropertiesSet); + assertThrows(IllegalStateException.class, source::afterPropertiesSet); } /** diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java index 9785cdf5c..f1ef5bd74 100644 --- a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java +++ b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java @@ -104,7 +104,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(dataSource, "A DataSource is required"); + Assert.state(dataSource != null, "A DataSource is required"); initialize(); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java index db1ddbcf0..97283df8e 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2019 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. @@ -59,7 +59,7 @@ public class AsyncItemProcessor implements ItemProcessor>, In * @see InitializingBean#afterPropertiesSet() */ public void afterPropertiesSet() throws Exception { - Assert.notNull(delegate, "The delegate must be set."); + Assert.state(delegate != null, "The delegate must be set."); } /** diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java index 65c4932fe..4b3336afc 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java @@ -39,7 +39,7 @@ public class AsyncItemWriter implements ItemStreamWriter>, Initiali private ItemWriter delegate; public void afterPropertiesSet() throws Exception { - Assert.notNull(delegate, "A delegate ItemWriter must be provided."); + Assert.state(delegate != null, "A delegate ItemWriter must be provided."); } /** diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java index 2ff1c65a2..4b68bcbbb 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java @@ -56,7 +56,7 @@ public class ChunkProcessorChunkHandler implements ChunkHandler, Initializ * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ public void afterPropertiesSet() throws Exception { - Assert.notNull(chunkProcessor, "A ChunkProcessor must be provided"); + Assert.state(chunkProcessor != null, "A ChunkProcessor must be provided"); } /** diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java index 4b48a6836..334634684 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java @@ -111,7 +111,7 @@ public class MessageChannelPartitionHandler extends AbstractPartitionHandler imp @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(stepName, "A step name must be provided for the remote workers."); + Assert.state(stepName != null, "A step name must be provided for the remote workers."); Assert.state(messagingGateway != null, "The MessagingOperations must be set"); pollRepositoryForResults = !(dataSource == null && jobExplorer == null); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java index 50f859617..6ad12bf2e 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorTests.java @@ -46,7 +46,7 @@ class AsyncItemProcessorTests { @Test void testNoDelegate() { - assertThrows(IllegalArgumentException.class, processor::afterPropertiesSet); + assertThrows(IllegalStateException.class, processor::afterPropertiesSet); } @Test diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java index 7bff52b4d..bef7c2eaf 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2012 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. @@ -39,7 +39,7 @@ public class StagingItemListener extends StepListenerSupport impleme @Override public final void afterPropertiesSet() throws Exception { - Assert.notNull(jdbcTemplate, "You must provide a DataSource."); + Assert.state(jdbcTemplate != null, "You must provide a DataSource."); } @Override diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java index a3a615109..27969c69e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2019 the original author or authors. + * Copyright 2009-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. @@ -49,7 +49,7 @@ public class StagingItemProcessor implements ItemProcessor @Override public final void afterPropertiesSet() throws Exception { - Assert.notNull(jdbcTemplate, "You must provide a DataSource."); + Assert.state(jdbcTemplate != null, "You must provide a DataSource."); } private List retrieveKeys() { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java index 5fe6427df..b49d2fe25 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 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. @@ -68,7 +68,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper