Skip to content

Commit 736aaa2

Browse files
lony2003lony2003
committed
style(springboot cloudconfig): change code style to match checkstyle
Signed-off-by: lony2003 <zhangke200377@outlook.com>
1 parent 6879d56 commit 736aaa2

10 files changed

+547
-534
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313

1414
package io.dapr.spring.boot.cloudconfig.autoconfigure;
1515

16+
import io.dapr.client.DaprClient;
1617
import io.dapr.spring.boot.cloudconfig.config.DaprCloudConfigProperties;
1718
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1819
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1920
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2021
import org.springframework.context.annotation.Configuration;
2122

22-
import io.dapr.client.DaprClient;
23-
2423
@Configuration(proxyBeanMethods = false)
2524
@EnableConfigurationProperties(DaprCloudConfigProperties.class)
2625
@ConditionalOnProperty(name = DaprCloudConfigProperties.PROPERTY_PREFIX + ".enabled", matchIfMissing = true)

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

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -23,62 +23,63 @@
2323

2424
public class DaprCloudConfigClientManager {
2525

26-
private static DaprClient daprClient;
27-
private static DaprPreviewClient daprPreviewClient;
28-
private final DaprCloudConfigProperties daprCloudConfigProperties;
29-
private final DaprClientProperties daprClientConfig;
26+
private static DaprClient daprClient;
27+
private static DaprPreviewClient daprPreviewClient;
28+
private final DaprCloudConfigProperties daprCloudConfigProperties;
29+
private final DaprClientProperties daprClientConfig;
3030

31-
public DaprCloudConfigClientManager(DaprCloudConfigProperties daprCloudConfigProperties,
32-
DaprClientProperties daprClientConfig) {
33-
this.daprCloudConfigProperties = daprCloudConfigProperties;
34-
this.daprClientConfig = daprClientConfig;
31+
public DaprCloudConfigClientManager(DaprCloudConfigProperties daprCloudConfigProperties,
32+
DaprClientProperties daprClientConfig) {
33+
this.daprCloudConfigProperties = daprCloudConfigProperties;
34+
this.daprClientConfig = daprClientConfig;
3535

36-
DaprClientBuilder daprClientBuilder = createDaprClientBuilder(
37-
createDaprConnectionDetails(daprClientConfig)
38-
);
36+
DaprClientBuilder daprClientBuilder = createDaprClientBuilder(
37+
createDaprConnectionDetails(daprClientConfig)
38+
);
3939

40-
if (DaprCloudConfigClientManager.daprClient == null) {
41-
DaprCloudConfigClientManager.daprClient = daprClientBuilder.build();
42-
}
40+
if (DaprCloudConfigClientManager.daprClient == null) {
41+
DaprCloudConfigClientManager.daprClient = daprClientBuilder.build();
42+
}
4343

44-
if (DaprCloudConfigClientManager.daprPreviewClient == null) {
45-
DaprCloudConfigClientManager.daprPreviewClient = daprClientBuilder.buildPreviewClient();
46-
}
44+
if (DaprCloudConfigClientManager.daprPreviewClient == null) {
45+
DaprCloudConfigClientManager.daprPreviewClient = daprClientBuilder.buildPreviewClient();
4746
}
47+
}
48+
49+
public static DaprPreviewClient getDaprPreviewClient() {
50+
return DaprCloudConfigClientManager.daprPreviewClient;
51+
}
52+
53+
public static DaprClient getDaprClient() {
54+
return DaprCloudConfigClientManager.daprClient;
55+
}
56+
57+
private DaprConnectionDetails createDaprConnectionDetails(DaprClientProperties properties) {
58+
return new CloudConfigPropertiesDaprConnectionDetails(properties);
59+
}
4860

49-
private DaprConnectionDetails createDaprConnectionDetails(DaprClientProperties properties) {
50-
return new CloudConfigPropertiesDaprConnectionDetails(properties);
61+
DaprClientBuilder createDaprClientBuilder(DaprConnectionDetails daprConnectionDetails) {
62+
DaprClientBuilder builder = new DaprClientBuilder();
63+
if (daprConnectionDetails.httpEndpoint() != null) {
64+
builder.withPropertyOverride(Properties.HTTP_ENDPOINT, daprConnectionDetails.httpEndpoint());
5165
}
52-
DaprClientBuilder createDaprClientBuilder(DaprConnectionDetails daprConnectionDetails) {
53-
DaprClientBuilder builder = new DaprClientBuilder();
54-
if (daprConnectionDetails.httpEndpoint() != null) {
55-
builder.withPropertyOverride(Properties.HTTP_ENDPOINT, daprConnectionDetails.httpEndpoint());
56-
}
57-
if (daprConnectionDetails.grpcEndpoint() != null) {
58-
builder.withPropertyOverride(Properties.GRPC_ENDPOINT, daprConnectionDetails.grpcEndpoint());
59-
}
60-
if (daprConnectionDetails.httpPort() != null) {
61-
builder.withPropertyOverride(Properties.HTTP_PORT, String.valueOf(daprConnectionDetails.httpPort()));
62-
}
63-
if (daprConnectionDetails.grpcPort() != null) {
64-
builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(daprConnectionDetails.grpcPort()));
65-
}
66-
return builder;
66+
if (daprConnectionDetails.grpcEndpoint() != null) {
67+
builder.withPropertyOverride(Properties.GRPC_ENDPOINT, daprConnectionDetails.grpcEndpoint());
6768
}
68-
69-
public static DaprPreviewClient getDaprPreviewClient() {
70-
return DaprCloudConfigClientManager.daprPreviewClient;
69+
if (daprConnectionDetails.httpPort() != null) {
70+
builder.withPropertyOverride(Properties.HTTP_PORT, String.valueOf(daprConnectionDetails.httpPort()));
7171
}
72-
73-
public static DaprClient getDaprClient() {
74-
return DaprCloudConfigClientManager.daprClient;
72+
if (daprConnectionDetails.grpcPort() != null) {
73+
builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(daprConnectionDetails.grpcPort()));
7574
}
75+
return builder;
76+
}
7677

77-
public DaprCloudConfigProperties getDaprCloudConfigProperties() {
78-
return daprCloudConfigProperties;
79-
}
78+
public DaprCloudConfigProperties getDaprCloudConfigProperties() {
79+
return daprCloudConfigProperties;
80+
}
8081

81-
public DaprClientProperties getDaprClientConfig() {
82-
return daprClientConfig;
83-
}
82+
public DaprClientProperties getDaprClientConfig() {
83+
return daprClientConfig;
84+
}
8485
}

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@
2121
@ConfigurationProperties(DaprCloudConfigProperties.PROPERTY_PREFIX)
2222
public class DaprCloudConfigProperties {
2323

24-
public static final String PROPERTY_PREFIX = "dapr.cloudconfig";
24+
public static final String PROPERTY_PREFIX = "dapr.cloudconfig";
2525

26-
/**
27-
* whether enable secret store
28-
*/
29-
private Boolean enabled = true;
26+
/**
27+
* whether enable secret store
28+
*/
29+
private Boolean enabled = true;
3030

31-
/**
32-
* get config timeout
33-
*/
34-
private Integer timeout = 2000;
31+
/**
32+
* get config timeout
33+
*/
34+
private Integer timeout = 2000;
3535

36-
public Integer getTimeout() {
37-
return timeout;
38-
}
36+
public Integer getTimeout() {
37+
return timeout;
38+
}
3939

40-
public void setTimeout(Integer timeout) {
41-
this.timeout = timeout;
42-
}
40+
public void setTimeout(Integer timeout) {
41+
this.timeout = timeout;
42+
}
4343

44-
public Boolean getEnabled() {
45-
return enabled;
46-
}
44+
public Boolean getEnabled() {
45+
return enabled;
46+
}
4747

48-
public void setEnabled(Boolean enabled) {
49-
this.enabled = enabled;
50-
}
48+
public void setEnabled(Boolean enabled) {
49+
this.enabled = enabled;
50+
}
5151
}

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

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -33,88 +33,90 @@
3333
import java.util.List;
3434
import java.util.Map;
3535

36-
import static org.springframework.boot.context.config.ConfigData.Option.*;
36+
import static org.springframework.boot.context.config.ConfigData.Option.IGNORE_IMPORTS;
37+
import static org.springframework.boot.context.config.ConfigData.Option.IGNORE_PROFILES;
38+
import static org.springframework.boot.context.config.ConfigData.Option.PROFILE_SPECIFIC;
3739

3840
public class DaprConfigurationConfigDataLoader implements ConfigDataLoader<DaprConfigurationConfigDataResource> {
3941

40-
private final Log log;
42+
private final Log log;
43+
44+
private DaprClient daprClient;
45+
46+
private DaprCloudConfigProperties daprSecretStoreConfig;
47+
48+
public DaprConfigurationConfigDataLoader(DeferredLogFactory logFactory, DaprClient daprClient,
49+
DaprCloudConfigProperties daprSecretStoreConfig) {
50+
this.log = logFactory.getLog(getClass());
51+
this.daprClient = daprClient;
52+
this.daprSecretStoreConfig = daprSecretStoreConfig;
53+
}
54+
55+
56+
/**
57+
* Load {@link ConfigData} for the given resource.
58+
*
59+
* @param context the loader context
60+
* @param resource the resource to load
61+
* @return the loaded config data or {@code null} if the location should be skipped
62+
* @throws IOException on IO error
63+
* @throws ConfigDataResourceNotFoundException if the resource cannot be found
64+
*/
65+
@Override
66+
public ConfigData load(ConfigDataLoaderContext context, DaprConfigurationConfigDataResource resource)
67+
throws IOException, ConfigDataResourceNotFoundException {
68+
DaprCloudConfigClientManager daprClientSecretStoreConfigManager =
69+
getBean(context, DaprCloudConfigClientManager.class);
70+
71+
daprClient = DaprCloudConfigClientManager.getDaprClient();
72+
daprSecretStoreConfig = daprClientSecretStoreConfigManager.getDaprCloudConfigProperties();
73+
74+
if (resource.getSecretName() == null) {
75+
return fetchConfig(resource.getStoreName());
76+
} else {
77+
return fetchConfig(resource.getStoreName(), resource.getSecretName());
78+
}
79+
}
4180

42-
private DaprClient daprClient;
81+
private ConfigData fetchConfig(String storeName) {
82+
Mono<Map<String, Map<String, String>>> secretMapMono = daprClient.getBulkSecret(storeName);
4383

44-
private DaprCloudConfigProperties daprSecretStoreConfig;
84+
Map<String, Map<String, String>> secretMap =
85+
secretMapMono.block(Duration.ofMillis(daprSecretStoreConfig.getTimeout()));
4586

46-
public DaprConfigurationConfigDataLoader(DeferredLogFactory logFactory, DaprClient daprClient,
47-
DaprCloudConfigProperties daprSecretStoreConfig) {
48-
this.log = logFactory.getLog(getClass());
49-
this.daprClient = daprClient;
50-
this.daprSecretStoreConfig = daprSecretStoreConfig;
87+
if (secretMap == null) {
88+
return new ConfigData(Collections.emptyList(), IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
5189
}
5290

91+
List<PropertySource<?>> sourceList = new ArrayList<>();
5392

54-
/**
55-
* Load {@link ConfigData} for the given resource.
56-
*
57-
* @param context the loader context
58-
* @param resource the resource to load
59-
* @return the loaded config data or {@code null} if the location should be skipped
60-
* @throws IOException on IO error
61-
* @throws ConfigDataResourceNotFoundException if the resource cannot be found
62-
*/
63-
@Override
64-
public ConfigData load(ConfigDataLoaderContext context, DaprConfigurationConfigDataResource resource)
65-
throws IOException, ConfigDataResourceNotFoundException {
66-
DaprCloudConfigClientManager daprClientSecretStoreConfigManager =
67-
getBean(context, DaprCloudConfigClientManager.class);
68-
69-
daprClient = DaprCloudConfigClientManager.getDaprClient();
70-
daprSecretStoreConfig = daprClientSecretStoreConfigManager.getDaprCloudConfigProperties();
71-
72-
if (resource.getSecretName() == null) {
73-
return fetchConfig(resource.getStoreName());
74-
} else {
75-
return fetchConfig(resource.getStoreName(), resource.getSecretName());
76-
}
93+
for (Map.Entry<String, Map<String, String>> entry : secretMap.entrySet()) {
94+
sourceList.addAll(DaprSecretStoreParserHandler.getInstance().parseDaprSecretStoreData(entry.getKey(),
95+
entry.getValue()));
7796
}
7897

79-
private ConfigData fetchConfig(String storeName) {
80-
Mono<Map<String, Map<String, String>>> secretMapMono = daprClient.getBulkSecret(storeName);
81-
82-
Map<String, Map<String, String>> secretMap =
83-
secretMapMono.block(Duration.ofMillis(daprSecretStoreConfig.getTimeout()));
98+
return new ConfigData(sourceList, IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
99+
}
84100

85-
if (secretMap == null) {
86-
return new ConfigData(Collections.emptyList(), IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
87-
}
101+
private ConfigData fetchConfig(String storeName, String secretName) {
102+
Mono<Map<String, String>> secretMapMono = daprClient.getSecret(storeName, secretName);
88103

89-
List<PropertySource<?>> sourceList = new ArrayList<>();
104+
Map<String, String> secretMap = secretMapMono.block(Duration.ofMillis(daprSecretStoreConfig.getTimeout()));
90105

91-
for (Map.Entry<String, Map<String, String>> entry : secretMap.entrySet()) {
92-
sourceList.addAll(DaprSecretStoreParserHandler.getInstance().parseDaprSecretStoreData(entry.getKey(),
93-
entry.getValue()));
94-
}
95-
96-
return new ConfigData(sourceList, IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
106+
if (secretMap == null) {
107+
return new ConfigData(Collections.emptyList(), IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
97108
}
98109

99-
private ConfigData fetchConfig(String storeName, String secretName) {
100-
Mono<Map<String, String>> secretMapMono = daprClient.getSecret(storeName, secretName);
101-
102-
Map<String, String> secretMap = secretMapMono.block(Duration.ofMillis(daprSecretStoreConfig.getTimeout()));
110+
List<PropertySource<?>> sourceList = new ArrayList<>(
111+
DaprSecretStoreParserHandler.getInstance().parseDaprSecretStoreData(secretName, secretMap));
103112

104-
if (secretMap == null) {
105-
return new ConfigData(Collections.emptyList(), IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
106-
}
107-
108-
List<PropertySource<?>> sourceList = new ArrayList<>(
109-
DaprSecretStoreParserHandler.getInstance().parseDaprSecretStoreData(secretName, secretMap));
110-
111-
return new ConfigData(sourceList, IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
112-
}
113+
return new ConfigData(sourceList, IGNORE_IMPORTS, IGNORE_PROFILES, PROFILE_SPECIFIC);
114+
}
113115

114-
protected <T> T getBean(ConfigDataLoaderContext context, Class<T> type) {
115-
if (context.getBootstrapContext().isRegistered(type)) {
116-
return context.getBootstrapContext().get(type);
117-
}
118-
return null;
116+
protected <T> T getBean(ConfigDataLoaderContext context, Class<T> type) {
117+
if (context.getBootstrapContext().isRegistered(type)) {
118+
return context.getBootstrapContext().get(type);
119119
}
120+
return null;
121+
}
120122
}

0 commit comments

Comments
 (0)