removed spring allow-bean-definition overriding issue

pom.xml

@@ -32,7 +32,7 @@
         </developer>
     </developers>
 
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.2.3-SNAPSHOT</version>
 
     <modules>
         <module>spring-batch-lightmin-core</module>
@@ -48,6 +48,7 @@
         <module>spring-batch-lightmin-embedded</module>
         <module>spring-batch-lightmin-validation</module>
         <module>spring-batch-lightmin-metrics</module>
+        <module>spring-batch-lightmin-bom</module>
     </modules>
 
     <properties>

spring-batch-lightmin-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-bom/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.tuxdevelop</groupId>
     <artifactId>spring-batch-lightmin-bom</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Spring Batch Lightmin BOM</name>

spring-batch-lightmin-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-classic/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-client</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/classic/configuration/ClassicLightminClientConfiguration.java

@@ -6,6 +6,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.web.client.RestTemplate;
 import org.tuxdevelop.spring.batch.lightmin.client.annotation.EnableLightminClientCore;
 import org.tuxdevelop.spring.batch.lightmin.client.classic.event.OnClientApplicationReadyEventListener;
@@ -14,12 +15,14 @@
 import org.tuxdevelop.spring.batch.lightmin.client.classic.service.LightminClientRegistratorService;
 import org.tuxdevelop.spring.batch.lightmin.client.classic.service.UrlLightminServerLocatorService;
 import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties;
+import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientPublishEventsConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService;
 
 @Configuration
 @EnableLightminClientCore
 @EnableConfigurationProperties(
         value = {LightminClientClassicConfigurationProperties.class})
+@Import(LightminClientPublishEventsConfiguration.class)
 public class ClassicLightminClientConfiguration {
 
     @Bean

spring-batch-lightmin-client/spring-batch-lightmin-client-classic/src/test/resources/application.yml

@@ -1,6 +1,4 @@
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: test_application
   batch:

spring-batch-lightmin-client/spring-batch-lightmin-client-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-client</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientConfiguration.java

@@ -53,38 +53,6 @@ public RestTemplate serverRestTemplate(final LightminClientProperties lightminCl
                 lightminClientProperties.getServer());
     }
 
-    @Configuration
-    @ConditionalOnProperty(
-            prefix = "spring.batch.lightmin.client",
-            value = "publish-job-events",
-            havingValue = "true",
-            matchIfMissing = true)
-    public static class LightminClientPublishEventsConfiguration {
-
-        @Bean
-        @ConditionalOnMissingBean(value = {StepExecutionEventPublisher.class})
-        public StepExecutionEventPublisher stepExecutionEventPublisher(
-                final LightminServerLocatorService lightminServerLocator,
-                @Qualifier("serverRestTemplate") final RestTemplate restTemplate) {
-            return new RemoteStepExecutionEventPublisher(restTemplate, lightminServerLocator);
-        }
-
-        @Bean
-        @ConditionalOnMissingBean(value = {JobExecutionEventPublisher.class})
-        public JobExecutionEventPublisher jobExecutionEventPublisher(
-                final LightminServerLocatorService lightminServerLocatorService,
-                @Qualifier("serverRestTemplate") final RestTemplate restTemplate) {
-            return new RemoteJobExecutionEventPublisher(restTemplate, lightminServerLocatorService);
-        }
-
-        @Bean
-        public OnJobExecutionFinishedEventListener onJobExecutionFinishedEventListener(
-                final JobExecutionEventPublisher jobExecutionEventPublisher,
-                final StepExecutionEventPublisher stepExecutionEventPublisher) {
-            return new OnJobExecutionFinishedEventListener(jobExecutionEventPublisher, stepExecutionEventPublisher);
-        }
-    }
-
     @Configuration
     @ConditionalOnProperty(
             prefix = "spring.batch.lightmin.client",

spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientPublishEventsConfiguration.java

@@ -0,0 +1,46 @@
+package org.tuxdevelop.spring.batch.lightmin.client.configuration;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+import org.tuxdevelop.spring.batch.lightmin.client.listener.OnJobExecutionFinishedEventListener;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.JobExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.RemoteJobExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.RemoteStepExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.publisher.StepExecutionEventPublisher;
+import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService;
+
+@Configuration
+@ConditionalOnProperty(
+        prefix = "spring.batch.lightmin.client",
+        value = "publish-job-events",
+        havingValue = "true",
+        matchIfMissing = true)
+public class LightminClientPublishEventsConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(value = {StepExecutionEventPublisher.class})
+    public StepExecutionEventPublisher stepExecutionEventPublisher(
+            final LightminServerLocatorService lightminServerLocator,
+            @Qualifier("serverRestTemplate") final RestTemplate restTemplate) {
+        return new RemoteStepExecutionEventPublisher(restTemplate, lightminServerLocator);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(value = {JobExecutionEventPublisher.class})
+    public JobExecutionEventPublisher jobExecutionEventPublisher(
+            final LightminServerLocatorService lightminServerLocatorService,
+            @Qualifier("serverRestTemplate") final RestTemplate restTemplate) {
+        return new RemoteJobExecutionEventPublisher(restTemplate, lightminServerLocatorService);
+    }
+
+    @Bean
+    public OnJobExecutionFinishedEventListener onJobExecutionFinishedEventListener(
+            final JobExecutionEventPublisher jobExecutionEventPublisher,
+            final StepExecutionEventPublisher stepExecutionEventPublisher) {
+        return new OnJobExecutionFinishedEventListener(jobExecutionEventPublisher, stepExecutionEventPublisher);
+    }
+}

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-client</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-consul/src/test/resources/application.yml

@@ -1,6 +1,4 @@
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: test_application
   batch:

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-client</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/discovery/configuration/LightminClientDiscoveryConfiguration.java

@@ -1,7 +1,6 @@
 package org.tuxdevelop.spring.batch.lightmin.client.discovery.configuration;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -12,8 +11,6 @@
 import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientConfiguration;
 import org.tuxdevelop.spring.batch.lightmin.client.configuration.LightminClientProperties;
 import org.tuxdevelop.spring.batch.lightmin.client.discovery.listener.DiscoveryListener;
-import org.tuxdevelop.spring.batch.lightmin.client.discovery.metadata.MetaDataExtender;
-import org.tuxdevelop.spring.batch.lightmin.client.discovery.metadata.NoOperationMetaDataExtender;
 import org.tuxdevelop.spring.batch.lightmin.client.discovery.service.DiscoveryLightminServerLocatorService;
 import org.tuxdevelop.spring.batch.lightmin.client.service.LightminServerLocatorService;
 
@@ -33,12 +30,6 @@ public DiscoveryListener discoveryListener(final LightminClientProperties lightm
         return new DiscoveryListener(lightminClientProperties);
     }
 
-    @Bean
-    @ConditionalOnMissingBean(MetaDataExtender.class)
-    public MetaDataExtender metaDataExtender() {
-        return new NoOperationMetaDataExtender();
-    }
-
     @Bean
     public LightminServerLocatorService discoveryLightminServerLocator(
             final LightminClientDiscoveryProperties lightminClientDiscoveryProperties,

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-client</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-client/spring-batch-lightmin-client-discovery-eureka/src/test/resources/application.yml

@@ -1,6 +1,4 @@
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     name: test_application
   batch:

spring-batch-lightmin-core/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>spring-batch-lightmin</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-batch-lightmin-core</artifactId>

spring-batch-lightmin-core/spring-batch-lightmin-core-batch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-core</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/main/java/org/tuxdevelop/spring/batch/lightmin/batch/configuration/SpringBatchLightminBatchConfiguration.java

@@ -21,7 +21,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer;
@@ -92,12 +91,6 @@ public JobLauncher defaultAsyncJobLauncher(final JobRepository jobRepository) {
         return jobLauncher;
     }
 
-    @Primary
-    @Bean(name = "jobLauncher")
-    public JobLauncher jobLauncher(final BatchConfigurer batchConfigurer) throws Exception {
-        return batchConfigurer.getJobLauncher();
-    }
-
     @Bean
     @ConditionalOnMissingBean(value = {JobLauncher.class})
     public JobExplorer jobExplorer(final BatchConfigurer batchConfigurer) throws Exception {

spring-batch-lightmin-core/spring-batch-lightmin-core-batch/src/test/resources/application.properties

@@ -1,2 +1 @@
-spring.batch.job.enabled=false
-spring.main.allow-bean-definition-overriding=true
+spring.batch.job.enabled=false

spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-batch-lightmin-core</artifactId>
         <groupId>org.tuxdevelop</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/main/java/org/tuxdevelop/spring/batch/lightmin/configuration/SpringBatchLightminCoreConfigurationProperties.java

@@ -13,8 +13,6 @@
 @ConfigurationProperties(prefix = "spring.batch.lightmin")
 public class SpringBatchLightminCoreConfigurationProperties {
 
-    private static final String DEFAULT_DATA_SOURCE_NAME = "dataSource";
-
     private final Environment environment;
 
     @Autowired

spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/java/org/tuxdevelop/spring/batch/lightmin/util/BeanRegistrarIT.java

@@ -1,6 +1,7 @@
 package org.tuxdevelop.spring.batch.lightmin.util;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.core.Job;
@@ -19,6 +20,7 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @Slf4j
 public class BeanRegistrarIT {
@@ -28,12 +30,25 @@ public class BeanRegistrarIT {
     private Job simpleJob;
     private JobLauncher jobLauncher;
 
+    @Test
+    public void registerUnregisteredBean() {
+        this.beanRegistrar.registerBean(String.class, "firstBean", null, null, null, null, null);
+        String registeredBean = (String) this.applicationContext.getBean("firstBean");
+        assertThat(registeredBean).isNotNull();
+
+        this.beanRegistrar.unregisterBean("firstBean");
+        assertFalse(this.applicationContext.containsBeanDefinition("firstBean"));
+
+        this.beanRegistrar.registerBean(String.class, "firstBean", null, null, null, null, null);
+        registeredBean = (String) this.applicationContext.getBean("firstBean");
+        assertThat(registeredBean).isNotNull();
+    }
+
     @Test
     public void registerBeanStringIT() {
         this.beanRegistrar.registerBean(String.class, "sampleString", null, null, null, null, null);
         final String registeredBean = (String) this.applicationContext.getBean("sampleString");
         assertThat(registeredBean).isNotNull();
-        this.applicationContext.close();
     }
 
     @Test
@@ -44,7 +59,6 @@ public void registerBeanStringValueIT() {
         final String registeredBean = (String) this.applicationContext.getBean("sampleString");
         assertThat(registeredBean).isNotNull();
         assertThat(registeredBean).isEqualTo("Test");
-        this.applicationContext.close();
     }
 
     @Test(expected = NoSuchBeanDefinitionException.class)
@@ -58,7 +72,6 @@ public void unregisterBeanStringIT() {
         this.beanRegistrar.unregisterBean("sampleStringSecond");
         final String gotBean = this.applicationContext.getBean("sampleStringSecond", String.class);
         log.info("got: " + gotBean);
-        this.applicationContext.close();
     }
 
     @Test(expected = NoSuchBeanDefinitionException.class)
@@ -88,7 +101,6 @@ public void registerPeriodSchedulerIT() {
                 .class);
         assertThat(periodScheduler).isNotNull();
         periodScheduler.schedule();
-        this.applicationContext.close();
     }
 
     @Before
@@ -98,4 +110,9 @@ public void init() {
         this.simpleJob = this.applicationContext.getBean("simpleJob", Job.class);
         this.jobLauncher = this.applicationContext.getBean("jobLauncher", JobLauncher.class);
     }
+
+    @After
+    public void tearDown() {
+        this.applicationContext.close();
+    }
 }

spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/jdbc.properties

@@ -1,4 +1,3 @@
 spring.batch.job.enabled=false
 spring.batch.lightmin.batch.repository-type=jdbc
 spring.batch.lightmin.application-name=test
-spring.main.allow-bean-definition-overriding=true

spring-batch-lightmin-core/spring-batch-lightmin-core-configuration/src/test/resources/properties/map.properties

@@ -1,4 +1,3 @@
 spring.batch.job.enabled=false
 spring.batch.lightmin.batch.repository-type=map
 spring.batch.lightmin.application-name=test
-spring.main.allow-bean-definition-overriding=true