[All jobs done] Spring Boot Cloud Config

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java

@@ -16,8 +16,10 @@
 import io.dapr.spring.data.DaprKeyValueAdapterResolver;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "dapr.client")
+@ConfigurationProperties(prefix = DaprClientProperties.PROPERTY_PREFIX)
 public class DaprClientProperties {
+  public static final String PROPERTY_PREFIX = "dapr.client";
+
   private String httpEndpoint;
   private String grpcEndpoint;
   private Integer httpPort;

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml

@@ -45,6 +45,11 @@
       <artifactId>dapr-spring-workflows</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.dapr.spring</groupId>
+      <artifactId>dapr-spring-cloudconfig</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

dapr-spring/dapr-spring-cloudconfig/pom.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.dapr.spring</groupId>
+        <artifactId>dapr-spring-parent</artifactId>
+        <version>0.15.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dapr-spring-cloudconfig</artifactId>
+    <name>dapr-spring-cloudconfig</name>
+    <description>Dapr Spring Cloud Config</description>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.dapr.spring</groupId>
+            <artifactId>dapr-spring-boot-autoconfigure</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.dapr.spring</groupId>
+            <artifactId>dapr-spring-data</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.dapr.spring</groupId>
+            <artifactId>dapr-spring-messaging</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.dapr.spring</groupId>
+            <artifactId>dapr-spring-workflows</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>4.8.2.0</version>
+                <configuration>
+                    <excludeFilterFile>./spotbugs-exclude.xml</excludeFilterFile>
+                    <failOnError>${spotbugs.fail}</failOnError>
+                    <xmlOutput>true</xmlOutput>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

dapr-spring/dapr-spring-cloudconfig/spotbugs-exclude.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FindBugsFilter>
+  <Match>
+    <Package name="~io\.dapr\.spring.*"/>
+    <Bug pattern="EI_EXPOSE_REP"/>
+  </Match>
+
+  <Match>
+    <Package name="~io\.dapr\.spring.*"/>
+    <Bug pattern="EI_EXPOSE_REP2"/>
+  </Match>
+  <Match>
+    <Class name="~io.dapr.spring.boot.cloudconfig.configdata.*"/>
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+  </Match>
+  <Match>
+    <Class name="~io.dapr.spring.boot.cloudconfig.*"/>
+    <Bug pattern="MS_EXPOSE_REP"/>
+  </Match>
+</FindBugsFilter>

dapr-spring/dapr-spring-cloudconfig/src/main/java/io/dapr/spring/boot/cloudconfig/autoconfigure/DaprCloudConfigAutoConfiguration.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 The Dapr 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
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.spring.boot.cloudconfig.autoconfigure;
+
+import io.dapr.client.DaprClient;
+import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(DaprCloudConfigProperties.class)
+@ConditionalOnProperty(name = DaprCloudConfigProperties.PROPERTY_PREFIX + ".enabled", matchIfMissing = true)
+@ConditionalOnClass(DaprClient.class)
+public class DaprCloudConfigAutoConfiguration {
+
+}

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 The Dapr 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
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.spring.boot.cloudconfig.config;
+
+import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
+import io.dapr.spring.boot.autoconfigure.client.DaprConnectionDetails;
+
+class CloudConfigPropertiesDaprConnectionDetails implements DaprConnectionDetails {
+
+  private final DaprClientProperties daprClientProperties;
+
+  public CloudConfigPropertiesDaprConnectionDetails(DaprClientProperties daprClientProperties) {
+    this.daprClientProperties = daprClientProperties;
+  }
+
+  @Override
+  public String httpEndpoint() {
+    return this.daprClientProperties.getHttpEndpoint();
+  }
+
+  @Override
+  public String grpcEndpoint() {
+    return this.daprClientProperties.getGrpcEndpoint();
+  }
+
+  @Override
+  public Integer httpPort() {
+    return this.daprClientProperties.getHttpPort();
+  }
+
+  @Override
+  public Integer grpcPort() {
+    return this.daprClientProperties.getGrpcPort();
+  }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2025 The Dapr 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
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.spring.boot.cloudconfig.config;
+
+import io.dapr.client.DaprClient;
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.client.DaprPreviewClient;
+import io.dapr.config.Properties;
+import io.dapr.spring.boot.autoconfigure.client.DaprClientProperties;
+import io.dapr.spring.boot.autoconfigure.client.DaprConnectionDetails;
+
+public class DaprCloudConfigClientManager {
+
+  private static DaprClient daprClient;
+  private static DaprPreviewClient daprPreviewClient;
+  private final DaprCloudConfigProperties daprCloudConfigProperties;
+  private final DaprClientProperties daprClientConfig;
+
+  /**
+   * Create a DaprCloudConfigClientManager to create Config-Specific Dapr Client.
+   *
+   * @param daprCloudConfigProperties Properties of Dapr Cloud Config
+   * @param daprClientConfig          Properties of Dapr Client
+   */
+  public DaprCloudConfigClientManager(DaprCloudConfigProperties daprCloudConfigProperties,
+                                      DaprClientProperties daprClientConfig) {
+    this.daprCloudConfigProperties = daprCloudConfigProperties;
+    this.daprClientConfig = daprClientConfig;
+
+    DaprClientBuilder daprClientBuilder = createDaprClientBuilder(
+        createDaprConnectionDetails(daprClientConfig)
+    );
+
+    if (DaprCloudConfigClientManager.daprClient == null) {
+      DaprCloudConfigClientManager.daprClient = daprClientBuilder.build();
+    }
+
+    if (DaprCloudConfigClientManager.daprPreviewClient == null) {
+      DaprCloudConfigClientManager.daprPreviewClient = daprClientBuilder.buildPreviewClient();
+    }
+  }
+
+  public static DaprPreviewClient getDaprPreviewClient() {
+    return DaprCloudConfigClientManager.daprPreviewClient;
+  }
+
+  public static DaprClient getDaprClient() {
+    return DaprCloudConfigClientManager.daprClient;
+  }
+
+  private DaprConnectionDetails createDaprConnectionDetails(DaprClientProperties properties) {
+    return new CloudConfigPropertiesDaprConnectionDetails(properties);
+  }
+
+  DaprClientBuilder createDaprClientBuilder(DaprConnectionDetails daprConnectionDetails) {
+    DaprClientBuilder builder = new DaprClientBuilder();
+    if (daprConnectionDetails.httpEndpoint() != null) {
+      builder.withPropertyOverride(Properties.HTTP_ENDPOINT, daprConnectionDetails.httpEndpoint());
+    }
+    if (daprConnectionDetails.grpcEndpoint() != null) {
+      builder.withPropertyOverride(Properties.GRPC_ENDPOINT, daprConnectionDetails.grpcEndpoint());
+    }
+    if (daprConnectionDetails.httpPort() != null) {
+      builder.withPropertyOverride(Properties.HTTP_PORT, String.valueOf(daprConnectionDetails.httpPort()));
+    }
+    if (daprConnectionDetails.grpcPort() != null) {
+      builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(daprConnectionDetails.grpcPort()));
+    }
+    return builder;
+  }
+
+  public DaprCloudConfigProperties getDaprCloudConfigProperties() {
+    return daprCloudConfigProperties;
+  }
+
+  public DaprClientProperties getDaprClientConfig() {
+    return daprClientConfig;
+  }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2025 The Dapr 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
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.spring.boot.cloudconfig.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * The properties for creating dapr client.
+ */
+@ConfigurationProperties(DaprCloudConfigProperties.PROPERTY_PREFIX)
+public class DaprCloudConfigProperties {
+
+  public static final String PROPERTY_PREFIX = "dapr.cloudconfig";
+
+  /**
+   * whether enable cloud config.
+   */
+  private Boolean enabled = true;
+
+  /**
+   * whether enable dapr client wait for sidecar, if no response, will throw IOException.
+   */
+  private Boolean waitSidecarEnabled = false;
+
+  /**
+   * retries of dapr client wait for sidecar.
+   */
+  private Integer waitSidecarRetries = 3;
+
+  /**
+   * get config timeout (include wait for dapr sidecar).
+   */
+  private Integer timeout = 2000;
+
+  public Integer getTimeout() {
+    return timeout;
+  }
+
+  public void setTimeout(Integer timeout) {
+    this.timeout = timeout;
+  }
+
+  public Boolean getEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(Boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public Boolean getWaitSidecarEnabled() {
+    return waitSidecarEnabled;
+  }
+
+  public void setWaitSidecarEnabled(Boolean waitSidecarEnabled) {
+    this.waitSidecarEnabled = waitSidecarEnabled;
+  }
+
+  public Integer getWaitSidecarRetries() {
+    return waitSidecarRetries;
+  }
+
+  public void setWaitSidecarRetries(Integer waitSidecarRetries) {
+    this.waitSidecarRetries = waitSidecarRetries;
+  }
+}