Merge pull request #2358 from froque/2357_case_insensitive_headers

Fixes case insensitive headers

Author: jknack

jooby/src/main/java/io/jooby/Value.java

@@ -12,6 +12,7 @@
 import io.jooby.internal.MissingValue;
 import io.jooby.internal.SingleValue;
 
+import java.util.TreeMap;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.time.Instant;
@@ -519,4 +520,17 @@ default boolean isObject() {
     node.put(values);
     return node;
   }
+
+  /**
+   * Create a hash/object value using the map values.
+   *
+   * @param ctx Current context.
+   * @param values Map values.
+   * @return A hash/object value.
+   */
+  static @Nonnull ValueNode headers(Context ctx, @Nonnull Map<String, Collection<String>> values) {
+    HashValue node = new HashValue(ctx, null, () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+    node.put(values);
+    return node;
+  }
 }

jooby/src/main/java/io/jooby/internal/HashValue.java

@@ -10,6 +10,7 @@
 import io.jooby.Formdata;
 import io.jooby.ValueNode;
 
+import java.util.function.Supplier;
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,6 +35,12 @@ public class HashValue implements ValueNode, Formdata {
 
   private final String name;
 
+  public HashValue(Context ctx, String name, Supplier<Map<String, ValueNode>> mapSupplier) {
+    this.ctx = ctx;
+    this.name = name;
+    this.hash = mapSupplier.get();
+  }
+
   public HashValue(Context ctx, String name) {
     this.ctx = ctx;
     this.name = name;

modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java

@@ -54,7 +54,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
@@ -240,7 +239,7 @@ public JettyContext(Request request, Router router, int bufferSize, long maxRequ
         String name = names.nextElement();
         headerMap.put(name, Collections.list(request.getHeaders(name)));
       }
-      headers = Value.hash(this, headerMap);
+      headers = Value.headers(this, headerMap);
     }
     return headers;
   }

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java

@@ -39,7 +39,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
@@ -314,7 +313,7 @@ boolean isHttpGet() {
       for (String name : names) {
         headerMap.put(name, headers.getAll(name));
       }
-      this.headers = Value.hash(this, headerMap);
+      this.headers = Value.headers(this, headerMap);
     }
     return headers;
   }

modules/jooby-test/src/main/java/io/jooby/MockContext.java

@@ -248,7 +248,7 @@ public MockContext setFlashMap(@Nonnull FlashMap flashMap) {
   }
 
   @Nonnull @Override public ValueNode header() {
-    return Value.hash(this, headers);
+    return Value.headers(this, headers);
   }
 
   /**

modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java

@@ -238,7 +238,7 @@ boolean isHttpGet() {
         HeaderValues values = map.get(name);
         headerMap.put(name.toString(), values);
       }
-      headers = Value.hash(this, headerMap);
+      headers = Value.headers(this, headerMap);
     }
     return headers;
   }

tests/src/test/java/io/jooby/Issue2357.java

@@ -0,0 +1,23 @@
+package io.jooby;
+
+import io.jooby.junit.ServerTest;
+import io.jooby.junit.ServerTestRunner;
+import org.junit.jupiter.api.Assertions;
+
+class Issue2357 {
+
+  @ServerTest
+  public void headersShouldBeCaseInsensitive(ServerTestRunner runner) {
+    runner.define(app -> app.get("/", ctx -> {
+      Assertions.assertEquals("value1", ctx.header().get("x-header1").value());
+      Assertions.assertEquals("value1", ctx.header().get("X-HEADER1").value());
+      Assertions.assertEquals("value1", ctx.header().get("X-hEaDeR1").value());
+      Assertions.assertEquals("value1", ctx.header("x-header1").value());
+      Assertions.assertEquals("value1", ctx.header("X-HEADER1").value());
+      Assertions.assertEquals("value1", ctx.header("X-hEaDeR1").value());
+      return "OK";
+    })).ready(http -> http.header("x-header1", "value1").get("/", rsp -> {
+      Assertions.assertEquals(200, rsp.code());
+    }));
+  }
+}