Browse Source

Fix checkstyle

Issue gh-18530
pull/18530/head
Robert Winch 4 weeks ago
parent
commit
53300be8d7
No known key found for this signature in database
  1. 3
      config/src/main/java/org/springframework/security/config/http/AuthorizationFilterParser.java
  2. 3
      config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
  3. 19
      config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java

3
config/src/main/java/org/springframework/security/config/http/AuthorizationFilterParser.java

@ -125,8 +125,7 @@ class AuthorizationFilterParser implements BeanDefinitionParser { @@ -125,8 +125,7 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
for (Element interceptMessage : interceptMessages) {
String accessExpression = interceptMessage.getAttribute(ATT_ACCESS);
if (!StringUtils.hasText(accessExpression)) {
parserContext.getReaderContext()
.error("access attribute cannot be empty or null", interceptMessage);
parserContext.getReaderContext().error("access attribute cannot be empty or null", interceptMessage);
continue;
}
BeanDefinitionBuilder authorizationManager = BeanDefinitionBuilder

3
config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java

@ -144,8 +144,7 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit @@ -144,8 +144,7 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit
String access = urlElt.getAttribute(ATT_ACCESS);
String path = urlElt.getAttribute(ATT_PATTERN);
if (!StringUtils.hasText(access)) {
parserContext.getReaderContext()
.error("access attribute cannot be empty or null", urlElt);
parserContext.getReaderContext().error("access attribute cannot be empty or null", urlElt);
continue;
}
String matcherRef = urlElt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_REQUEST_MATCHER_REF);

19
config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java

@ -343,8 +343,8 @@ public class InterceptUrlConfigTests { @@ -343,8 +343,8 @@ public class InterceptUrlConfigTests {
@Test
public void configWhenInterceptUrlMissingAccessThenException() {
assertThatExceptionOfType(BeanDefinitionParsingException.class)
.isThrownBy(() -> this.spring.configLocations(this.xml("MissingAccess")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
.isThrownBy(() -> this.spring.configLocations(this.xml("MissingAccess")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
}
/**
@ -353,8 +353,8 @@ public class InterceptUrlConfigTests { @@ -353,8 +353,8 @@ public class InterceptUrlConfigTests {
@Test
public void configWhenInterceptUrlEmptyAccessThenException() {
assertThatExceptionOfType(BeanDefinitionParsingException.class)
.isThrownBy(() -> this.spring.configLocations(this.xml("EmptyAccess")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
.isThrownBy(() -> this.spring.configLocations(this.xml("EmptyAccess")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
}
/**
@ -362,8 +362,7 @@ public class InterceptUrlConfigTests { @@ -362,8 +362,7 @@ public class InterceptUrlConfigTests {
*/
@Test
public void configWhenInterceptUrlValidAccessThenLoads() {
assertThatNoException()
.isThrownBy(() -> this.spring.configLocations(this.xml("ValidAccess")).autowire());
assertThatNoException().isThrownBy(() -> this.spring.configLocations(this.xml("ValidAccess")).autowire());
}
/**
@ -372,8 +371,8 @@ public class InterceptUrlConfigTests { @@ -372,8 +371,8 @@ public class InterceptUrlConfigTests {
@Test
public void configWhenUseAuthorizationManagerFalseAndMissingAccessThenException() {
assertThatExceptionOfType(BeanDefinitionParsingException.class)
.isThrownBy(() -> this.spring.configLocations(this.xml("MissingAccessLegacy")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
.isThrownBy(() -> this.spring.configLocations(this.xml("MissingAccessLegacy")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
}
/**
@ -382,8 +381,8 @@ public class InterceptUrlConfigTests { @@ -382,8 +381,8 @@ public class InterceptUrlConfigTests {
@Test
public void configWhenUseAuthorizationManagerFalseAndEmptyAccessThenException() {
assertThatExceptionOfType(BeanDefinitionParsingException.class)
.isThrownBy(() -> this.spring.configLocations(this.xml("EmptyAccessLegacy")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
.isThrownBy(() -> this.spring.configLocations(this.xml("EmptyAccessLegacy")).autowire())
.withMessageContaining("access attribute cannot be empty or null");
}
private static RequestPostProcessor adminCredentials() {

Loading…
Cancel
Save