Skip to content

Commit 52e12ad

Browse files
EvaristeGalois11jzheaux
EvaristeGalois11
authored and
jzheaux
committed
Replace deprecated methods
1 parent 0cefb27 commit 52e12ad

File tree

24 files changed

+52
-52
lines changed

24 files changed

+52
-52
lines changed

‎config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
9494
.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
9595
String authorizationRequestResolverRef = (authorizationCodeGrantElt != null)
9696
? authorizationCodeGrantElt.getAttribute(ATT_AUTHORIZATION_REQUEST_RESOLVER_REF) : null;
97-
if (!StringUtils.isEmpty(authorizationRequestResolverRef)) {
97+
if (StringUtils.hasLength(authorizationRequestResolverRef)) {
9898
authorizationRequestRedirectFilterBuilder.addConstructorArgReference(authorizationRequestResolverRef);
9999
}
100100
else {
@@ -122,7 +122,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
122122
private BeanMetadataElement getAuthorizationRequestRepository(Element element) {
123123
String authorizationRequestRepositoryRef = (element != null)
124124
? element.getAttribute(ATT_AUTHORIZATION_REQUEST_REPOSITORY_REF) : null;
125-
if (!StringUtils.isEmpty(authorizationRequestRepositoryRef)) {
125+
if (StringUtils.hasLength(authorizationRequestRepositoryRef)) {
126126
return new RuntimeBeanReference(authorizationRequestRepositoryRef);
127127
}
128128
return BeanDefinitionBuilder.rootBeanDefinition(
@@ -143,7 +143,7 @@ private BeanMetadataElement getAuthorizationRedirectStrategy(Element element) {
143143
private BeanMetadataElement getAccessTokenResponseClient(Element element) {
144144
String accessTokenResponseClientRef = (element != null)
145145
? element.getAttribute(ATT_ACCESS_TOKEN_RESPONSE_CLIENT_REF) : null;
146-
if (!StringUtils.isEmpty(accessTokenResponseClientRef)) {
146+
if (StringUtils.hasLength(accessTokenResponseClientRef)) {
147147
return new RuntimeBeanReference(accessTokenResponseClientRef);
148148
}
149149
return BeanDefinitionBuilder.rootBeanDefinition(

‎config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ private OAuth2ClientBeanDefinitionParserUtils() {
4242

4343
static BeanMetadataElement getClientRegistrationRepository(Element element) {
4444
String clientRegistrationRepositoryRef = element.getAttribute(ATT_CLIENT_REGISTRATION_REPOSITORY_REF);
45-
if (!StringUtils.isEmpty(clientRegistrationRepositoryRef)) {
45+
if (StringUtils.hasLength(clientRegistrationRepositoryRef)) {
4646
return new RuntimeBeanReference(clientRegistrationRepositoryRef);
4747
}
4848
return new RuntimeBeanReference(ClientRegistrationRepository.class);
4949
}
5050

5151
static BeanMetadataElement getAuthorizedClientRepository(Element element) {
5252
String authorizedClientRepositoryRef = element.getAttribute(ATT_AUTHORIZED_CLIENT_REPOSITORY_REF);
53-
if (!StringUtils.isEmpty(authorizedClientRepositoryRef)) {
53+
if (StringUtils.hasLength(authorizedClientRepositoryRef)) {
5454
return new RuntimeBeanReference(authorizedClientRepositoryRef);
5555
}
5656
return null;
5757
}
5858

5959
static BeanMetadataElement getAuthorizedClientService(Element element) {
6060
String authorizedClientServiceRef = element.getAttribute(ATT_AUTHORIZED_CLIENT_SERVICE_REF);
61-
if (!StringUtils.isEmpty(authorizedClientServiceRef)) {
61+
if (StringUtils.hasLength(authorizedClientServiceRef)) {
6262
return new RuntimeBeanReference(authorizedClientServiceRef);
6363
}
6464
return null;

‎config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
175175
}
176176
Object source = parserContext.extractSource(element);
177177
String loginProcessingUrl = element.getAttribute(ATT_LOGIN_PROCESSING_URL);
178-
if (!StringUtils.isEmpty(loginProcessingUrl)) {
178+
if (StringUtils.hasLength(loginProcessingUrl)) {
179179
WebConfigUtils.validateHttpRedirect(loginProcessingUrl, parserContext, source);
180180
oauth2LoginAuthenticationFilterBuilder.addConstructorArgValue(loginProcessingUrl);
181181
}
@@ -187,7 +187,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
187187
.rootBeanDefinition(OAuth2LoginAuthenticationProvider.class)
188188
.addConstructorArgValue(accessTokenResponseClient).addConstructorArgValue(oauth2UserService);
189189
String userAuthoritiesMapperRef = element.getAttribute(ATT_USER_AUTHORITIES_MAPPER_REF);
190-
if (!StringUtils.isEmpty(userAuthoritiesMapperRef)) {
190+
if (StringUtils.hasLength(userAuthoritiesMapperRef)) {
191191
oauth2LoginAuthenticationProviderBuilder.addPropertyReference("authoritiesMapper",
192192
userAuthoritiesMapperRef);
193193
}
@@ -197,7 +197,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
197197
BeanDefinitionBuilder oauth2AuthorizationRequestRedirectFilterBuilder = BeanDefinitionBuilder
198198
.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
199199
String authorizationRequestResolverRef = element.getAttribute(ATT_AUTHORIZATION_REQUEST_RESOLVER_REF);
200-
if (!StringUtils.isEmpty(authorizationRequestResolverRef)) {
200+
if (StringUtils.hasLength(authorizationRequestResolverRef)) {
201201
oauth2AuthorizationRequestRedirectFilterBuilder.addConstructorArgReference(authorizationRequestResolverRef);
202202
}
203203
else {
@@ -210,7 +210,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
210210
this.oauth2AuthorizationRequestRedirectFilter = oauth2AuthorizationRequestRedirectFilterBuilder
211211
.getBeanDefinition();
212212
String authenticationSuccessHandlerRef = element.getAttribute(ATT_AUTHENTICATION_SUCCESS_HANDLER_REF);
213-
if (!StringUtils.isEmpty(authenticationSuccessHandlerRef)) {
213+
if (StringUtils.hasLength(authenticationSuccessHandlerRef)) {
214214
oauth2LoginAuthenticationFilterBuilder.addPropertyReference("authenticationSuccessHandler",
215215
authenticationSuccessHandlerRef);
216216
}
@@ -222,7 +222,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
222222
successHandlerBuilder.getBeanDefinition());
223223
}
224224
String loginPage = element.getAttribute(ATT_LOGIN_PAGE);
225-
if (!StringUtils.isEmpty(loginPage)) {
225+
if (StringUtils.hasLength(loginPage)) {
226226
WebConfigUtils.validateHttpRedirect(loginPage, parserContext, source);
227227
this.oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder
228228
.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class).addConstructorArgValue(loginPage)
@@ -239,7 +239,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
239239
}
240240
}
241241
String authenticationFailureHandlerRef = element.getAttribute(ATT_AUTHENTICATION_FAILURE_HANDLER_REF);
242-
if (!StringUtils.isEmpty(authenticationFailureHandlerRef)) {
242+
if (StringUtils.hasLength(authenticationFailureHandlerRef)) {
243243
oauth2LoginAuthenticationFilterBuilder.addPropertyReference("authenticationFailureHandler",
244244
authenticationFailureHandlerRef);
245245
}
@@ -262,7 +262,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
262262

263263
private BeanMetadataElement getAuthorizationRequestRepository(Element element) {
264264
String authorizationRequestRepositoryRef = element.getAttribute(ATT_AUTHORIZATION_REQUEST_REPOSITORY_REF);
265-
if (!StringUtils.isEmpty(authorizationRequestRepositoryRef)) {
265+
if (StringUtils.hasLength(authorizationRequestRepositoryRef)) {
266266
return new RuntimeBeanReference(authorizationRequestRepositoryRef);
267267
}
268268
return BeanDefinitionBuilder.rootBeanDefinition(
@@ -290,19 +290,19 @@ private BeanDefinition getOidcAuthProvider(Element element, BeanMetadataElement
290290
BeanDefinitionBuilder oidcAuthProviderBuilder = BeanDefinitionBuilder.rootBeanDefinition(
291291
"org.springframework.security.oauth2.client.oidc.authentication.OidcAuthorizationCodeAuthenticationProvider")
292292
.addConstructorArgValue(accessTokenResponseClient).addConstructorArgValue(oidcUserService);
293-
if (!StringUtils.isEmpty(userAuthoritiesMapperRef)) {
293+
if (StringUtils.hasLength(userAuthoritiesMapperRef)) {
294294
oidcAuthProviderBuilder.addPropertyReference("authoritiesMapper", userAuthoritiesMapperRef);
295295
}
296296
String jwtDecoderFactoryRef = element.getAttribute(ATT_JWT_DECODER_FACTORY_REF);
297-
if (!StringUtils.isEmpty(jwtDecoderFactoryRef)) {
297+
if (StringUtils.hasLength(jwtDecoderFactoryRef)) {
298298
oidcAuthProviderBuilder.addPropertyReference("jwtDecoderFactory", jwtDecoderFactoryRef);
299299
}
300300
return oidcAuthProviderBuilder.getBeanDefinition();
301301
}
302302

303303
private BeanMetadataElement getOidcUserService(Element element) {
304304
String oidcUserServiceRef = element.getAttribute(ATT_OIDC_USER_SERVICE_REF);
305-
if (!StringUtils.isEmpty(oidcUserServiceRef)) {
305+
if (StringUtils.hasLength(oidcUserServiceRef)) {
306306
return new RuntimeBeanReference(oidcUserServiceRef);
307307
}
308308
return BeanDefinitionBuilder
@@ -312,7 +312,7 @@ private BeanMetadataElement getOidcUserService(Element element) {
312312

313313
private BeanMetadataElement getOAuth2UserService(Element element) {
314314
String oauth2UserServiceRef = element.getAttribute(ATT_USER_SERVICE_REF);
315-
if (!StringUtils.isEmpty(oauth2UserServiceRef)) {
315+
if (StringUtils.hasLength(oauth2UserServiceRef)) {
316316
return new RuntimeBeanReference(oauth2UserServiceRef);
317317
}
318318
return BeanDefinitionBuilder
@@ -322,7 +322,7 @@ private BeanMetadataElement getOAuth2UserService(Element element) {
322322

323323
private BeanMetadataElement getAccessTokenResponseClient(Element element) {
324324
String accessTokenResponseClientRef = element.getAttribute(ATT_ACCESS_TOKEN_RESPONSE_CLIENT_REF);
325-
if (!StringUtils.isEmpty(accessTokenResponseClientRef)) {
325+
if (StringUtils.hasLength(accessTokenResponseClientRef)) {
326326
return new RuntimeBeanReference(accessTokenResponseClientRef);
327327
}
328328
return BeanDefinitionBuilder.rootBeanDefinition(

‎config/src/main/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParser.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ void validateConfiguration(Element oauth2ResourceServer, Element jwt, Element op
165165

166166
BeanMetadataElement getAuthenticationManagerResolver(Element element) {
167167
String authenticationManagerResolverRef = element.getAttribute(AUTHENTICATION_MANAGER_RESOLVER_REF);
168-
if (!StringUtils.isEmpty(authenticationManagerResolverRef)) {
168+
if (StringUtils.hasLength(authenticationManagerResolverRef)) {
169169
return new RuntimeBeanReference(authenticationManagerResolverRef);
170170
}
171171
BeanDefinitionBuilder authenticationManagerResolver = BeanDefinitionBuilder
@@ -176,15 +176,15 @@ BeanMetadataElement getAuthenticationManagerResolver(Element element) {
176176

177177
BeanMetadataElement getBearerTokenResolver(Element element) {
178178
String bearerTokenResolverRef = element.getAttribute(BEARER_TOKEN_RESOLVER_REF);
179-
if (StringUtils.isEmpty(bearerTokenResolverRef)) {
179+
if (!StringUtils.hasLength(bearerTokenResolverRef)) {
180180
return new RootBeanDefinition(DefaultBearerTokenResolver.class);
181181
}
182182
return new RuntimeBeanReference(bearerTokenResolverRef);
183183
}
184184

185185
BeanMetadataElement getEntryPoint(Element element) {
186186
String entryPointRef = element.getAttribute(ENTRY_POINT_REF);
187-
if (StringUtils.isEmpty(entryPointRef)) {
187+
if (!StringUtils.hasLength(entryPointRef)) {
188188
return this.authenticationEntryPoint;
189189
}
190190
return new RuntimeBeanReference(entryPointRef);
@@ -223,7 +223,7 @@ void validateConfiguration(Element element, ParserContext pc) {
223223

224224
Object getDecoder(Element element) {
225225
String decoderRef = element.getAttribute(DECODER_REF);
226-
if (!StringUtils.isEmpty(decoderRef)) {
226+
if (StringUtils.hasLength(decoderRef)) {
227227
return new RuntimeBeanReference(decoderRef);
228228
}
229229
BeanDefinitionBuilder builder = BeanDefinitionBuilder
@@ -234,7 +234,7 @@ Object getDecoder(Element element) {
234234

235235
Object getJwtAuthenticationConverter(Element element) {
236236
String jwtDecoderRef = element.getAttribute(JWT_AUTHENTICATION_CONVERTER_REF);
237-
return (!StringUtils.isEmpty(jwtDecoderRef)) ? new RuntimeBeanReference(jwtDecoderRef)
237+
return (StringUtils.hasLength(jwtDecoderRef)) ? new RuntimeBeanReference(jwtDecoderRef)
238238
: new JwtAuthenticationConverter();
239239
}
240240

@@ -291,7 +291,7 @@ void validateConfiguration(Element element, ParserContext pc) {
291291

292292
BeanMetadataElement getIntrospector(Element element) {
293293
String introspectorRef = element.getAttribute(INTROSPECTOR_REF);
294-
if (!StringUtils.isEmpty(introspectorRef)) {
294+
if (StringUtils.hasLength(introspectorRef)) {
295295
return new RuntimeBeanReference(introspectorRef);
296296
}
297297
String introspectionUri = element.getAttribute(INTROSPECTION_URI);

‎config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private static ClientRegistration.Builder getBuilderFromIssuerIfPossible(ParserC
170170
if (providers.containsKey(providerId)) {
171171
Map<String, String> provider = providers.get(providerId);
172172
String issuer = provider.get(ATT_ISSUER_URI);
173-
if (!StringUtils.isEmpty(issuer)) {
173+
if (StringUtils.hasLength(issuer)) {
174174
ClientRegistration.Builder builder = ClientRegistrations.fromIssuerLocation(issuer)
175175
.registrationId(registrationId);
176176
return getBuilder(parserContext, builder, provider);

‎config/src/test/java/org/springframework/security/config/doc/SpringSecurityXsdParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private Attribute attr(XmlNode n) {
179179
*/
180180
private Element elmt(XmlNode n) {
181181
String name = n.attribute("ref");
182-
if (StringUtils.isEmpty(name)) {
182+
if (!StringUtils.hasLength(name)) {
183183
name = n.attribute("name");
184184
}
185185
else {
@@ -199,7 +199,7 @@ private Element elmt(XmlNode n) {
199199
e.getAttrs().forEach((attr) -> attr.setElmt(e));
200200
e.getChildElmts().values().forEach((element) -> element.getParentElmts().put(e.getName(), e));
201201
String subGrpName = n.attribute("substitutionGroup");
202-
if (!StringUtils.isEmpty(subGrpName)) {
202+
if (StringUtils.hasLength(subGrpName)) {
203203
Element subGrp = elmt(findNode(n, subGrpName.split(":")[1]));
204204
subGrp.getSubGrps().add(e);
205205
}

‎core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private static Module loadAndGetInstance(String className, ClassLoader loader) {
127127
Class<? extends Module> securityModule = (Class<? extends Module>) ClassUtils.forName(className, loader);
128128
if (securityModule != null) {
129129
logger.debug(LogMessage.format("Loaded module %s, now registering", className));
130-
return securityModule.newInstance();
130+
return securityModule.getConstructor().newInstance();
131131
}
132132
}
133133
catch (Exception ex) {

‎core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void createUserInsertsCorrectDataWithLocking() {
145145
AuthorityUtils.createAuthorityList("A", "B"));
146146
this.manager.createUser(user);
147147
UserDetails user2 = this.manager.loadUserByUsername(user.getUsername());
148-
assertThat(user2).isEqualToComparingFieldByField(user);
148+
assertThat(user2).usingRecursiveComparison().isEqualTo(user);
149149
}
150150

151151
@Test
@@ -176,7 +176,7 @@ public void updateUserChangesDataCorrectlyAndClearsCacheWithLocking() {
176176
AuthorityUtils.createAuthorityList("D", "F", "E"));
177177
this.manager.updateUser(newJoe);
178178
UserDetails joe = this.manager.loadUserByUsername(newJoe.getUsername());
179-
assertThat(joe).isEqualToComparingFieldByField(newJoe);
179+
assertThat(joe).usingRecursiveComparison().isEqualTo(newJoe);
180180
assertThat(this.cache.getUserMap().containsKey(newJoe.getUsername())).isFalse();
181181
}
182182

‎oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserRequestUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ final class OidcUserRequestUtils {
4545
static boolean shouldRetrieveUserInfo(OidcUserRequest userRequest) {
4646
// Auto-disabled if UserInfo Endpoint URI is not provided
4747
ClientRegistration clientRegistration = userRequest.getClientRegistration();
48-
if (StringUtils.isEmpty(clientRegistration.getProviderDetails().getUserInfoEndpoint().getUri())) {
48+
if (!StringUtils.hasLength(clientRegistration.getProviderDetails().getUserInfoEndpoint().getUri())) {
4949
return false;
5050
}
5151
// The Claims requested by the profile, email, address, and phone scope values

‎oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private OidcUser getUser(OidcUserRequest userRequest, OidcUserInfo userInfo, Set
157157
private boolean shouldRetrieveUserInfo(OidcUserRequest userRequest) {
158158
// Auto-disabled if UserInfo Endpoint URI is not provided
159159
ProviderDetails providerDetails = userRequest.getClientRegistration().getProviderDetails();
160-
if (StringUtils.isEmpty(providerDetails.getUserInfoEndpoint().getUri())) {
160+
if (!StringUtils.hasLength(providerDetails.getUserInfoEndpoint().getUri())) {
161161
return false;
162162
}
163163
// The Claims requested by the profile, email, address, and phone scope values

0 commit comments

Comments
 (0)