Merge pull request #15694 from geoand/websockets-tiny-polish

Apply tiny polish to web socket classes
quarkusio · Mar 13, 2021 · f5ca1e4 · f5ca1e4
2 parents 48e9461 + dc2b86e
commit f5ca1e4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...eployment/UndertowWebsocketProcessor.java → ...ockets/deployment/WebsocketProcessor.java b/...eployment/UndertowWebsocketProcessor.java → ...ockets/deployment/WebsocketProcessor.java
@@ -37,12 +37,12 @@
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.netty.deployment.EventLoopSupplierBuildItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
-import io.quarkus.undertow.websockets.runtime.UndertowWebsocketRecorder;
+import io.quarkus.undertow.websockets.runtime.WebsocketRecorder;
 import io.quarkus.vertx.http.deployment.FilterBuildItem;
 import io.undertow.websockets.DefaultContainerConfigurator;
 import io.undertow.websockets.UndertowContainerProvider;
 
-public class UndertowWebsocketProcessor {
+public class WebsocketProcessor {
 
     private static final DotName SERVER_ENDPOINT = DotName.createSimple(ServerEndpoint.class.getName());
     private static final DotName CLIENT_ENDPOINT = DotName.createSimple(ClientEndpoint.class.getName());
@@ -91,7 +91,7 @@ void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem,
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     public FilterBuildItem deploy(final CombinedIndexBuildItem indexBuildItem,
-            UndertowWebsocketRecorder recorder,
+            WebsocketRecorder recorder,
             BuildProducer<ReflectiveClassBuildItem> reflection,
             EventLoopSupplierBuildItem eventLoopSupplierBuildItem,
             List<AnnotatedWebsocketEndpointBuildItem> annotatedEndpoints,
@@ -165,7 +165,7 @@ private void registerForReflection(BuildProducer<ReflectiveClassBuildItem> refle
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    ServiceStartBuildItem setupWorker(UndertowWebsocketRecorder recorder, ExecutorBuildItem exec) {
+    ServiceStartBuildItem setupWorker(WebsocketRecorder recorder, ExecutorBuildItem exec) {
         recorder.setupWorker(exec.getExecutorProxy());
         return new ServiceStartBuildItem("Websockets");
     }

diff --git a/...ts/runtime/UndertowWebsocketRecorder.java → ...websockets/runtime/WebsocketRecorder.java b/...ts/runtime/UndertowWebsocketRecorder.java → ...websockets/runtime/WebsocketRecorder.java
@@ -30,9 +30,9 @@
 import io.vertx.ext.web.RoutingContext;
 
 @Recorder
-public class UndertowWebsocketRecorder {
+public class WebsocketRecorder {
 
-    private static final Logger log = Logger.getLogger(UndertowWebsocketRecorder.class);
+    private static final Logger log = Logger.getLogger(WebsocketRecorder.class);
 
     public void setupWorker(Executor executor) {
         ExecutorSupplier.executor = executor;
@@ -62,7 +62,7 @@ public WebSocketDeploymentInfo createDeploymentInfo(Set<String> annotatedEndpoin
                 log.error("Could not initialize websocket class " + i, e);
             }
         }
-        Set<Class<?>> newAnnotatatedEndpoints = new HashSet<>();
+        Set<Class<?>> newAnnotatedEndpoints = new HashSet<>();
         Set<ServerEndpointConfig> serverEndpointConfigurations = new HashSet<>();
 
         final Set<ServerApplicationConfig> configInstances = new HashSet<>();
@@ -79,19 +79,19 @@ public WebSocketDeploymentInfo createDeploymentInfo(Set<String> annotatedEndpoin
             for (ServerApplicationConfig config : configInstances) {
                 Set<Class<?>> returnedEndpoints = config.getAnnotatedEndpointClasses(allScannedAnnotatedEndpoints);
                 if (returnedEndpoints != null) {
-                    newAnnotatatedEndpoints.addAll(returnedEndpoints);
+                    newAnnotatedEndpoints.addAll(returnedEndpoints);
                 }
                 Set<ServerEndpointConfig> endpointConfigs = config.getEndpointConfigs(allScannedEndpointImplementations);
                 if (endpointConfigs != null) {
                     serverEndpointConfigurations.addAll(endpointConfigs);
                 }
             }
         } else {
-            newAnnotatatedEndpoints.addAll(allScannedAnnotatedEndpoints);
+            newAnnotatedEndpoints.addAll(allScannedAnnotatedEndpoints);
         }
 
         //annotated endpoints first
-        for (Class<?> endpoint : newAnnotatatedEndpoints) {
+        for (Class<?> endpoint : newAnnotatedEndpoints) {
             if (endpoint != null) {
                 container.addEndpoint(endpoint);
             }