Skip to content

Commit d7f6a45

Browse files
philwebbphilwebb
committed
Align reactive auto-configuration names
Rename a few reactive auto-configuration and related classes for better consistency.
1 parent 2ddca76 commit d7f6a45

File tree

34 files changed

+119
-127
lines changed

34 files changed

+119
-127
lines changed

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundryReactiveActuatorAutoConfiguration.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
@ConditionalOnBooleanProperty(name = "management.cloudfoundry.enabled", matchIfMissing = true)
8080
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
8181
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
82-
public class ReactiveCloudFoundryActuatorAutoConfiguration {
82+
public class CloudFoundryReactiveActuatorAutoConfiguration {
8383

8484
private static final String BASE_PATH = "/cloudfoundryapplication";
8585

@@ -115,7 +115,7 @@ public CloudFoundryWebFluxEndpointHandlerMapping cloudFoundryWebFluxEndpointHand
115115
CloudFoundryWebEndpointDiscoverer endpointDiscoverer = new CloudFoundryWebEndpointDiscoverer(applicationContext,
116116
parameterMapper, endpointMediaTypes, null, Collections.emptyList(), Collections.emptyList(),
117117
Collections.emptyList());
118-
CloudFoundrySecurityInterceptor securityInterceptor = getSecurityInterceptor(webClientBuilder,
118+
SecurityInterceptor securityInterceptor = getSecurityInterceptor(webClientBuilder,
119119
applicationContext.getEnvironment());
120120
Collection<ExposableWebEndpoint> webEndpoints = endpointDiscoverer.getEndpoints();
121121
List<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();
@@ -125,23 +125,20 @@ public CloudFoundryWebFluxEndpointHandlerMapping cloudFoundryWebFluxEndpointHand
125125
endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints);
126126
}
127127

128-
private CloudFoundrySecurityInterceptor getSecurityInterceptor(WebClient.Builder webClientBuilder,
129-
Environment environment) {
130-
ReactiveCloudFoundrySecurityService cloudfoundrySecurityService = getCloudFoundrySecurityService(
131-
webClientBuilder, environment);
132-
ReactiveTokenValidator tokenValidator = new ReactiveTokenValidator(cloudfoundrySecurityService);
133-
return new CloudFoundrySecurityInterceptor(tokenValidator, cloudfoundrySecurityService,
128+
private SecurityInterceptor getSecurityInterceptor(WebClient.Builder webClientBuilder, Environment environment) {
129+
SecurityService cloudfoundrySecurityService = getCloudFoundrySecurityService(webClientBuilder, environment);
130+
TokenValidator tokenValidator = new TokenValidator(cloudfoundrySecurityService);
131+
return new SecurityInterceptor(tokenValidator, cloudfoundrySecurityService,
134132
environment.getProperty("vcap.application.application_id"));
135133
}
136134

137-
private ReactiveCloudFoundrySecurityService getCloudFoundrySecurityService(WebClient.Builder webClientBuilder,
135+
private SecurityService getCloudFoundrySecurityService(WebClient.Builder webClientBuilder,
138136
Environment environment) {
139137
String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
140138
boolean skipSslValidation = environment.getProperty("management.cloudfoundry.skip-ssl-validation",
141139
Boolean.class, false);
142140
return (cloudControllerUrl != null)
143-
? new ReactiveCloudFoundrySecurityService(webClientBuilder, cloudControllerUrl, skipSslValidation)
144-
: null;
141+
? new SecurityService(webClientBuilder, cloudControllerUrl, skipSslValidation) : null;
145142
}
146143

147144
private CorsConfiguration getCorsConfiguration() {

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundryWebFluxEndpointHandlerMapping.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@
6161
@ImportRuntimeHints(CloudFoundryWebFluxEndpointHandlerMappingRuntimeHints.class)
6262
class CloudFoundryWebFluxEndpointHandlerMapping extends AbstractWebFluxEndpointHandlerMapping {
6363

64-
private final CloudFoundrySecurityInterceptor securityInterceptor;
64+
private final SecurityInterceptor securityInterceptor;
6565

6666
private final EndpointLinksResolver linksResolver;
6767

6868
private final Collection<ExposableEndpoint<?>> allEndpoints;
6969

7070
CloudFoundryWebFluxEndpointHandlerMapping(EndpointMapping endpointMapping,
7171
Collection<ExposableWebEndpoint> endpoints, EndpointMediaTypes endpointMediaTypes,
72-
CorsConfiguration corsConfiguration, CloudFoundrySecurityInterceptor securityInterceptor,
72+
CorsConfiguration corsConfiguration, SecurityInterceptor securityInterceptor,
7373
Collection<ExposableEndpoint<?>> allEndpoints) {
7474
super(endpointMapping, endpoints, endpointMediaTypes, corsConfiguration, true);
7575
this.linksResolver = new EndpointLinksResolver(allEndpoints);
@@ -135,11 +135,11 @@ private static class SecureReactiveWebOperation implements ReactiveWebOperation
135135

136136
private final ReactiveWebOperation delegate;
137137

138-
private final CloudFoundrySecurityInterceptor securityInterceptor;
138+
private final SecurityInterceptor securityInterceptor;
139139

140140
private final EndpointId endpointId;
141141

142-
SecureReactiveWebOperation(ReactiveWebOperation delegate, CloudFoundrySecurityInterceptor securityInterceptor,
142+
SecureReactiveWebOperation(ReactiveWebOperation delegate, SecurityInterceptor securityInterceptor,
143143
EndpointId endpointId) {
144144
this.delegate = delegate;
145145
this.securityInterceptor = securityInterceptor;

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundrySecurityInterceptor.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/SecurityInterceptor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@
3737
*
3838
* @author Madhura Bhave
3939
*/
40-
class CloudFoundrySecurityInterceptor {
40+
class SecurityInterceptor {
4141

42-
private static final Log logger = LogFactory.getLog(CloudFoundrySecurityInterceptor.class);
42+
private static final Log logger = LogFactory.getLog(SecurityInterceptor.class);
4343

44-
private final ReactiveTokenValidator tokenValidator;
44+
private final TokenValidator tokenValidator;
4545

46-
private final ReactiveCloudFoundrySecurityService cloudFoundrySecurityService;
46+
private final SecurityService cloudFoundrySecurityService;
4747

4848
private final String applicationId;
4949

5050
private static final Mono<SecurityResponse> SUCCESS = Mono.just(SecurityResponse.success());
5151

52-
CloudFoundrySecurityInterceptor(ReactiveTokenValidator tokenValidator,
53-
ReactiveCloudFoundrySecurityService cloudFoundrySecurityService, String applicationId) {
52+
SecurityInterceptor(TokenValidator tokenValidator, SecurityService cloudFoundrySecurityService,
53+
String applicationId) {
5454
this.tokenValidator = tokenValidator;
5555
this.cloudFoundrySecurityService = cloudFoundrySecurityService;
5656
this.applicationId = applicationId;

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/ReactiveCloudFoundrySecurityService.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/SecurityService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
* @author Madhura Bhave
4747
*/
48-
class ReactiveCloudFoundrySecurityService {
48+
class SecurityService {
4949

5050
private static final ParameterizedTypeReference<Map<String, Object>> STRING_OBJECT_MAP = new ParameterizedTypeReference<>() {
5151
};
@@ -54,8 +54,7 @@ class ReactiveCloudFoundrySecurityService {
5454

5555
private final String cloudControllerUrl;
5656

57-
ReactiveCloudFoundrySecurityService(WebClient.Builder webClientBuilder, String cloudControllerUrl,
58-
boolean skipSslValidation) {
57+
SecurityService(WebClient.Builder webClientBuilder, String cloudControllerUrl, boolean skipSslValidation) {
5958
Assert.notNull(webClientBuilder, "'webClientBuilder' must not be null");
6059
Assert.notNull(cloudControllerUrl, "'cloudControllerUrl' must not be null");
6160
if (skipSslValidation) {

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/ReactiveTokenValidator.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/TokenValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
*
4040
* @author Madhura Bhave
4141
*/
42-
class ReactiveTokenValidator {
42+
class TokenValidator {
4343

44-
private final ReactiveCloudFoundrySecurityService securityService;
44+
private final SecurityService securityService;
4545

4646
private volatile Map<String, String> cachedTokenKeys = Collections.emptyMap();
4747

48-
ReactiveTokenValidator(ReactiveCloudFoundrySecurityService securityService) {
48+
TokenValidator(SecurityService securityService) {
4949
this.securityService = securityService;
5050
}
5151

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/CloudFoundryActuatorAutoConfiguration.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServl
119119
CloudFoundryWebEndpointDiscoverer discoverer = new CloudFoundryWebEndpointDiscoverer(applicationContext,
120120
parameterMapper, endpointMediaTypes, null, Collections.emptyList(), Collections.emptyList(),
121121
Collections.emptyList());
122-
CloudFoundrySecurityInterceptor securityInterceptor = getSecurityInterceptor(restTemplateBuilder,
122+
SecurityInterceptor securityInterceptor = getSecurityInterceptor(restTemplateBuilder,
123123
applicationContext.getEnvironment());
124124
Collection<ExposableWebEndpoint> webEndpoints = discoverer.getEndpoints();
125125
List<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();
@@ -130,22 +130,21 @@ public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServl
130130
endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints);
131131
}
132132

133-
private CloudFoundrySecurityInterceptor getSecurityInterceptor(RestTemplateBuilder restTemplateBuilder,
133+
private SecurityInterceptor getSecurityInterceptor(RestTemplateBuilder restTemplateBuilder,
134134
Environment environment) {
135-
CloudFoundrySecurityService cloudfoundrySecurityService = getCloudFoundrySecurityService(restTemplateBuilder,
136-
environment);
135+
SecurityService cloudfoundrySecurityService = getCloudFoundrySecurityService(restTemplateBuilder, environment);
137136
TokenValidator tokenValidator = new TokenValidator(cloudfoundrySecurityService);
138-
return new CloudFoundrySecurityInterceptor(tokenValidator, cloudfoundrySecurityService,
137+
return new SecurityInterceptor(tokenValidator, cloudfoundrySecurityService,
139138
environment.getProperty("vcap.application.application_id"));
140139
}
141140

142-
private CloudFoundrySecurityService getCloudFoundrySecurityService(RestTemplateBuilder restTemplateBuilder,
141+
private SecurityService getCloudFoundrySecurityService(RestTemplateBuilder restTemplateBuilder,
143142
Environment environment) {
144143
String cloudControllerUrl = environment.getProperty("vcap.application.cf_api");
145144
boolean skipSslValidation = environment.getProperty("management.cloudfoundry.skip-ssl-validation",
146145
Boolean.class, false);
147146
return (cloudControllerUrl != null)
148-
? new CloudFoundrySecurityService(restTemplateBuilder, cloudControllerUrl, skipSslValidation) : null;
147+
? new SecurityService(restTemplateBuilder, cloudControllerUrl, skipSslValidation) : null;
149148
}
150149

151150
private CorsConfiguration getCorsConfiguration() {

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/CloudFoundryWebEndpointServletHandlerMapping.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ class CloudFoundryWebEndpointServletHandlerMapping extends AbstractWebMvcEndpoin
6464

6565
private static final Log logger = LogFactory.getLog(CloudFoundryWebEndpointServletHandlerMapping.class);
6666

67-
private final CloudFoundrySecurityInterceptor securityInterceptor;
67+
private final SecurityInterceptor securityInterceptor;
6868

6969
private final EndpointLinksResolver linksResolver;
7070

7171
private final Collection<ExposableEndpoint<?>> allEndpoints;
7272

7373
CloudFoundryWebEndpointServletHandlerMapping(EndpointMapping endpointMapping,
7474
Collection<ExposableWebEndpoint> endpoints, EndpointMediaTypes endpointMediaTypes,
75-
CorsConfiguration corsConfiguration, CloudFoundrySecurityInterceptor securityInterceptor,
75+
CorsConfiguration corsConfiguration, SecurityInterceptor securityInterceptor,
7676
Collection<ExposableEndpoint<?>> allEndpoints) {
7777
super(endpointMapping, endpoints, endpointMediaTypes, corsConfiguration, true);
7878
this.securityInterceptor = securityInterceptor;
@@ -143,11 +143,11 @@ private static class SecureServletWebOperation implements ServletWebOperation {
143143

144144
private final ServletWebOperation delegate;
145145

146-
private final CloudFoundrySecurityInterceptor securityInterceptor;
146+
private final SecurityInterceptor securityInterceptor;
147147

148148
private final EndpointId endpointId;
149149

150-
SecureServletWebOperation(ServletWebOperation delegate, CloudFoundrySecurityInterceptor securityInterceptor,
150+
SecureServletWebOperation(ServletWebOperation delegate, SecurityInterceptor securityInterceptor,
151151
EndpointId endpointId) {
152152
this.delegate = delegate;
153153
this.securityInterceptor = securityInterceptor;

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/CloudFoundrySecurityInterceptor.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/SecurityInterceptor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@
3838
*
3939
* @author Madhura Bhave
4040
*/
41-
class CloudFoundrySecurityInterceptor {
41+
class SecurityInterceptor {
4242

43-
private static final Log logger = LogFactory.getLog(CloudFoundrySecurityInterceptor.class);
43+
private static final Log logger = LogFactory.getLog(SecurityInterceptor.class);
4444

4545
private final TokenValidator tokenValidator;
4646

47-
private final CloudFoundrySecurityService cloudFoundrySecurityService;
47+
private final SecurityService cloudFoundrySecurityService;
4848

4949
private final String applicationId;
5050

5151
private static final SecurityResponse SUCCESS = SecurityResponse.success();
5252

53-
CloudFoundrySecurityInterceptor(TokenValidator tokenValidator,
54-
CloudFoundrySecurityService cloudFoundrySecurityService, String applicationId) {
53+
SecurityInterceptor(TokenValidator tokenValidator, SecurityService cloudFoundrySecurityService,
54+
String applicationId) {
5555
this.tokenValidator = tokenValidator;
5656
this.cloudFoundrySecurityService = cloudFoundrySecurityService;
5757
this.applicationId = applicationId;

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/CloudFoundrySecurityService.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/SecurityService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@
3939
*
4040
* @author Madhura Bhave
4141
*/
42-
class CloudFoundrySecurityService {
42+
class SecurityService {
4343

4444
private final RestTemplate restTemplate;
4545

4646
private final String cloudControllerUrl;
4747

4848
private String uaaUrl;
4949

50-
CloudFoundrySecurityService(RestTemplateBuilder restTemplateBuilder, String cloudControllerUrl,
51-
boolean skipSslValidation) {
50+
SecurityService(RestTemplateBuilder restTemplateBuilder, String cloudControllerUrl, boolean skipSslValidation) {
5251
Assert.notNull(restTemplateBuilder, "'restTemplateBuilder' must not be null");
5352
Assert.notNull(cloudControllerUrl, "'cloudControllerUrl' must not be null");
5453
if (skipSslValidation) {

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/servlet/TokenValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
*/
3939
class TokenValidator {
4040

41-
private final CloudFoundrySecurityService securityService;
41+
private final SecurityService securityService;
4242

4343
private Map<String, String> tokenKeys;
4444

45-
TokenValidator(CloudFoundrySecurityService cloudFoundrySecurityService) {
45+
TokenValidator(SecurityService cloudFoundrySecurityService) {
4646
this.securityService = cloudFoundrySecurityService;
4747
}
4848

‎spring-boot-project/spring-boot-cloudfoundry/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.reactive.ReactiveCloudFoundryActuatorAutoConfiguration
1+
org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.reactive.CloudFoundryReactiveActuatorAutoConfiguration
22
org.springframework.boot.cloudfoundry.actuate.autoconfigure.endpoint.servlet.CloudFoundryActuatorAutoConfiguration

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundryReactiveActuatorAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
import static org.mockito.Mockito.mock;
8484

8585
/**
86-
* Tests for {@link ReactiveCloudFoundryActuatorAutoConfiguration}.
86+
* Tests for {@link CloudFoundryReactiveActuatorAutoConfiguration}.
8787
*
8888
* @author Madhura Bhave
8989
* @author Moritz Halbritter
9090
*/
91-
class ReactiveCloudFoundryActuatorAutoConfigurationTests {
91+
class CloudFoundryReactiveActuatorAutoConfigurationTests {
9292

9393
private static final String V2_JSON = ApiVersion.V2.getProducedMimeType().toString();
9494

@@ -103,7 +103,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests {
103103
EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
104104
HealthContributorAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
105105
InfoContributorAutoConfiguration.class, InfoEndpointAutoConfiguration.class,
106-
ProjectInfoAutoConfiguration.class, ReactiveCloudFoundryActuatorAutoConfiguration.class))
106+
ProjectInfoAutoConfiguration.class, CloudFoundryReactiveActuatorAutoConfiguration.class))
107107
.withUserConfiguration(UserDetailsServiceConfiguration.class);
108108

109109
private static final String BASE_PATH = "/cloudfoundryapplication";

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ class CloudFoundryReactiveHealthEndpointWebExtensionTests {
5757
.withConfiguration(AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class,
5858
WebFluxAutoConfiguration.class, JacksonAutoConfiguration.class,
5959
HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
60-
ReactiveCloudFoundryActuatorAutoConfigurationTests.WebClientCustomizerConfig.class,
60+
CloudFoundryReactiveActuatorAutoConfigurationTests.WebClientCustomizerConfig.class,
6161
WebClientAutoConfiguration.class, ManagementContextAutoConfiguration.class,
6262
EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
6363
HealthContributorAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
64-
ReactiveCloudFoundryActuatorAutoConfiguration.class))
64+
CloudFoundryReactiveActuatorAutoConfiguration.class))
6565
.withUserConfiguration(TestHealthIndicator.class, UserDetailsServiceConfiguration.class);
6666

6767
@Test

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/endpoint/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@
7575
*/
7676
class CloudFoundryWebFluxEndpointIntegrationTests {
7777

78-
private final ReactiveTokenValidator tokenValidator = mock(ReactiveTokenValidator.class);
78+
private final TokenValidator tokenValidator = mock(TokenValidator.class);
7979

80-
private final ReactiveCloudFoundrySecurityService securityService = mock(ReactiveCloudFoundrySecurityService.class);
80+
private final SecurityService securityService = mock(SecurityService.class);
8181

8282
private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner(
8383
AnnotationConfigReactiveWebServerApplicationContext::new)
8484
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, HttpHandlerAutoConfiguration.class,
8585
NettyReactiveWebServerAutoConfiguration.class))
8686
.withUserConfiguration(TestEndpointConfiguration.class)
87-
.withBean(ReactiveTokenValidator.class, () -> this.tokenValidator)
88-
.withBean(ReactiveCloudFoundrySecurityService.class, () -> this.securityService)
87+
.withBean(TokenValidator.class, () -> this.tokenValidator)
88+
.withBean(SecurityService.class, () -> this.securityService)
8989
.withPropertyValues("server.port=0");
9090

9191
@Test
@@ -233,9 +233,8 @@ private String mockAccessToken() {
233233
static class CloudFoundryReactiveConfiguration {
234234

235235
@Bean
236-
CloudFoundrySecurityInterceptor interceptor(ReactiveTokenValidator tokenValidator,
237-
ReactiveCloudFoundrySecurityService securityService) {
238-
return new CloudFoundrySecurityInterceptor(tokenValidator, securityService, "app-id");
236+
SecurityInterceptor interceptor(TokenValidator tokenValidator, SecurityService securityService) {
237+
return new SecurityInterceptor(tokenValidator, securityService, "app-id");
239238
}
240239

241240
@Bean
@@ -247,7 +246,7 @@ EndpointMediaTypes EndpointMediaTypes() {
247246
@Bean
248247
CloudFoundryWebFluxEndpointHandlerMapping cloudFoundryWebEndpointServletHandlerMapping(
249248
WebEndpointDiscoverer webEndpointDiscoverer, EndpointMediaTypes endpointMediaTypes,
250-
CloudFoundrySecurityInterceptor interceptor) {
249+
SecurityInterceptor interceptor) {
251250
CorsConfiguration corsConfiguration = new CorsConfiguration();
252251
corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com"));
253252
corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST"));

0 commit comments

Comments
 (0)