Skip to content

Commit 7c3618d

Browse files
philwebbrstoyanchev
authored andcommitted
Fixup checkstyle violations
See gh-33992
1 parent 92b0eb7 commit 7c3618d

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

spring-web/src/main/java/org/springframework/web/client/support/RestClientHttpServiceGroupAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* Adapter for groups backed by {@link RestClient}.
26-
*
26+
*
2727
* @author Rossen Stoyanchev
2828
* @since 7.0
2929
*/

spring-web/src/main/java/org/springframework/web/service/registry/AbstractHttpServiceRegistrar.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ protected abstract void registerHttpServices(
169169

170170
private ClassPathScanningCandidateComponentProvider getScanner() {
171171
if (this.scanner == null) {
172-
Assert.state(environment != null, "Environment has not been set");
173-
Assert.state(resourceLoader != null, "ResourceLoader has not been set");
172+
Assert.state(this.environment != null, "Environment has not been set");
173+
Assert.state(this.resourceLoader != null, "ResourceLoader has not been set");
174174
this.scanner = new HttpExchangeClassPathScanningCandidateComponentProvider();
175175
this.scanner.setEnvironment(this.environment);
176176
this.scanner.setResourceLoader(this.resourceLoader);
@@ -302,22 +302,22 @@ else if (defaultClientType != HttpServiceGroup.ClientType.UNSPECIFIED) {
302302

303303
@Override
304304
public GroupSpec register(Class<?>... serviceTypes) {
305-
addHttpServiceTypes(groupName, clientType, serviceTypes);
305+
addHttpServiceTypes(this.groupName, this.clientType, serviceTypes);
306306
return this;
307307
}
308308

309309
@Override
310310
public GroupSpec detectInBasePackages(Class<?>... packageClasses) {
311311
for (Class<?> packageClass : packageClasses) {
312-
detect(groupName, clientType, packageClass.getPackageName());
312+
detect(this.groupName, this.clientType, packageClass.getPackageName());
313313
}
314314
return this;
315315
}
316316

317317
@Override
318318
public GroupSpec detectInBasePackages(String... packageNames) {
319319
for (String packageName : packageNames) {
320-
detect(groupName, clientType, packageName);
320+
detect(this.groupName, this.clientType, packageName);
321321
}
322322
return this;
323323
}

spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceGroup.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ enum ClientType {
6969
/**
7070
* Not specified, falling back on a default.
7171
* @see ImportHttpServices#clientType()
72-
* @see HttpServiceGroups#clientType()
72+
* @see HttpServiceGroups#clientType()
7373
* @see AbstractHttpServiceRegistrar#setDefaultClientType
7474
*/
75-
UNSPECIFIED;
75+
UNSPECIFIED
7676
}
7777

7878
}

spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,13 @@ public void afterPropertiesSet() {
8989
Assert.notNull(this.applicationContext, "ApplicationContext not initialized");
9090

9191
// Set client builders
92-
groupAdapters.forEach((clientType, groupAdapter) -> {
92+
this.groupAdapters.forEach((clientType, groupAdapter) ->
9393
this.groupSet.stream()
9494
.filter(group -> group.clientType().equals(clientType))
95-
.forEach(group -> group.initialize(groupAdapter));
96-
});
95+
.forEach(group -> group.initialize(groupAdapter)));
9796

9897
// Apply group configurers
99-
groupAdapters.forEach((clientType, groupAdapter) -> {
98+
this.groupAdapters.forEach((clientType, groupAdapter) -> {
10099
Collection<? extends HttpServiceGroupConfigurer<?>> configurers =
101100
this.applicationContext.getBeansOfType(groupAdapter.getConfigurerType()).values();
102101

@@ -181,7 +180,7 @@ public ClientType clientType() {
181180
return this.declaredGroup.clientType();
182181
}
183182

184-
public <CB> void initialize(HttpServiceGroupAdapter<?> adapter) {
183+
public void initialize(HttpServiceGroupAdapter<?> adapter) {
185184
this.clientBuilder = adapter.createClientBuilder();
186185
this.groupAdapter = adapter;
187186
}

spring-web/src/main/java/org/springframework/web/service/registry/ImportHttpServices.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.web.service.annotation.HttpExchange;
2929

3030
/**
31-
* Annotation to identify HTTP Service types (interfaces with
31+
* Annotation to declare HTTP Service types (interfaces with
3232
* {@link HttpExchange @HttpExchange} methods) for which to create client proxies,
3333
* and have those proxies registered as beans.
3434
*

0 commit comments

Comments
 (0)