refactor: make configuration handling reusable in non-Spring contexts

Author: metacosm

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/Configuration.java

@@ -1,8 +1,18 @@
 package io.javaoperatorsdk.operator.config;
 
+import java.util.Optional;
+
+import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.openshift.client.DefaultOpenShiftClient;
+import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
+import io.javaoperatorsdk.operator.processing.retry.Retry;
+
 public class Configuration {
-    private ClientConfiguration client = new ClientConfiguration();
-    private OperatorConfiguration operator = new OperatorConfiguration();
+    private final ClientConfiguration client = new ClientConfiguration();
+    private final OperatorConfiguration operator = new OperatorConfiguration();
+    private final RetryConfiguration retry = new RetryConfiguration();
 
     public ClientConfiguration getClientConfiguration() {
         return client;
@@ -12,6 +22,39 @@ public OperatorConfiguration getOperatorConfiguration() {
         return operator;
     }
 
+    public RetryConfiguration getRetryConfiguration() {
+        return retry;
+    }
+    
+    public KubernetesClient getConfiguredClient() {
+        return getClientFor(getClientConfiguration(), getOperatorConfiguration());
+    }
+    
+    public static KubernetesClient getClientFor(ClientConfiguration clientCfg, OperatorConfiguration operatorCfg) {
+        ConfigBuilder cb = new ConfigBuilder();
+        
+        cb.withTrustCerts(clientCfg.isTrustSelfSignedCertificates());
+        trimmedPropertyIfPresent(clientCfg.getUsername()).ifPresent(cb::withUsername);
+        trimmedPropertyIfPresent(clientCfg.getPassword()).ifPresent(cb::withPassword);
+        trimmedPropertyIfPresent(clientCfg.getMasterUrl()).ifPresent(cb::withMasterUrl);
+        
+        operatorCfg.getWatchedNamespaceIfUnique().ifPresent(cb::withNamespace);
+        return clientCfg.isOpenshift() ? new DefaultOpenShiftClient(cb.build()) : new DefaultKubernetesClient(cb.build());
+    }
+    
+    public static Retry getRetryFor(RetryConfiguration retryCfg) {
+        GenericRetry retry = new GenericRetry();
+        Optional.ofNullable(retryCfg.getInitialInterval()).ifPresent(retry::setInitialInterval);
+        Optional.ofNullable(retryCfg.getIntervalMultiplier()).ifPresent(retry::setIntervalMultiplier);
+        Optional.ofNullable(retryCfg.getMaxAttempts()).ifPresent(retry::setMaxAttempts);
+        Optional.ofNullable(retryCfg.getMaxInterval()).ifPresent(retry::setMaxInterval);
+        return retry;
+    }
+    
+    private static Optional<String> trimmedPropertyIfPresent(String string) {
+        return Optional.ofNullable(string).map(String::trim);
+    }
+    
     public static Configuration defaultConfiguration() {
         return new Configuration();
     }

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/RetryConfiguration.java

@@ -0,0 +1,54 @@
+package io.javaoperatorsdk.operator.config;
+
+public class RetryConfiguration {
+    private Integer maxAttempts;
+    private Long initialInterval;
+    private Double intervalMultiplier;
+    private Long maxInterval;
+    private Long maxElapsedTime;
+    
+    public Integer getMaxAttempts() {
+        return maxAttempts;
+    }
+    
+    public RetryConfiguration setMaxAttempts(Integer maxAttempts) {
+        this.maxAttempts = maxAttempts;
+        return this;
+    }
+    
+    public Long getInitialInterval() {
+        return initialInterval;
+    }
+    
+    public RetryConfiguration setInitialInterval(Long initialInterval) {
+        this.initialInterval = initialInterval;
+        return this;
+    }
+    
+    public Double getIntervalMultiplier() {
+        return intervalMultiplier;
+    }
+    
+    public RetryConfiguration setIntervalMultiplier(Double intervalMultiplier) {
+        this.intervalMultiplier = intervalMultiplier;
+        return this;
+    }
+    
+    public Long getMaxInterval() {
+        return maxInterval;
+    }
+    
+    public RetryConfiguration setMaxInterval(Long maxInterval) {
+        this.maxInterval = maxInterval;
+        return this;
+    }
+    
+    public Long getMaxElapsedTime() {
+        return maxElapsedTime;
+    }
+    
+    public RetryConfiguration setMaxElapsedTime(Long maxElapsedTime) {
+        this.maxElapsedTime = maxElapsedTime;
+        return this;
+    }
+}

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/ClientProperties.java

@@ -1,58 +1,8 @@
 package io.javaoperatorsdk.operator.springboot.starter;
 
+import io.javaoperatorsdk.operator.config.ClientConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "operator.kubernetes.client")
-public class ClientProperties {
-    
-    private boolean openshift = false;
-    private String username;
-    private String password;
-    private String masterUrl;
-    private boolean trustSelfSignedCertificates = false;
-    
-    public boolean isOpenshift() {
-        return openshift;
-    }
-    
-    public ClientProperties setOpenshift(boolean openshift) {
-        this.openshift = openshift;
-        return this;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-    
-    public ClientProperties setUsername(String username) {
-        this.username = username;
-        return this;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-    
-    public ClientProperties setPassword(String password) {
-        this.password = password;
-        return this;
-    }
-
-    public String getMasterUrl() {
-        return masterUrl;
-    }
-    
-    public ClientProperties setMasterUrl(String masterUrl) {
-        this.masterUrl = masterUrl;
-        return this;
-    }
-
-    public boolean isTrustSelfSignedCertificates() {
-        return trustSelfSignedCertificates;
-    }
-    
-    public ClientProperties setTrustSelfSignedCertificates(boolean trustSelfSignedCertificates) {
-        this.trustSelfSignedCertificates = trustSelfSignedCertificates;
-        return this;
-    }
+public class ClientProperties extends ClientConfiguration {
 }

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

@@ -2,15 +2,10 @@
 
 import java.util.List;
 
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -25,45 +20,21 @@ public class OperatorAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public KubernetesClient kubernetesClient(ClientProperties clientProperties) {
-        ConfigBuilder config = new ConfigBuilder();
-        config.withTrustCerts(clientProperties.isTrustSelfSignedCertificates());
-        if (StringUtils.isNotBlank(clientProperties.getUsername())) {
-            config.withUsername(clientProperties.getUsername());
-        }
-        if (StringUtils.isNotBlank(clientProperties.getPassword())) {
-            config.withUsername(clientProperties.getPassword());
-        }
-        if (StringUtils.isNotBlank(clientProperties.getMasterUrl())) {
-            config.withMasterUrl(clientProperties.getMasterUrl());
-        }
-        return clientProperties.isOpenshift() ? new DefaultOpenShiftClient(config.build()) : new DefaultKubernetesClient(config.build());
+    public KubernetesClient kubernetesClient(ClientProperties clientProperties, OperatorProperties operatorProperties) {
+        return io.javaoperatorsdk.operator.config.Configuration.getClientFor(clientProperties, operatorProperties);
     }
-
+    
     @Bean
     @ConditionalOnMissingBean(Operator.class)
     public Operator operator(KubernetesClient kubernetesClient, Retry retry, List<ResourceController> resourceControllers) {
         Operator operator = new Operator(kubernetesClient);
         resourceControllers.forEach(r -> operator.registerController(r, retry));
         return operator;
     }
-
+    
     @Bean
     @ConditionalOnMissingBean
     public Retry retry(RetryProperties retryProperties) {
-        GenericRetry retry = new GenericRetry();
-        if (retryProperties.getInitialInterval() != null) {
-            retry.setInitialInterval(retryProperties.getInitialInterval());
-        }
-        if (retryProperties.getIntervalMultiplier() != null) {
-            retry.setIntervalMultiplier(retryProperties.getIntervalMultiplier());
-        }
-        if (retryProperties.getMaxAttempts() != null) {
-            retry.setMaxAttempts(retryProperties.getMaxAttempts());
-        }
-        if (retryProperties.getMaxInterval() != null) {
-            retry.setInitialInterval(retryProperties.getMaxInterval());
-        }
-        return retry;
+        return io.javaoperatorsdk.operator.config.Configuration.getRetryFor(retryProperties);
     }
 }

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorProperties.java

@@ -0,0 +1,8 @@
+package io.javaoperatorsdk.operator.springboot.starter;
+
+import io.javaoperatorsdk.operator.config.OperatorConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "operator")
+public class OperatorProperties extends OperatorConfiguration {
+}

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/RetryProperties.java

@@ -1,58 +1,8 @@
 package io.javaoperatorsdk.operator.springboot.starter;
 
+import io.javaoperatorsdk.operator.config.RetryConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "operator.controller.retry")
-public class RetryProperties {
-
-    private Integer maxAttempts;
-    private Long initialInterval;
-    private Double intervalMultiplier;
-    private Long maxInterval;
-    private Long maxElapsedTime;
-
-    public Integer getMaxAttempts() {
-        return maxAttempts;
-    }
-
-    public RetryProperties setMaxAttempts(Integer maxAttempts) {
-        this.maxAttempts = maxAttempts;
-        return this;
-    }
-
-    public Long getInitialInterval() {
-        return initialInterval;
-    }
-
-    public RetryProperties setInitialInterval(Long initialInterval) {
-        this.initialInterval = initialInterval;
-        return this;
-    }
-
-    public Double getIntervalMultiplier() {
-        return intervalMultiplier;
-    }
-
-    public RetryProperties setIntervalMultiplier(Double intervalMultiplier) {
-        this.intervalMultiplier = intervalMultiplier;
-        return this;
-    }
-
-    public Long getMaxInterval() {
-        return maxInterval;
-    }
-
-    public RetryProperties setMaxInterval(Long maxInterval) {
-        this.maxInterval = maxInterval;
-        return this;
-    }
-
-    public Long getMaxElapsedTime() {
-        return maxElapsedTime;
-    }
-
-    public RetryProperties setMaxElapsedTime(Long maxElapsedTime) {
-        this.maxElapsedTime = maxElapsedTime;
-        return this;
-    }
+public class RetryProperties extends RetryConfiguration {
 }