Skip to content

Commit 12f6b9f

Browse files
committed
Fix properties, along with javaldocs and documentation.
1 parent 6119430 commit 12f6b9f

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ void documentConfigurationProperties() throws IOException {
6969
snippets.add("application-properties.server", "Server Properties", this::serverPrefixes);
7070
snippets.add("application-properties.security", "Security Properties", this::securityPrefixes);
7171
snippets.add("application-properties.rsocket", "RSocket Properties", this::rsocketPrefixes);
72+
snippets.add("application-properties.interfaceclients", "Interface Clients Properties",
73+
this::interfaceClientsPrefixes);
7274
snippets.add("application-properties.actuator", "Actuator Properties", this::actuatorPrefixes);
7375
snippets.add("application-properties.devtools", "Devtools Properties", this::devtoolsPrefixes);
7476
snippets.add("application-properties.docker-compose", "Docker Compose Properties", this::dockerComposePrefixes);
@@ -205,6 +207,10 @@ private void rsocketPrefixes(Config prefix) {
205207
prefix.accept("spring.rsocket");
206208
}
207209

210+
private void interfaceClientsPrefixes(Config prefix) {
211+
prefix.accept("spring.interfaceclients");
212+
}
213+
208214
private void actuatorPrefixes(Config prefix) {
209215
prefix.accept("management");
210216
prefix.accept("micrometer");

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsBaseProperties.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
*/
2222
public class HttpInterfaceClientsBaseProperties {
2323

24+
/**
25+
* Base url to set in the underlying HTTP client. By default, set to null.
26+
*/
2427
private String baseUrl = null;
2528

26-
private String httpProxyFactoryBeanName = "";
27-
28-
private String httpExchangeAdapterBeanName = "";
29-
3029
public String getBaseUrl() {
3130
return this.baseUrl;
3231
}
@@ -35,20 +34,4 @@ public void setBaseUrl(String baseUrl) {
3534
this.baseUrl = baseUrl;
3635
}
3736

38-
public String getHttpProxyFactoryBeanName() {
39-
return this.httpProxyFactoryBeanName;
40-
}
41-
42-
public void setHttpProxyFactoryBeanName(String httpProxyFactoryBeanName) {
43-
this.httpProxyFactoryBeanName = httpProxyFactoryBeanName;
44-
}
45-
46-
public String getHttpExchangeAdapterBeanName() {
47-
return this.httpExchangeAdapterBeanName;
48-
}
49-
50-
public void setHttpExchangeAdapterBeanName(String httpExchangeAdapterBeanName) {
51-
this.httpExchangeAdapterBeanName = httpExchangeAdapterBeanName;
52-
}
53-
5437
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsProperties.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
@ConfigurationProperties("spring.interfaceclients")
3131
public class HttpInterfaceClientsProperties extends HttpInterfaceClientsBaseProperties {
3232

33+
/**
34+
* Client-specific interface client properties.
35+
*/
3336
private final Map<String, HttpInterfaceClientsBaseProperties> clients = new HashMap<>();
3437

3538
public Map<String, HttpInterfaceClientsBaseProperties> getClients() {
@@ -41,7 +44,7 @@ public HttpInterfaceClientsBaseProperties getProperties(String clientName) {
4144
// no specific client properties, return default
4245
return this;
4346
}
44-
// because specifics are overlayed on top of defaults, everything in `properties`,
47+
// because specifics are overlaid on top of defaults, everything in `properties`,
4548
// unless overridden, is in `clientsProperties`
4649
return this.getClients().get(clientName);
4750
}

0 commit comments

Comments
 (0)