Fixed TestHTTPSocket headers and incremented dependency versions

Author: JanHolger

pom.xml

@@ -60,24 +60,17 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>5.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-            <version>2.2.19.Final</version>
+            <version>2.3.8.Final</version>
         </dependency>
-        <!--- Temporary fix for transitive vulnerabilities -->
-        <dependency>
-            <groupId>org.jboss.xnio</groupId>
-            <artifactId>xnio-api</artifactId>
-            <version>3.8.8.Final</version>
-        </dependency>
-        <!--- ============================================ -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/org/javawebstack/httpserver/adapter/IHTTPSocket.java

@@ -43,7 +43,12 @@ default IHTTPSocket setResponseStatus(int status) {
 
     Set<String> getRequestHeaderNames();
 
-    String getRequestHeader(String name);
+    default String getRequestHeader(String name) {
+        List<String> headers = getRequestHeaders(name);
+        if(headers == null || headers.size() == 0)
+            return null;
+        return headers.get(0);
+    }
 
     List<String> getRequestHeaders(String name);
 

src/main/java/org/javawebstack/httpserver/test/TestHTTPSocket.java

@@ -19,22 +19,33 @@ public class TestHTTPSocket implements IHTTPSocket {
     private final Map<String, List<String>> requestHeaders = new HashMap<>();
     private final Map<String, List<String>> responseHeaders = new HashMap<>();
 
-    public Map<String, List<String>> getRequestHeaders() {
-        return requestHeaders;
-    }
-
-    public Map<String, List<String>> getResponseHeaders() {
-        return responseHeaders;
+    public TestHTTPSocket(HTTPMethod method, String url) {
+        this(method, url, null);
     }
 
-    public TestHTTPSocket(HTTPMethod method, String url) {
+    public TestHTTPSocket(HTTPMethod method, String url, Map<String, String> headers) {
         this.requestMethod = method;
         String[] pathSplit = url.split("\\?", 2);
         requestPath = pathSplit[0];
         if(pathSplit.length == 2)
             requestQuery = pathSplit[1];
         else
             requestQuery = null;
+        if(headers != null) {
+            headers.entrySet().forEach(e -> {
+                List<String> list = new ArrayList<>();
+                list.add(e.getValue());
+                this.requestHeaders.put(e.getKey(), list);
+            });
+        }
+    }
+
+    public Map<String, List<String>> getRequestHeaders() {
+        return requestHeaders;
+    }
+
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
     }
 
     public TestHTTPSocket setInputStream(InputStream inputStream) {
@@ -91,15 +102,11 @@ public String getRequestVersion() {
     }
 
     public Set<String> getRequestHeaderNames() {
-        return Collections.emptySet();
-    }
-
-    public String getRequestHeader(String name) {
-        return null;
+        return requestHeaders.keySet();
     }
 
     public List<String> getRequestHeaders(String name) {
-        return null;
+        return requestHeaders.get(name);
     }
 
     public int getResponseStatus() {
@@ -115,7 +122,7 @@ public void writeHeaders() throws IOException {
     }
 
     public String getRemoteAddress() {
-        return null;
+        return "127.0.0.1";
     }
 
 }