version 1.2.5

youngmonkeys · Dec 25, 2023 · d416b37 · d416b37
1 parent 0d425c0
commit d416b37
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 12 deletions.
diff --git a/ezyhttp-client/pom.xml b/ezyhttp-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-client</artifactId>

diff --git a/ezyhttp-core/pom.xml b/ezyhttp-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-core</artifactId>

diff --git a/ezyhttp-server-boot/pom.xml b/ezyhttp-server-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-server-boot</artifactId>

diff --git a/ezyhttp-server-core/pom.xml b/ezyhttp-server-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-server-core</artifactId>

diff --git a/ezyhttp-server-core/src/main/java/com/tvd12/ezyhttp/server/core/view/View.java b/ezyhttp-server-core/src/main/java/com/tvd12/ezyhttp/server/core/view/View.java
@@ -63,7 +63,9 @@ public void setVariableIfAbsent(
     }
 
     public void setVariables(Map<String, Object> variables) {
-        this.variables.putAll(variables);
+        if (variables != null) {
+            this.variables.putAll(variables);
+        }
     }
 
     @SuppressWarnings("unchecked")
@@ -167,7 +169,9 @@ public Builder addVariable(String name, Object value) {
         }
 
         public Builder addVariables(Map<String, Object> variables) {
-            this.variables.putAll(variables);
+            if (variables != null) {
+                this.variables.putAll(variables);
+            }
             return this;
         }
 

diff --git a/ezyhttp-server-core/src/test/java/com/tvd12/ezyhttp/server/core/test/view/ViewTest.java b/ezyhttp-server-core/src/test/java/com/tvd12/ezyhttp/server/core/test/view/ViewTest.java
@@ -36,6 +36,7 @@ public void test() {
             .appendValueToVariable("list", "b")
             .appendValuesToVariable("list", new String[] {"c", "d"})
             .appendValuesToVariable("list", Arrays.asList("e", "f"))
+            .addVariables(null)
             .build();
 
         // when
@@ -45,6 +46,7 @@ public void test() {
         sut.appendValueToVariable("list", "h");
         sut.appendValuesToVariable("list", new String[] {"i", "j"});
         sut.appendValuesToVariable("list", Arrays.asList("k", "l"));
+        sut.setVariables(null);
 
         // then
         Asserts.assertEquals("index.html", sut.getTemplate());

diff --git a/ezyhttp-server-graphql/pom.xml b/ezyhttp-server-graphql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
     <artifactId>ezyhttp-server-graphql</artifactId>
 

diff --git a/ezyhttp-server-jetty/pom.xml b/ezyhttp-server-jetty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-server-jetty</artifactId>

diff --git a/ezyhttp-server-management/pom.xml b/ezyhttp-server-management/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
     <artifactId>ezyhttp-server-management</artifactId>
     <name>ezyhttp-server-management</name>

diff --git a/ezyhttp-server-thymeleaf/pom.xml b/ezyhttp-server-thymeleaf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
     <artifactId>ezyhttp-server-thymeleaf</artifactId>
 

diff --git a/ezyhttp-server-tomcat/pom.xml b/ezyhttp-server-tomcat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.tvd12</groupId>
         <artifactId>ezyhttp</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5</version>
     </parent>
 
     <artifactId>ezyhttp-server-tomcat</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0.6</version>
     </parent>
     <artifactId>ezyhttp</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <packaging>pom</packaging>
 
     <name>ezyhttp</name>