From 7255c905aa002e17edae7c0b989c5233748f1cff Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Sun, 4 Jun 2017 14:03:36 +0300
Subject: [PATCH] fixed unmodifiableColletion(null) bug

---
 gradle/jsonModelsGeneration.gradle | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/gradle/jsonModelsGeneration.gradle b/gradle/jsonModelsGeneration.gradle
index dadf9f1..1332dba 100644
--- a/gradle/jsonModelsGeneration.gradle
+++ b/gradle/jsonModelsGeneration.gradle
@@ -585,9 +585,17 @@ class FieldInfo {
         }
 
         if (type == FieldType.LIST) {
-            builder.addStatement("return \$T.unmodifiableList(\$L)", Types.COLLECTIONS, name)
+            if (couldContainsNull()) {
+                builder.addStatement("return \$L != null ? \$T.unmodifiableList(\$L) : null", name, Types.COLLECTIONS, name)
+            } else {
+                builder.addStatement("return \$T.unmodifiableList(\$L)", Types.COLLECTIONS, name)
+            }
         } else if (type == FieldType.MAP) {
-            builder.addStatement("return \$T.unmodifiableMap(\$L)", Types.COLLECTIONS, name)
+            if (couldContainsNull()) {
+                builder.addStatement("return \$L != null ? \\$T.unmodifiableMap(\\$L) : null", name, Types.COLLECTIONS, name)
+            } else {
+                builder.addStatement("return \$T.unmodifiableMap(\$L)", name, Types.COLLECTIONS, name)
+            }
         } else {
             builder.addStatement("return \$L", name)
         }
@@ -606,9 +614,17 @@ class FieldInfo {
                 .addParameter(parameterBuilder.build())
 
         if (type == FieldType.LIST) {
-            builder.addStatement("this.\$L = new \$T<>(\$L)", name, Types.ARRAY_LIST, name)
+            if (couldContainsNull()) {
+                builder.addStatement("this.\$L = \$L !=null ? new \$T<>(\$L) : null", name, name, Types.ARRAY_LIST, name)
+            } else {
+                builder.addStatement("this.\$L = new \$T<>(\$L)", name, Types.ARRAY_LIST, name)
+            }
         } else if (type == FieldType.MAP) {
-            builder.addStatement("this.\$L = new \$T<>(\$L)", name, Types.HASH_MAP, name)
+            if (couldContainsNull()) {
+                builder.addStatement("this.\$L = \$L !=null ? new \$T<>(\$L) : null", name, name, Types.HASH_MAP, name)
+            } else {
+                builder.addStatement("this.\$L = new \$T<>(\$L)", name, name, Types.HASH_MAP, name)
+            }
         } else {
             builder.addStatement("this.\$L = \$L", name, name)
         }