Merge pull request #33251 from vpavic

* gh-33251: Polish "Polish SecurityProperties" Polish SecurityProperties Closes gh-33251
spring-projects · Nov 18, 2022 · 22b054d · 22b054d
2 parents 3c1c91b + 9817192
commit 22b054d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -17,8 +17,7 @@
 package org.springframework.boot.autoconfigure.security;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -83,8 +82,7 @@ public static class Filter {
 		/**
 		 * Security filter chain dispatcher types.
 		 */
-		private Set<DispatcherType> dispatcherTypes = new HashSet<>(Arrays.asList(DispatcherType.ASYNC,
-				DispatcherType.ERROR, DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE));
+		private Set<DispatcherType> dispatcherTypes = EnumSet.allOf(DispatcherType.class);
 
 		public int getOrder() {
 			return this.order;

diff --git a/...g/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java b/...g/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
@@ -17,6 +17,7 @@
 package org.springframework.boot.autoconfigure.security.servlet;
 
 import java.security.interfaces.RSAPublicKey;
+import java.util.EnumSet;
 
 import jakarta.servlet.DispatcherType;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -161,8 +162,7 @@ void defaultFilterDispatcherTypes() {
 							DelegatingFilterProxyRegistrationBean.class);
 					assertThat(bean)
 							.extracting("dispatcherTypes", InstanceOfAssertFactories.iterable(DispatcherType.class))
-							.containsOnly(DispatcherType.ASYNC, DispatcherType.ERROR, DispatcherType.REQUEST,
-									DispatcherType.INCLUDE, DispatcherType.FORWARD);
+							.containsExactlyInAnyOrderElementsOf(EnumSet.allOf(DispatcherType.class));
 				});
 	}