Prepare release 1.6.1

romanpierson · Nov 10, 2023 · ac89085 · ac89085
1 parent 5af90fe
commit ac89085
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,4 +54,11 @@
 * Refactored and simplified PatternResolver and Element code using java functions
 * Raised test coverage
 * Allow easy overwriting of existing patterns with custom elements
+* Upgrade to latest versions
+
+### 1.6.1
+
+(2023-11-10)
+
+* Headers case insensitive
 * Upgrade to latest versions
diff --git a/build.gradle b/build.gradle
@@ -42,7 +42,7 @@ test {
 sourceCompatibility='1.8'
 targetCompatibility='1.8'
 
-jar.archiveFileName = "vertx-web-accesslog-1.6.0.jar"
+jar.archiveFileName = "vertx-web-accesslog-1.6.1.jar"
 
 java {
     withSourcesJar()
@@ -54,7 +54,7 @@ publishing {
 
             groupId 'com.mdac'
             artifactId 'vertx-web-accesslog'
-            version '1.6.0'
+            version '1.6.1'
 
             from components.java
 

diff --git a/...ava/com/romanpierson/vertx/web/accesslogger/configuration/element/impl/HeaderElement.java b/...ava/com/romanpierson/vertx/web/accesslogger/configuration/element/impl/HeaderElement.java
@@ -39,7 +39,7 @@ public static HeaderElement of(final Mode mode, final String identifier) {
 
 		HeaderElement element = new HeaderElement();
 		element.mode = mode;
-		element.identifier = identifier;
+		element.identifier = identifier.toLowerCase();
 
 		return element;
 	}

diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java
@@ -194,7 +194,7 @@ private void log(final RoutingContext context, long startTSmillis){
 	private JsonObject extractHeaders(final MultiMap headersMap){
 
 		JsonObject headers = new JsonObject();
-		headersMap.forEach(entry -> headers.put(entry.getKey(), entry.getValue()));
+		headersMap.forEach(entry -> headers.put(entry.getKey().toLowerCase(), entry.getValue()));
 
 		return headers;
 

diff --git a/src/test/java/com/romanpierson/vertx/web/accesslogger/element/ElementTest.java b/src/test/java/com/romanpierson/vertx/web/accesslogger/element/ElementTest.java
@@ -85,9 +85,7 @@ void testWithNonEmptyResponse(Vertx vertx, VertxTestContext testContext) {
 
 		vertx.eventBus().<JsonArray>consumer("target", message -> {
 
-			//System.out.println(message.body());
-
-			assertEquals(30, message.body().size());
+			assertEquals(32, message.body().size());
 
 			assertEquals("33", message.body().getString(0));
 			assertEquals("33", message.body().getString(1));
@@ -113,12 +111,14 @@ void testWithNonEmptyResponse(Vertx vertx, VertxTestContext testContext) {
 			assertEquals("xy", message.body().getString(21));
 			assertEquals("envVal1", message.body().getString(22));
 			assertEquals("header1val", message.body().getString(23));
-			assertEquals("", message.body().getString(24));
-			assertEquals("application/json; charset=utf-8", message.body().getString(25));
-			assertEquals("", message.body().getString(26));
-			assertEquals("cookie1Value", message.body().getString(27));
-			assertEquals("cookie2Value", message.body().getString(28));
-			assertEquals("", message.body().getString(29));
+			assertEquals("header1val", message.body().getString(24));
+			assertEquals("", message.body().getString(25));
+			assertEquals("application/json; charset=utf-8", message.body().getString(26));
+			assertEquals("application/json; charset=utf-8", message.body().getString(27));
+			assertEquals("", message.body().getString(28));
+			assertEquals("cookie1Value", message.body().getString(29));
+			assertEquals("cookie2Value", message.body().getString(30));
+			assertEquals("", message.body().getString(31));
 
 			testContext.completeNow();
 		});

diff --git a/src/test/resources/accesslog-config-elements-result.yaml b/src/test/resources/accesslog-config-elements-result.yaml
@@ -1,7 +1,7 @@
 isAutoDeployProducerVerticle: false
 configurations:
   - identifier: accesslog-formatted
-    logPattern: '%b %B %D %T sc-status %s %H %h %v %p cs-method %m %r cs-uri %U cs-uri-stem %q cs-uri-query %t %{msec}t %x %{xy}static %{envVar1}env %{header1}i %{header2}i %{Content-Type}o %{header3}o %{cookie1}C %{cookie2}C %{cookieFoo}C'
+    logPattern: '%b %B %D %T sc-status %s %H %h %v %p cs-method %m %r cs-uri %U cs-uri-stem %q cs-uri-query %t %{msec}t %x %{xy}static %{envVar1}env %{header1}i %{hEaDer1}i %{header2}i %{Content-Type}o %{conTent-type}o %{header3}o %{cookie1}C %{cookie2}C %{cookieFoo}C'
     appenders:
       - appenderClassName : com.romanpierson.vertx.web.accesslogger.appender.eventbus.impl.EventBusAppender
         config: