feat(springboot cloudconfig): Change the behavior of Config Type

Enum of Config Type has lack of file extension suport, reimplement it as class

Signed-off-by: lony2003 <[email protected]>

Author: lony2003

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/DaprCloudConfigParserHandler.java

@@ -13,6 +13,8 @@
 
 package io.dapr.spring.boot.cloudconfig.configdata;
 
+import io.dapr.spring.boot.cloudconfig.configdata.types.DaprCloudConfigType;
+import io.dapr.spring.boot.cloudconfig.configdata.types.DocType;
 import org.springframework.boot.env.PropertySourceLoader;
 import org.springframework.boot.env.YamlPropertySourceLoader;
 import org.springframework.core.env.PropertySource;
@@ -83,7 +85,7 @@ public List<PropertySource<?>> parseDaprCloudConfigData(
     List<PropertySource<?>> result = new ArrayList<>();
 
     Map<String, Resource> configResults = getConfigResult(configValue, type);
-    String extension = DaprCloudConfigType.DocYaml.equals(type) ? ".yaml" : ".properties";
+    String extension = type instanceof DocType ? ((DocType) type).getDocExtension() : ".properties";
 
     configResults.forEach((key, configResult) -> {
       for (PropertySourceLoader propertySourceLoader : propertySourceLoaders) {
@@ -108,7 +110,7 @@ private Map<String, Resource> getConfigResult(
       DaprCloudConfigType type
   ) {
     Map<String, Resource> result = new HashMap<>();
-    if (DaprCloudConfigType.DocYaml.equals(type) || DaprCloudConfigType.DocProperties.equals(type)) {
+    if (type instanceof DocType) {
       configValue.forEach((key, value) -> result.put(key,
           new ByteArrayResource(value.getBytes(StandardCharsets.UTF_8))));
     } else {

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/config/DaprConfigurationConfigDataLocationResolver.java

@@ -16,7 +16,7 @@
 import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
 import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigClientManager;
 import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigProperties;
-import io.dapr.spring.boot.cloudconfig.configdata.DaprCloudConfigType;
+import io.dapr.spring.boot.cloudconfig.configdata.types.DaprCloudConfigType;
 import org.apache.commons.logging.Log;
 import org.springframework.boot.BootstrapRegistry;
 import org.springframework.boot.ConfigurableBootstrapContext;

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/config/DaprConfigurationConfigDataResource.java

@@ -13,7 +13,7 @@
 
 package io.dapr.spring.boot.cloudconfig.configdata.config;
 
-import io.dapr.spring.boot.cloudconfig.configdata.DaprCloudConfigType;
+import io.dapr.spring.boot.cloudconfig.configdata.types.DaprCloudConfigType;
 import org.springframework.boot.context.config.ConfigDataResource;
 import org.springframework.lang.Nullable;
 

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/secret/DaprSecretStoreConfigDataLocationResolver.java

@@ -16,7 +16,7 @@
 import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
 import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigClientManager;
 import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigProperties;
-import io.dapr.spring.boot.cloudconfig.configdata.DaprCloudConfigType;
+import io.dapr.spring.boot.cloudconfig.configdata.types.DaprCloudConfigType;
 import org.apache.commons.logging.Log;
 import org.springframework.boot.BootstrapRegistry;
 import org.springframework.boot.ConfigurableBootstrapContext;

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/secret/DaprSecretStoreConfigDataResource.java

@@ -13,7 +13,7 @@
 
 package io.dapr.spring.boot.cloudconfig.configdata.secret;
 
-import io.dapr.spring.boot.cloudconfig.configdata.DaprCloudConfigType;
+import io.dapr.spring.boot.cloudconfig.configdata.types.DaprCloudConfigType;
 import org.springframework.boot.context.config.ConfigDataResource;
 import org.springframework.lang.Nullable;
 

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/DaprCloudConfigType.java renamed to dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/types/DaprCloudConfigType.java

@@ -1,10 +1,8 @@
-package io.dapr.spring.boot.cloudconfig.configdata;
+package io.dapr.spring.boot.cloudconfig.configdata.types;
 
-public enum DaprCloudConfigType {
-  DocProperties,
-  DocYaml,
-  Value;
+import org.springframework.util.StringUtils;
 
+public class DaprCloudConfigType {
   /**
    * Get Type from String.
    * @param value type specified in schema
@@ -13,7 +11,7 @@ public enum DaprCloudConfigType {
    */
   public static DaprCloudConfigType fromString(String value, String docType) {
     return "doc".equals(value)
-        ? ("yaml".equals(docType) ? DaprCloudConfigType.DocYaml : DaprCloudConfigType.DocProperties)
-        : DaprCloudConfigType.Value;
+        ? new DocType(StringUtils.hasText(docType) ? docType : "properties")
+        : new ValueType();
   }
 }

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/types/DocType.java

@@ -0,0 +1,20 @@
+package io.dapr.spring.boot.cloudconfig.configdata.types;
+
+import org.springframework.util.StringUtils;
+
+public class DocType extends DaprCloudConfigType {
+  private final String docType;
+
+  public DocType(String docType) {
+    this.docType = StringUtils.hasText(docType) ? docType : "properties";
+  }
+
+  public String getDocType() {
+    return docType;
+  }
+
+  public String getDocExtension() {
+    String type = getDocType();
+    return "." + StringUtils.trimLeadingCharacter(type, '.');
+  }
+}

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/configdata/types/ValueType.java

@@ -0,0 +1,4 @@
+package io.dapr.spring.boot.cloudconfig.configdata.types;
+
+public class ValueType extends DaprCloudConfigType {
+}

spotbugs-exclude.xml

@@ -51,4 +51,10 @@
         <Package name="~io\.dapr.*"/>
         <Bug pattern="NP_UNWRITTEN_FIELD"/>
     </Match>
+
+    <!-- have to disable this in order to make test work  -->
+    <Match>
+        <Class name="~io.dapr.spring.boot.cloudconfig.*"/>
+        <Bug pattern="MS_EXPOSE_REP"/>
+    </Match>
 </FindBugsFilter>