Merge pull request #103 from ContainerSolutions/auto-config-improvement

improve auto configuration support

Author: csviri

samples/spring-boot-auto-config/pom.xml

@@ -37,11 +37,23 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.skyscreamer</groupId>
+                    <artifactId>jsonassert</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

samples/spring-boot-auto-config/src/test/java/com/github/containersolutions/operator/sample/SpringBootStarterSampleApplicationIT.java

@@ -0,0 +1,12 @@
+package com.github.containersolutions.operator.sample;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class SpringBootStarterSampleApplicationIT {
+
+    @Test
+    void contextLoads() {
+    }
+}

spring-boot-starter/pom.xml

@@ -89,10 +89,6 @@
             <artifactId>operator-framework</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

spring-boot-starter/src/main/java/com/github/containersolutions/operator/spingboot/starter/OperatorAutoConfiguration.java

@@ -11,7 +11,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -21,22 +20,12 @@
 
 @Configuration
 @EnableConfigurationProperties({OperatorProperties.class, RetryProperties.class})
-@ConditionalOnMissingBean(Operator.class)
 public class OperatorAutoConfiguration {
     private static final Logger log = LoggerFactory.getLogger(OperatorAutoConfiguration.class);
 
-    @Autowired
-    private RetryProperties retryProperties;
-
-    @Autowired
-    private OperatorProperties operatorProperties;
-
-    @Autowired
-    private List<ResourceController> resourceControllers;
-
     @Bean
     @ConditionalOnMissingBean
-    public KubernetesClient kubernetesClient() {
+    public KubernetesClient kubernetesClient(OperatorProperties operatorProperties) {
         ConfigBuilder config = new ConfigBuilder();
         config.withTrustCerts(operatorProperties.isTrustSelfSignedCertificates());
         if (StringUtils.isNotBlank(operatorProperties.getUsername())) {
@@ -53,15 +42,16 @@ public KubernetesClient kubernetesClient() {
     }
 
     @Bean
-    public Operator operator(KubernetesClient kubernetesClient, Retry retry) {
+    @ConditionalOnMissingBean(Operator.class)
+    public Operator operator(KubernetesClient kubernetesClient, Retry retry, List<ResourceController> resourceControllers) {
         Operator operator = new Operator(kubernetesClient);
         resourceControllers.forEach(r -> operator.registerControllerForAllNamespaces(r, retry));
         return operator;
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public Retry retry() {
+    public Retry retry(RetryProperties retryProperties) {
         GenericRetry retry = new GenericRetry();
         if (retryProperties.getInitialInterval() != null) {
             retry.setInitialInterval(retryProperties.getInitialInterval());