Use AutoConfiguration with marker bean for server

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerCoreConfiguration.java → spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java

@@ -38,21 +38,25 @@ import de.codecentric.boot.admin.server.web.client.HttpHeadersProvider;
 import io.netty.channel.ChannelOption;
 
 import org.reactivestreams.Publisher;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 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.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Configuration
+@ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
 @EnableConfigurationProperties(AdminServerProperties.class)
-public class AdminServerCoreConfiguration {
+@Import({AdminServerWebConfiguration.class, AdminServerNotifierConfiguration.class})
+public class AdminServerAutoConfiguration {
     private final AdminServerProperties adminServerProperties;
 
-    public AdminServerCoreConfiguration(AdminServerProperties adminServerProperties) {
+    public AdminServerAutoConfiguration(AdminServerProperties adminServerProperties) {
         this.adminServerProperties = adminServerProperties;
     }
 
@@ -138,14 +142,14 @@ public class AdminServerCoreConfiguration {
     }
 
     @Bean
-    @ConditionalOnMissingBean
-    public ClientApplicationEventStore eventStore() {
+    @ConditionalOnMissingBean(ClientApplicationEventStore.class)
+    public InMemoryEventStore eventStore() {
         return new InMemoryEventStore();
     }
 
     @Bean(initMethod = "start", destroyMethod = "stop")
     @ConditionalOnMissingBean(ApplicationRepository.class)
-    public EventSourcingApplicationRepository applicationRepository() {
-        return new EventSourcingApplicationRepository(eventStore());
+    public EventSourcingApplicationRepository applicationRepository(ClientApplicationEventStore eventStore) {
+        return new EventSourcingApplicationRepository(eventStore);
     }
 }

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/DiscoveryClientConfiguration.java → spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerDiscoveryAutoConfiguration.java

@@ -36,9 +36,10 @@ import com.netflix.discovery.EurekaClient;
 
 @Configuration
 @ConditionalOnSingleCandidate(DiscoveryClient.class)
+@ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
 @ConditionalOnProperty(prefix = "spring.boot.admin.discovery", name = "enabled", matchIfMissing = true)
-@AutoConfigureAfter({SimpleDiscoveryClientAutoConfiguration.class})
-public class DiscoveryClientConfiguration {
+@AutoConfigureAfter({AdminServerAutoConfiguration.class, SimpleDiscoveryClientAutoConfiguration.class})
+public class AdminServerDiscoveryAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
@@ -53,10 +54,10 @@ public class DiscoveryClientConfiguration {
     }
 
     @Configuration
+    @ConditionalOnMissingBean({ServiceInstanceConverter.class})
     @ConditionalOnBean(EurekaClient.class)
     public static class EurekaConverterConfiguration {
         @Bean
-        @ConditionalOnMissingBean({ServiceInstanceConverter.class})
         @ConfigurationProperties(prefix = "spring.boot.admin.discovery.converter")
         public EurekaServiceInstanceConverter serviceInstanceConverter() {
             return new EurekaServiceInstanceConverter();

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/HazelcastStoreConfiguration.java → spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerHazelcastAutoConfiguration.java

@@ -24,6 +24,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
@@ -34,20 +35,20 @@ import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
 
 @Configuration
+@ConditionalOnBean(AdminServerMarkerConfiguration.Marker.class)
 @ConditionalOnSingleCandidate(HazelcastInstance.class)
 @ConditionalOnProperty(prefix = "spring.boot.admin.hazelcast", name = "enabled", matchIfMissing = true)
-@AutoConfigureBefore(AdminServerWebConfiguration.class)
+@AutoConfigureBefore({AdminServerAutoConfiguration.class})
 @AutoConfigureAfter(HazelcastAutoConfiguration.class)
-public class HazelcastStoreConfiguration {
+public class AdminServerHazelcastAutoConfiguration {
 
     @Value("${spring.boot.admin.hazelcast.event-store:spring-boot-admin-event-store}")
     private String mapName;
 
     @Bean
-    @ConditionalOnMissingBean
-    public ClientApplicationEventStore eventStore(HazelcastInstance hazelcastInstance) {
+    @ConditionalOnMissingBean(ClientApplicationEventStore.class)
+    public HazelcastEventStore eventStore(HazelcastInstance hazelcastInstance) {
         IMap<ApplicationId, List<ClientApplicationEvent>> map = hazelcastInstance.getMap(mapName);
-
         return new HazelcastEventStore(map);
     }
 }

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerImportSelector.java → spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerMarkerConfiguration.java

@@ -13,35 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.codecentric.boot.admin.server.config;
-
-import java.util.Arrays;
-import org.springframework.context.annotation.DeferredImportSelector;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.ClassUtils;
 
-/**
- * Defers the imports for our {@code @Configuration}-classes, because the need to be processed after
- * normal @Configuration-classes.
- *
- * @author Johannes Edmeier
- */
-public class AdminServerImportSelector implements DeferredImportSelector {
+package de.codecentric.boot.admin.server.config;
 
-    @Override
-    public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-        String[] configs = {NotifierConfiguration.class.getCanonicalName(),
-                HazelcastStoreConfiguration.class.getCanonicalName(),
-                AdminServerCoreConfiguration.class.getCanonicalName(),
-                AdminServerWebConfiguration.class.getCanonicalName(),
-                DiscoveryClientConfiguration.class.getCanonicalName()};
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-        if (ClassUtils.isPresent("de.codecentric.boot.admin.ui.config.AdminServerWebUiConfiguration",
-                this.getClass().getClassLoader())) {
-            configs = Arrays.copyOf(configs, configs.length + 1);
-            configs[configs.length - 1] = "de.codecentric.boot.admin.ui.config.AdminServerWebUiConfiguration";
-        }
-        return configs;
+@Configuration
+public class AdminServerMarkerConfiguration {
+    @Bean
+    public Marker adminServerMarker() {
+        return new Marker();
     }
 
+    public static class Marker {
+    }
 }

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/NotifierConfiguration.java → spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerNotifierConfiguration.java

@@ -47,7 +47,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.mail.MailSender;
 
 @Configuration
-public class NotifierConfiguration {
+public class AdminServerNotifierConfiguration {
 
     @Configuration
     @ConditionalOnBean(Notifier.class)

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/EnableAdminServer.java

 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2014-2017 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.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Import;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(AdminServerImportSelector.class)
+@Import(AdminServerMarkerConfiguration.class)
 public @interface EnableAdminServer {
 
 }

spring-boot-admin-server/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration,\
+  de.codecentric.boot.admin.server.config.AdminServerDiscoveryAutoConfiguration,\
+  de.codecentric.boot.admin.server.config.AdminServerHazelcastAutoConfiguration
\ No newline at end of file

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/DiscoveryClientConfigurationTest.java → spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/AdminServerDiscoveryAutoConfigurationTest.java

@@ -36,7 +36,7 @@ import com.netflix.discovery.EurekaClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DiscoveryClientConfigurationTest {
+public class AdminServerDiscoveryAutoConfigurationTest {
     private AnnotationConfigWebApplicationContext context;
 
     @After
@@ -99,10 +99,9 @@ public class DiscoveryClientConfigurationTest {
         }
         applicationContext.register(UtilAutoConfiguration.class);
         applicationContext.register(RestTemplateAutoConfiguration.class);
-        applicationContext.register(AdminServerCoreConfiguration.class);
-        applicationContext.register(AdminServerWebConfiguration.class);
-        applicationContext.register(UtilAutoConfiguration.class);
-        applicationContext.register(DiscoveryClientConfiguration.class);
+        applicationContext.register(AdminServerMarkerConfiguration.class);
+        applicationContext.register(AdminServerAutoConfiguration.class);
+        applicationContext.register(AdminServerDiscoveryAutoConfiguration.class);
 
         applicationContext.refresh();
         this.context = applicationContext;

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/NotifierConfigurationTest.java → spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/AdminServerNotifierConfigurationTest.java

@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 
-public class NotifierConfigurationTest {
+public class AdminServerNotifierConfigurationTest {
     private static final ClientApplicationEvent APP_DOWN = new ClientApplicationStatusChangedEvent(
             ApplicationId.of("id-2"), 1L, StatusInfo.ofDown());
 
@@ -126,9 +126,9 @@ public class NotifierConfigurationTest {
             context.register(config);
         }
         context.register(RestTemplateAutoConfiguration.class);
-        context.register(AdminServerCoreConfiguration.class);
         context.register(MailSenderAutoConfiguration.class);
-        context.register(NotifierConfiguration.class);
+        context.register(AdminServerMarkerConfiguration.class);
+        context.register(AdminServerAutoConfiguration.class);
 
         TestPropertyValues.of(environment).applyTo(context);
         context.refresh();

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/AdminServerWebConfigurationTest.java

@@ -117,11 +117,11 @@ public class AdminServerWebConfigurationTest {
         }
         applicationContext.register(RestTemplateAutoConfiguration.class);
         applicationContext.register(HazelcastAutoConfiguration.class);
-        applicationContext.register(HazelcastStoreConfiguration.class);
         applicationContext.register(UtilAutoConfiguration.class);
-        applicationContext.register(DiscoveryClientConfiguration.class);
-        applicationContext.register(AdminServerCoreConfiguration.class);
-        applicationContext.register(AdminServerWebConfiguration.class);
+        applicationContext.register(AdminServerMarkerConfiguration.class);
+        applicationContext.register(AdminServerHazelcastAutoConfiguration.class);
+        applicationContext.register(AdminServerAutoConfiguration.class);
+        applicationContext.register(AdminServerDiscoveryAutoConfiguration.class);
 
         TestPropertyValues.of(environment).applyTo(applicationContext);
         applicationContext.refresh();