Added getSession for WebSockets

Author: JulianFun123

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,6 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
+name: Bug report about: Create a report to help us improve title: ''
+labels: bug assignees: ''
 
 ---
 
@@ -12,6 +9,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -21,11 +19,13 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Screenshots / Logs**
-If applicable, add screenshots and/or logs to help explain your problem. You can use pastefy.ga to upload large text snippets.
+If applicable, add screenshots and/or logs to help explain your problem. You can use pastefy.ga to upload large text
+snippets.
 
 **Environment Information:**
- - Java Language Level [e.g. 8]
- - Version [e.g. 1.0]
+
+- Java Language Level [e.g. 8]
+- Version [e.g. 1.0]
 
 **Additional Context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,6 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
+name: Feature request about: Suggest an idea for this project title: ''
+labels: enhancement assignees: ''
 
 ---
 

.github/workflows/maven-deploy.yml

@@ -1,5 +1,5 @@
 name: Maven Deploy
-on: [push]
+on: [ push ]
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,4 +15,4 @@ jobs:
         run: mvn deploy -s build/settings.xml
         env:
           DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
-          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
+          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}

README.md

@@ -12,7 +12,11 @@ JWS HTTP Routing Library
 ![Twitter Follow](https://img.shields.io/twitter/follow/JavaWebStack?style=social)
 
 ## Introduction
-This library provides a routing and request mapping stack on top of the well known and industry proven eclipse jetty http server. It also supports websockets.
+
+This library provides a routing and request mapping stack on top of the well known and industry proven eclipse jetty
+http server. It also supports websockets.
 
 ## Documentation
-You can find the current docs on our [website](https://docs.javawebstack.org/framework/httpserver). This is a work-in-progress project though so it's not yet complete.
+
+You can find the current docs on our [website](https://docs.javawebstack.org/framework/httpserver). This is a
+work-in-progress project though so it's not yet complete.

src/main/java/org/javawebstack/httpserver/Exchange.java

@@ -44,14 +44,14 @@ public Exchange(HTTPServer server, HttpServletRequest request, HttpServletRespon
     public <T> T body(Class<T> clazz) {
         if (body == null)
             body = read();
-        if(body == null)
+        if (body == null)
             body = new byte[0];
         if (clazz == byte[].class)
             return (T) body;
         String body = new String(this.body, StandardCharsets.UTF_8);
         if (clazz == String.class)
             return (T) body;
-        if(body.length() == 0)
+        if (body.length() == 0)
             body = "{}";
 
         String contentType = getContentType().toLowerCase();
@@ -244,7 +244,7 @@ public <T> T query(String name, Class<T> type) {
 
     public <T> T query(String name, Class<T> type, T defaultValue) {
         T t = new AbstractMapper().fromAbstract(queryParameters.get(name, AbstractNull.INSTANCE), type);
-        if(t == null)
+        if (t == null)
             return defaultValue;
         return t;
     }
@@ -303,4 +303,4 @@ public Exchange enableMultipart(String location, long maxFileSize) {
         request.setAttribute("org.eclipse.jetty.multipartConfig", new MultipartConfigElement(location, maxFileSize, -1L, 0));
         return this;
     }
-}
+}

src/main/java/org/javawebstack/httpserver/HTTPServer.java

@@ -1,8 +1,5 @@
 package org.javawebstack.httpserver;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -323,7 +320,7 @@ public void execute(Exchange exchange) {
                         } catch (Throwable ex) {
                             response = exceptionHandler.handle(exchange, ex);
                         }
-                        if(response != null)
+                        if (response != null)
                             break middlewares;
                     }
                 }

src/main/java/org/javawebstack/httpserver/router/DefaultRouteAutoInjector.java

@@ -12,7 +12,7 @@ public class DefaultRouteAutoInjector implements RouteAutoInjector {
     public Object getValue(Exchange exchange, Map<String, Object> extraArgs, Class<?> type) {
         if (Exchange.class.isAssignableFrom(type))
             return exchange;
-        if(WebSocket.class.isAssignableFrom(type) && extraArgs.containsKey("websocket"))
+        if (WebSocket.class.isAssignableFrom(type) && extraArgs.containsKey("websocket"))
             return extraArgs.get("websocket");
         if (type.equals(HttpMethod.class))
             return exchange.getMethod();

src/main/java/org/javawebstack/httpserver/router/RouteBinder.java

@@ -6,7 +6,8 @@
 import org.javawebstack.httpserver.handler.RequestHandler;
 import org.javawebstack.httpserver.handler.WebSocketHandler;
 import org.javawebstack.httpserver.helper.HttpMethod;
-import org.javawebstack.httpserver.router.annotation.*;
+import org.javawebstack.httpserver.router.annotation.PathPrefix;
+import org.javawebstack.httpserver.router.annotation.With;
 import org.javawebstack.httpserver.router.annotation.params.*;
 import org.javawebstack.httpserver.router.annotation.verbs.*;
 import org.javawebstack.httpserver.websocket.WebSocket;
@@ -86,7 +87,7 @@ public Bind(HttpMethod method, String path) {
             }
             for (WebSocketMessage a : getAnnotations(WebSocketMessage.class, method)) {
                 WebSocketBindHandler handler = websocketHandlers.get(a.name());
-                if(handler == null) {
+                if (handler == null) {
                     bindMiddlewares(HttpMethod.GET, globalPrefix, prefixes, a.value(), middlewares);
                     handler = new WebSocketBindHandler();
                     for (String prefix : prefixes)
@@ -97,7 +98,7 @@ public Bind(HttpMethod method, String path) {
             }
             for (WebSocketConnect a : getAnnotations(WebSocketConnect.class, method)) {
                 WebSocketBindHandler handler = websocketHandlers.get(a.name());
-                if(handler == null) {
+                if (handler == null) {
                     bindMiddlewares(HttpMethod.GET, globalPrefix, prefixes, a.value(), middlewares);
                     handler = new WebSocketBindHandler();
                     for (String prefix : prefixes)
@@ -108,7 +109,7 @@ public Bind(HttpMethod method, String path) {
             }
             for (WebSocketClose a : getAnnotations(WebSocketClose.class, method)) {
                 WebSocketBindHandler handler = websocketHandlers.get(a.name());
-                if(handler == null) {
+                if (handler == null) {
                     bindMiddlewares(HttpMethod.GET, globalPrefix, prefixes, a.value(), middlewares);
                     handler = new WebSocketBindHandler();
                     for (String prefix : prefixes)
@@ -201,11 +202,11 @@ public BindMapper(HTTPServer server, Object controller, Method method) {
             defaultValues = new String[parameterTypes.length];
             for (int i = 0; i < parameterAnnotations.length; i++) {
                 DefaultValue defaultValue = getAnnotation(DefaultValue.class, method, i);
-                if(defaultValue != null)
+                if (defaultValue != null)
                     defaultValues[i] = defaultValue.value();
-                for(Class<? extends Annotation> annotation : new Class[]{ Attrib.class, Query.class, Body.class, Path.class, WSMessage.class, WSCode.class, WSReason.class }) {
+                for (Class<? extends Annotation> annotation : new Class[]{Attrib.class, Query.class, Body.class, Path.class, WSMessage.class, WSCode.class, WSReason.class}) {
                     parameterAnnotations[i] = getAnnotation(annotation, method, i);
-                    if(parameterAnnotations[i] != null)
+                    if (parameterAnnotations[i] != null)
                         continue;
                 }
                 parameterAnnotations[i] = parameterTypes[i];
@@ -256,22 +257,25 @@ private static class WebSocketBindHandler implements WebSocketHandler {
         BindMapper messageHandler;
         BindMapper connectHandler;
         BindMapper closeHandler;
+
         public void onConnect(WebSocket socket) {
-            if(connectHandler != null)
-                connectHandler.invoke(socket.getExchange(), new HashMap<String, Object>(){{
+            if (connectHandler != null)
+                connectHandler.invoke(socket.getExchange(), new HashMap<String, Object>() {{
                     put("websocket", socket);
                 }});
         }
+
         public void onMessage(WebSocket socket, String message) {
-            if(messageHandler != null)
-                messageHandler.invoke(socket.getExchange(), new HashMap<String, Object>(){{
+            if (messageHandler != null)
+                messageHandler.invoke(socket.getExchange(), new HashMap<String, Object>() {{
                     put("websocket", socket);
                     put("websocketMessage", message);
                 }});
         }
+
         public void onClose(WebSocket socket, int code, String reason) {
-            if(closeHandler != null)
-                closeHandler.invoke(socket.getExchange(), new HashMap<String, Object>(){{
+            if (closeHandler != null)
+                closeHandler.invoke(socket.getExchange(), new HashMap<String, Object>() {{
                     put("websocket", socket);
                     put("websocketCode", code);
                     put("websocketReason", reason);
@@ -281,9 +285,11 @@ public void onClose(WebSocket socket, int code, String reason) {
 
     private static class BindHandler implements RequestHandler {
         private final BindMapper handler;
+
         public BindHandler(HTTPServer server, Object controller, Method method) {
             handler = new BindMapper(server, controller, method);
         }
+
         public Object handle(Exchange exchange) {
             return handler.invoke(exchange, new HashMap<>());
         }

src/main/java/org/javawebstack/httpserver/router/annotation/verbs/WebSocketClose.java

@@ -7,6 +7,7 @@
 @Repeatable(WebSocketClose.Multiple.class)
 public @interface WebSocketClose {
     String value() default "/";
+
     String name() default "";
 
     @Retention(RetentionPolicy.RUNTIME)

src/main/java/org/javawebstack/httpserver/router/annotation/verbs/WebSocketConnect.java

@@ -7,6 +7,7 @@
 @Repeatable(WebSocketConnect.Multiple.class)
 public @interface WebSocketConnect {
     String value() default "/";
+
     String name() default "";
 
     @Retention(RetentionPolicy.RUNTIME)