From 052542254a6d500805a11c03f7fb403e8ac8205f Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 28 Nov 2022 17:51:18 +0100 Subject: [PATCH] Polishing --- .../socket/AbstractWebSocketIntegrationTests.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index 66d565b9a0c..0f3e8b876b9 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -20,7 +20,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; @@ -56,13 +55,10 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; */ public abstract class AbstractWebSocketIntegrationTests { - private static Map, Class> upgradeStrategyConfigTypes = new HashMap<>(); - - static { - upgradeStrategyConfigTypes.put(JettyWebSocketTestServer.class, JettyUpgradeStrategyConfig.class); - upgradeStrategyConfigTypes.put(TomcatWebSocketTestServer.class, TomcatUpgradeStrategyConfig.class); - upgradeStrategyConfigTypes.put(UndertowTestServer.class, UndertowUpgradeStrategyConfig.class); - } + private static Map, Class> upgradeStrategyConfigTypes = Map.of( + JettyWebSocketTestServer.class, JettyUpgradeStrategyConfig.class, // + TomcatWebSocketTestServer.class, TomcatUpgradeStrategyConfig.class, // + UndertowTestServer.class, UndertowUpgradeStrategyConfig.class); @SuppressWarnings("removal") static Stream argumentsFactory() {