Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-10-23 10:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply Diamond Operator

Browse Source 
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
This commit is contained in:
Tran Ngoc Nhan 2025-06-19 04:24:28 +07:00 committed by Josh Cummings
parent bd98db4fe8
commit d6e378e9bb
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcBackChannelLogoutHandler.java
View File

@ -117,7 +117,7 @@ public final class OidcBackChannelLogoutHandler implements LogoutHandler {
} }
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
String logout = computeLogoutEndpoint(request, token); String logout = computeLogoutEndpoint(request, token);
MultiValueMap<String, String> body = new LinkedMultiValueMap(); MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
body.add("logout_token", token.getPrincipal().getTokenValue()); body.add("logout_token", token.getPrincipal().getTokenValue());
body.add("_spring_security_internal_logout", "true"); body.add("_spring_security_internal_logout", "true");
HttpEntity<?> entity = new HttpEntity<>(body, headers); HttpEntity<?> entity = new HttpEntity<>(body, headers);

2
config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java
View File

@ -64,7 +64,7 @@ public class FilterChainMapBeanDefinitionDecorator implements BeanDefinitionDeco
} }
BeanDefinition matcher = matcherType.createMatcher(parserContext, path, null); BeanDefinition matcher = matcherType.createMatcher(parserContext, path, null);
if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) { if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {
securityFilterChains.add(createSecurityFilterChain(matcher, new ManagedList(0))); securityFilterChains.add(createSecurityFilterChain(matcher, new ManagedList<>(0)));
} }
else { else {
String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ","); String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ",");

2
config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
View File

@ -370,7 +370,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
// Not already registered, so register the list of filter chains and the // Not already registered, so register the list of filter chains and the
// FilterChainProxy // FilterChainProxy
BeanDefinition listFactoryBean = new RootBeanDefinition(ListFactoryBean.class); BeanDefinition listFactoryBean = new RootBeanDefinition(ListFactoryBean.class);
listFactoryBean.getPropertyValues().add("sourceList", new ManagedList()); listFactoryBean.getPropertyValues().add("sourceList", new ManagedList<>());
pc.registerBeanComponent(new BeanComponentDefinition(listFactoryBean, BeanIds.FILTER_CHAINS)); pc.registerBeanComponent(new BeanComponentDefinition(listFactoryBean, BeanIds.FILTER_CHAINS));
BeanDefinitionBuilder fcpBldr = BeanDefinitionBuilder.rootBeanDefinition(FilterChainProxy.class); BeanDefinitionBuilder fcpBldr = BeanDefinitionBuilder.rootBeanDefinition(FilterChainProxy.class);
fcpBldr.getRawBeanDefinition().setSource(source); fcpBldr.getRawBeanDefinition().setSource(source);

2
config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
View File

@ -354,7 +354,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
if (!registry.containsBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID)) { if (!registry.containsBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID)) {
return; return;
} }
ManagedList<Object> interceptors = new ManagedList(); ManagedList<Object> interceptors = new ManagedList<>();
interceptors.add(new RootBeanDefinition(SecurityContextChannelInterceptor.class)); interceptors.add(new RootBeanDefinition(SecurityContextChannelInterceptor.class));
if (!this.sameOriginDisabled) { if (!this.sameOriginDisabled) {
if (!registry.containsBeanDefinition(CSRF_CHANNEL_INTERCEPTOR_BEAN_ID)) { if (!registry.containsBeanDefinition(CSRF_CHANNEL_INTERCEPTOR_BEAN_ID)) {

4
config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
View File

@ -91,8 +91,8 @@ class SpringSecurityCoreVersionSerializableTests {
Object deserialized = objectInputStream.readObject(); Object deserialized = objectInputStream.readObject();
// Ignore transient fields Event classes extend from EventObject which has // Ignore transient fields Event classes extend from EventObject which has
// transient source property // transient source property
Set<String> transientFieldNames = new HashSet(); Set<String> transientFieldNames = new HashSet<>();
Set<Class<?>> visitedClasses = new HashSet(); Set<Class<?>> visitedClasses = new HashSet<>();
collectTransientFieldNames(transientFieldNames, visitedClasses, clazz); collectTransientFieldNames(transientFieldNames, visitedClasses, clazz);
assertThat(deserialized).usingRecursiveComparison() assertThat(deserialized).usingRecursiveComparison()
.ignoringFields(transientFieldNames.toArray(new String[0])) .ignoringFields(transientFieldNames.toArray(new String[0]))

2
config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java
View File

@ -152,7 +152,7 @@ public class HttpHeadersConfigTests {
@Test @Test
public void requestWhenFrameOptionsConfiguredThenIncludesHeader() throws Exception { public void requestWhenFrameOptionsConfiguredThenIncludesHeader() throws Exception {
Map<String, String> headers = new HashMap(defaultHeaders); Map<String, String> headers = new HashMap<>(defaultHeaders);
headers.put("X-Frame-Options", "SAMEORIGIN"); headers.put("X-Frame-Options", "SAMEORIGIN");
this.spring.configLocations(this.xml("WithFrameOptions")).autowire(); this.spring.configLocations(this.xml("WithFrameOptions")).autowire();
// @formatter:off // @formatter:off