change the properties prefix to "javaoperatorsdk"

Author: s-soroosh

operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorProperties.java renamed to operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/KubernetesClientProperties.java

@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-public class OperatorProperties {
+public class KubernetesClientProperties {
 
   private boolean openshift = false;
   private String username;
@@ -14,7 +14,7 @@ public boolean isOpenshift() {
     return openshift;
   }
 
-  public OperatorProperties setOpenshift(boolean openshift) {
+  public KubernetesClientProperties setOpenshift(boolean openshift) {
     this.openshift = openshift;
     return this;
   }
@@ -23,7 +23,7 @@ public Optional<String> getUsername() {
     return Optional.ofNullable(username);
   }
 
-  public OperatorProperties setUsername(String username) {
+  public KubernetesClientProperties setUsername(String username) {
     this.username = username;
     return this;
   }
@@ -32,7 +32,7 @@ public Optional<String> getPassword() {
     return Optional.ofNullable(password);
   }
 
-  public OperatorProperties setPassword(String password) {
+  public KubernetesClientProperties setPassword(String password) {
     this.password = password;
     return this;
   }
@@ -41,7 +41,7 @@ public Optional<String> getMasterUrl() {
     return Optional.ofNullable(masterUrl);
   }
 
-  public OperatorProperties setMasterUrl(String masterUrl) {
+  public KubernetesClientProperties setMasterUrl(String masterUrl) {
     this.masterUrl = masterUrl;
     return this;
   }
@@ -50,7 +50,8 @@ public boolean isTrustSelfSignedCertificates() {
     return trustSelfSignedCertificates;
   }
 
-  public OperatorProperties setTrustSelfSignedCertificates(boolean trustSelfSignedCertificates) {
+  public KubernetesClientProperties setTrustSelfSignedCertificates(
+      boolean trustSelfSignedCertificates) {
     this.trustSelfSignedCertificates = trustSelfSignedCertificates;
     return this;
   }

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

@@ -17,19 +17,16 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-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;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@EnableConfigurationProperties({ConfigurationProperties.class})
+@EnableConfigurationProperties({OperatorConfigurationProperties.class})
 public class OperatorAutoConfiguration implements ConfigurationService {
-  private static final Logger log = LoggerFactory.getLogger(OperatorAutoConfiguration.class);
-  @Autowired private ConfigurationProperties configuration;
+  @Autowired private OperatorConfigurationProperties configuration;
   private final Map<String, ControllerConfiguration> controllers = new ConcurrentHashMap<>();
 
   @Bean
@@ -55,15 +52,13 @@ public Config getClientConfiguration() {
   @Bean
   @ConditionalOnMissingBean(Operator.class)
   public Operator operator(
-      KubernetesClient kubernetesClient,
-      ConfigurationProperties config,
-      List<ResourceController> resourceControllers) {
+      KubernetesClient kubernetesClient, List<ResourceController<?>> resourceControllers) {
     Operator operator = new Operator(kubernetesClient, this);
     resourceControllers.forEach(r -> operator.register(processController(r)));
     return operator;
   }
 
-  private ResourceController processController(ResourceController controller) {
+  private ResourceController<?> processController(ResourceController<?> controller) {
     final var controllerPropertiesMap = configuration.getControllers();
     var controllerProps = controllerPropertiesMap.get(controller.getName());
     final var cfg = new ConfigurationWrapper(controller, controllerProps);

operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/ConfigurationProperties.java renamed to operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorConfigurationProperties.java

@@ -2,18 +2,19 @@
 
 import java.util.Collections;
 import java.util.Map;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@org.springframework.boot.context.properties.ConfigurationProperties(prefix = "io.javaoperatorsdk")
-public class ConfigurationProperties {
-  private OperatorProperties client = new OperatorProperties();
+@ConfigurationProperties(prefix = "javaoperatorsdk")
+public class OperatorConfigurationProperties {
+
+  private KubernetesClientProperties client = new KubernetesClientProperties();
   private Map<String, ControllerProperties> controllers = Collections.emptyMap();
 
-  // todo: figure out how to be able to use `.kubernetes.client` as prefix
-  public OperatorProperties getClient() {
+  public KubernetesClientProperties getClient() {
     return client;
   }
 
-  public void setClient(OperatorProperties client) {
+  public void setClient(KubernetesClientProperties client) {
     this.client = client;
   }
 

operator-framework-spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java

@@ -20,7 +20,7 @@
 @SpringBootTest
 public class AutoConfigurationTest {
 
-  @Autowired private ConfigurationProperties config;
+  @Autowired private OperatorConfigurationProperties config;
 
   @MockBean private Operator operator;
 

operator-framework-spring-boot-starter/src/test/resources/application.yaml

@@ -1,4 +1,4 @@
-io.javaoperatorsdk:
+javaoperatorsdk:
   client:
     username: user
     password: password