From 3102aa0265eaf25e2c72fd88bcdec377e5ce4bad Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 24 Sep 2021 16:21:34 -0400 Subject: [PATCH] Update so that it can be natively compiled by Spring Native 0.11 --- .../batch/autoconfigure/SingleStepJobAutoConfiguration.java | 2 +- .../flatfile/FlatFileItemReaderAutoConfiguration.java | 2 +- .../flatfile/FlatFileItemWriterAutoConfiguration.java | 2 +- .../jdbc/JdbcBatchItemWriterAutoConfiguration.java | 2 +- .../jdbc/JdbcCursorItemReaderAutoConfiguration.java | 2 +- .../autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java | 2 +- .../autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java | 2 +- .../autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java | 2 +- .../autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java | 2 +- .../task/batch/configuration/TaskBatchAutoConfiguration.java | 4 ++-- .../batch/configuration/TaskJobLauncherAutoConfiguration.java | 2 +- .../cloud/task/batch/listener/PrefixTests.java | 2 +- .../cloud/task/configuration/SimpleTaskAutoConfiguration.java | 2 +- .../cloud/task/configuration/SingleTaskConfiguration.java | 2 +- .../cloud/task/configuration/TaskLifecycleConfiguration.java | 3 +-- .../src/main/java/io/spring/cloud/BatchEventsApplication.java | 2 +- .../java/io/spring/cloud/BatchEventsApplicationTests.java | 2 +- .../main/java/io/spring/configuration/JobConfiguration.java | 2 +- .../spring/configuration/EmbeddedDataSourceConfiguration.java | 2 +- .../spring/configuration/ExternalDataSourceConfiguration.java | 2 +- .../io/spring/MultiDataSourcesExternalApplicationTests.java | 2 +- .../src/main/java/io/spring/JobConfiguration.java | 2 +- .../cloud/task/partitioner/TaskPartitionerTests.java | 2 +- .../src/main/java/io/spring/TaskEventsApplication.java | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 2 +- .../java/io/spring/configuration/TaskSinkConfiguration.java | 2 +- .../cloud/task/timestamp/TimestampTaskPropertiesTests.java | 2 +- .../task/batch/listener/BatchEventAutoConfiguration.java | 4 ++-- .../cloud/task/listener/TaskEventAutoConfiguration.java | 4 ++-- .../cloud/task/batch/listener/JobExecutionEventTests.java | 2 +- .../TaskBatchEventListenerBeanPostProcessorTests.java | 2 +- .../task/launcher/TaskLaunchConfigurationExistingTests.java | 2 +- .../cloud/task/launcher/configuration/TaskConfiguration.java | 2 +- 33 files changed, 36 insertions(+), 37 deletions(-) diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java index 8193c03c..e9c86fe2 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SingleStepJobProperties.class) @AutoConfigureBefore(BatchAutoConfiguration.class) public class SingleStepJobAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java index d698f929..70f64270 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration; * @author Glenn Renfro * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(FlatFileItemReaderProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) public class FlatFileItemReaderAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java index b6734e76..97a137a5 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(FlatFileItemWriterProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) public class FlatFileItemWriterAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java index 1d6a14c3..110a4e33 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JdbcBatchItemWriterProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) public class JdbcBatchItemWriterAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java index baf1fb66..27fdd0e8 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.jdbc.core.RowMapper; * @author Glenn Renfro * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JdbcCursorItemReaderProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.batch.job.jdbccursoritemreader", name = "name") diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java index 58961696..df8f8d1c 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.util.StringUtils; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ KafkaProperties.class, KafkaItemReaderProperties.class }) @AutoConfigureAfter(BatchAutoConfiguration.class) public class KafkaItemReaderAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java index 3f9681ff..ce46f336 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.util.Assert; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ KafkaProperties.class, KafkaItemWriterProperties.class }) @AutoConfigureAfter(BatchAutoConfiguration.class) public class KafkaItemWriterAutoConfiguration { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java index d87d635d..3c6630e5 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AmqpItemReaderProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) @ConditionalOnProperty(name = "spring.batch.job.amqpitemreader.enabled", diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java index 22df0470..446db096 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Michael Minella * @since 2.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AmqpItemWriterProperties.class) @AutoConfigureAfter(BatchAutoConfiguration.class) @ConditionalOnProperty(name = "spring.batch.job.amqpitemwriter.enabled", diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java index 9ac7b211..ad11fb21 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * * @author Michael Minella */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean({ Job.class }) @ConditionalOnProperty( name = { "spring.cloud.task.batch.listener.enable", @@ -55,7 +55,7 @@ public class TaskBatchAutoConfiguration { /** * Auto configuration for {@link TaskBatchExecutionListener}. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "taskBatchExecutionListener") @EnableConfigurationProperties(TaskProperties.class) public static class TaskBatchExecutionListenerAutoconfiguration { diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java index 8a9e3b1c..5bca6c93 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * * @author Glenn Renfro */ -@Configuration +@Configuration(proxyBeanMethods = false) @Conditional(JobLaunchCondition.class) @EnableConfigurationProperties(TaskBatchProperties.class) @AutoConfigureBefore(BatchAutoConfiguration.class) diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java index 3543e967..451735a5 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java @@ -66,7 +66,7 @@ public class PrefixTests { assertThat(jobIds.contains(1L)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing @TaskBatchTest @EnableTask diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java index f20e528e..8593cb06 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java @@ -50,7 +50,7 @@ import org.springframework.util.CollectionUtils; * @author Glenn Renfro * @author Michael Minella */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableTransactionManagement @EnableConfigurationProperties({ TaskProperties.class }) // @checkstyle:off diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java index 4ffbdaf5..4fc0b9dc 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SingleTaskConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.integration.support.locks.PassThruLockRegistry; */ @Order(Ordered.HIGHEST_PRECEDENCE) -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.cloud.task", name = "single-instance-enabled", havingValue = "true") public class SingleTaskConfiguration { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java index f8ff6bcd..31419adf 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Michael Minella * @since 2.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class TaskLifecycleConfiguration { protected static final Log logger = LogFactory @@ -67,7 +67,6 @@ public class TaskLifecycleConfiguration { ConfigurableApplicationContext context, TaskRepository taskRepository, TaskExplorer taskExplorer, TaskNameResolver taskNameResolver, ObjectProvider applicationArguments) { - this.taskProperties = taskProperties; this.context = context; this.taskRepository = taskRepository; diff --git a/spring-cloud-task-samples/batch-events/src/main/java/io/spring/cloud/BatchEventsApplication.java b/spring-cloud-task-samples/batch-events/src/main/java/io/spring/cloud/BatchEventsApplication.java index c40c362f..979b8024 100644 --- a/spring-cloud-task-samples/batch-events/src/main/java/io/spring/cloud/BatchEventsApplication.java +++ b/spring-cloud-task-samples/batch-events/src/main/java/io/spring/cloud/BatchEventsApplication.java @@ -47,7 +47,7 @@ public class BatchEventsApplication { SpringApplication.run(BatchEventsApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class JobConfiguration { private static final int DEFAULT_CHUNK_COUNT = 3; diff --git a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java index 8d270a3a..4a23f181 100644 --- a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java +++ b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java @@ -65,7 +65,7 @@ public class BatchEventsApplicationTests { @EnableBinding(Sink.class) @PropertySource("classpath:io/spring/task/listener/job-listener-sink-channel.properties") - @Configuration + @Configuration(proxyBeanMethods = false) public static class JobExecutionListenerBinding { @StreamListener(Sink.INPUT) diff --git a/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java b/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java index fe1b0fd2..67c244f7 100644 --- a/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java +++ b/spring-cloud-task-samples/batch-job/src/main/java/io/spring/configuration/JobConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Michael Minella */ -@Configuration +@Configuration(proxyBeanMethods = false) public class JobConfiguration { private static final Log logger = LogFactory.getLog(JobConfiguration.class); diff --git a/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/EmbeddedDataSourceConfiguration.java b/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/EmbeddedDataSourceConfiguration.java index b74f44a8..a746168a 100644 --- a/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/EmbeddedDataSourceConfiguration.java +++ b/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/EmbeddedDataSourceConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; * @author Michael Minella * @author Glenn Renfro */ -@Configuration +@Configuration(proxyBeanMethods = false) @Profile("embedded") public class EmbeddedDataSourceConfiguration { diff --git a/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/ExternalDataSourceConfiguration.java b/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/ExternalDataSourceConfiguration.java index d7e7891b..0c68e2a7 100644 --- a/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/ExternalDataSourceConfiguration.java +++ b/spring-cloud-task-samples/multiple-datasources/src/main/java/io/spring/configuration/ExternalDataSourceConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; * Creates two data sources that use external databases. * @author Glenn Renfro */ -@Configuration +@Configuration(proxyBeanMethods = false) @Profile("external") public class ExternalDataSourceConfiguration { diff --git a/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesExternalApplicationTests.java b/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesExternalApplicationTests.java index d02bdde7..ee030788 100644 --- a/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesExternalApplicationTests.java +++ b/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesExternalApplicationTests.java @@ -87,7 +87,7 @@ public class MultiDataSourcesExternalApplicationTests { .as("Unable to find update task message: " + output).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TaskLauncherConfiguration { private static Server defaultServer; diff --git a/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java index d0da0d3d..215d17f2 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java +++ b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.core.io.Resource; /** * @author Michael Minella */ -@Configuration +@Configuration(proxyBeanMethods = false) public class JobConfiguration { private static final int GRID_SIZE = 4; diff --git a/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java b/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java index 233516df..389d8b2e 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java +++ b/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java @@ -113,7 +113,7 @@ public class TaskPartitionerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TaskLauncherConfiguration { @Bean(destroyMethod = "stop") diff --git a/spring-cloud-task-samples/task-events/src/main/java/io/spring/TaskEventsApplication.java b/spring-cloud-task-samples/task-events/src/main/java/io/spring/TaskEventsApplication.java index eea36d79..ff7a2ef9 100644 --- a/spring-cloud-task-samples/task-events/src/main/java/io/spring/TaskEventsApplication.java +++ b/spring-cloud-task-samples/task-events/src/main/java/io/spring/TaskEventsApplication.java @@ -31,7 +31,7 @@ public class TaskEventsApplication { SpringApplication.run(TaskEventsApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TaskConfiguration { @Bean diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 53c44e3d..09997419 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud tasksink - 2.3.1-SNAPSHOT + 2.4.0-SNAPSHOT jar Task Sink Sample Application diff --git a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java index 61597ba2..5d4b78f3 100644 --- a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java +++ b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock; /** * @author Glenn Renfro */ -@Configuration +@Configuration(proxyBeanMethods = false) public class TaskSinkConfiguration { @Bean diff --git a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java index 8e61501c..48317691 100644 --- a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java +++ b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java @@ -70,7 +70,7 @@ public class TimestampTaskPropertiesTests { .isEqualTo(FORMAT); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TimestampTaskProperties.class) static class Conf { } diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java index d9821eba..ed2430a3 100644 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java +++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java @@ -60,7 +60,7 @@ import org.springframework.messaging.MessageChannel; * @author Glenn Renfro * @author Ali Shahbour */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Job.class) @ConditionalOnBean({ Job.class, TaskLifecycleListener.class }) // @checkstyle:off @@ -177,7 +177,7 @@ public class BatchEventAutoConfiguration { /** * Configuration for Job Execution Listener. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableBinding.class) @EnableBinding(BatchEventsChannels.class) @EnableConfigurationProperties(TaskEventProperties.class) diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java index 09b419bf..f1f011f7 100644 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java +++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/listener/TaskEventAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.messaging.MessageChannel; /** * @author Michael Minella */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableBinding.class) @ConditionalOnBean(TaskLifecycleListener.class) // @checkstyle:off @@ -64,7 +64,7 @@ public class TaskEventAutoConfiguration { /** * Configuration for a {@link TaskExecutionListener}. */ - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBinding(TaskEventChannels.class) public static class ListenerConfiguration { diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java index ffbe0935..143446d7 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/JobExecutionEventTests.java @@ -373,7 +373,7 @@ public class JobExecutionEventTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class EventJobExecutionConfiguration { } diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchEventListenerBeanPostProcessorTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchEventListenerBeanPostProcessorTests.java index 2b55f572..bec41a18 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchEventListenerBeanPostProcessorTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchEventListenerBeanPostProcessorTests.java @@ -116,7 +116,7 @@ public class TaskBatchEventListenerBeanPostProcessorTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration public static class TestConfiguration { diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java index 4d428db8..4baa6e8a 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java @@ -54,7 +54,7 @@ public class TaskLaunchConfigurationExistingTests { assertThat(taskLauncher).isEqualTo(testTaskLauncher); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestTaskDeployerConfiguration { @Bean diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java index ef4d3235..8bb0d374 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Glenn Renfro */ -@Configuration +@Configuration(proxyBeanMethods = false) public class TaskConfiguration { @Bean