upgrade to 1.4.5 and update changelog

networknt · Sep 22, 2017 · 5063636 · 5063636
1 parent f45b4a6
commit 5063636
Show file tree

Hide file tree

Showing 31 changed files with 76 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.4.5 - 2017-09-22
+### Added
+
+### Changed
+- fixes #102 Return invalid json error in body handler for malformed body
+
 ## 1.4.4 - 2017-09-20
 ### Added
 

diff --git a/audit/pom.xml b/audit/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/balance/pom.xml b/balance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/body/pom.xml b/body/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/body/src/test/java/com/networknt/body/BodyHandlerTest.java b/body/src/test/java/com/networknt/body/BodyHandlerTest.java
@@ -172,6 +172,47 @@ public void run() {
         }
     }
 
+    @Test
+    public void testPostInvalidJson() throws Exception {
+        final AtomicReference<ClientResponse> reference = new AtomicReference<>();
+        final Http2Client client = Http2Client.getInstance();
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ClientConnection connection;
+        try {
+            connection = client.connect(new URI("http://localhost:8080"), Http2Client.WORKER, Http2Client.SSL, Http2Client.POOL, OptionMap.EMPTY).get();
+        } catch (Exception e) {
+            throw new ClientException(e);
+        }
+
+        try {
+            String post = "{post";
+            connection.getIoThread().execute(new Runnable() {
+                @Override
+                public void run() {
+                    final ClientRequest request = new ClientRequest().setMethod(Methods.POST).setPath("/post");
+                    request.getRequestHeaders().put(Headers.HOST, "localhost");
+                    request.getRequestHeaders().put(Headers.CONTENT_TYPE, "application/json");
+                    request.getRequestHeaders().put(Headers.TRANSFER_ENCODING, "chunked");
+                    connection.sendRequest(request, client.createClientCallback(reference, latch, post));
+                }
+            });
+            latch.await(10, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            logger.error("IOException: ", e);
+            throw new ClientException(e);
+        } finally {
+            IoUtils.safeClose(connection);
+        }
+        int statusCode = reference.get().getResponseCode();
+        // as content type and body is mismatched, the body will be ignored.
+        Assert.assertEquals(400, statusCode);
+        if(statusCode == 400) {
+            Status status = Config.getInstance().getMapper().readValue(reference.get().getAttachment(Http2Client.RESPONSE_BODY), Status.class);
+            Assert.assertNotNull(status);
+            Assert.assertEquals("ERR10015", status.getCode());
+        }
+    }
+
     @Test
     public void testPostJsonList() throws Exception {
         final AtomicReference<ClientResponse> reference = new AtomicReference<>();

diff --git a/client/pom.xml b/client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cluster/pom.xml b/cluster/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/config/pom.xml b/config/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/consul/pom.xml b/consul/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/correlation/pom.xml b/correlation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cors/pom.xml b/cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/docs/config.toml b/docs/config.toml
@@ -17,7 +17,7 @@ googleAnalytics = ""
 	provider = "GitHub"
 	repo_url = "https://github.com/networknt/light-4j"
 
-	version = "1.4.4"
+	version = "1.4.5"
 	logo = "images/logo.png"
 	favicon = ""
 

diff --git a/dump/pom.xml b/dump/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/exception/pom.xml b/exception/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/handler/pom.xml b/handler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/health/pom.xml b/health/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/info/pom.xml b/info/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/limit/pom.xml b/limit/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/mask/pom.xml b/mask/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>light-4j</artifactId>
-    <version>1.4.4</version>
+    <version>1.4.5</version>
     <packaging>pom</packaging>
     <name>Parent POM</name>
     <description>Light 4J Framework Components</description>

diff --git a/registry/pom.xml b/registry/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sanitizer/pom.xml b/sanitizer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/security/pom.xml b/security/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/server/pom.xml b/server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/service/pom.xml b/service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/status/pom.xml b/status/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/switcher/pom.xml b/switcher/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/traceability/pom.xml b/traceability/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/utility/pom.xml b/utility/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/zookeeper/pom.xml b/zookeeper/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-4j</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
         <relativePath>..</relativePath>
     </parent>