From 06acc22f11e5baf659ab8b40c948d5efcf827c2e Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Thu, 13 Jul 2017 17:01:26 +0300
Subject: [PATCH 1/2] validation for collection responses

---
 .../java/ru/touchin/templates/ApiModel.java   |  4 ++--
 .../retrofit/JsonResponseBodyConverter.java   | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/templates/ApiModel.java b/src/main/java/ru/touchin/templates/ApiModel.java
index e319d9b..5755445 100644
--- a/src/main/java/ru/touchin/templates/ApiModel.java
+++ b/src/main/java/ru/touchin/templates/ApiModel.java
@@ -52,7 +52,7 @@ public abstract class ApiModel implements Serializable {
      */
     @SuppressWarnings({"PMD.PreserveStackTrace", "PMD.CyclomaticComplexity"})
     // PreserveStackTrace: it's ok - we are logging it on Lc.e()
-    protected static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule)
+    public static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule)
             throws ValidationException {
         boolean haveValidItem = false;
         int position = 0;
@@ -117,7 +117,7 @@ public abstract class ApiModel implements Serializable {
         //do nothing
     }
 
-    protected enum CollectionValidationRule {
+    public enum CollectionValidationRule {
         EXCEPTION_IF_ANY_INVALID,
         EXCEPTION_IF_ALL_INVALID,
         REMOVE_INVALID_ITEMS,
diff --git a/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java b/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
index f82f2d0..e181bff 100644
--- a/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
+++ b/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
@@ -24,6 +24,8 @@ import android.support.annotation.NonNull;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
+import java.util.Collection;
+import java.util.Map;
 
 import javax.net.ssl.SSLException;
 
@@ -69,10 +71,31 @@ public abstract class JsonResponseBodyConverter<T> implements Converter<Response
                 throw validationException;
             }
         }
+        if (result instanceof Collection) {
+            try {
+                ApiModel.validateCollection((Collection) result, getValidateCollectionRule());
+            } catch (final ApiModel.ValidationException validationException) {
+                Lc.assertion(validationException);
+                throw validationException;
+            }
+        }
+        if (result instanceof Map) {
+            try {
+                ApiModel.validateCollection(((Map) result).values(), getValidateCollectionRule());
+            } catch (final ApiModel.ValidationException validationException) {
+                Lc.assertion(validationException);
+                throw validationException;
+            }
+        }
 
         return result;
     }
 
+    @NonNull
+    protected ApiModel.CollectionValidationRule getValidateCollectionRule() {
+        return ApiModel.CollectionValidationRule.EXCEPTION_IF_ANY_INVALID;
+    }
+
     /**
      * Parses response to specific object.
      *

From a0c2e758cb88c9bc0691723a4fec9d97e1d81489 Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Thu, 13 Jul 2017 17:19:01 +0300
Subject: [PATCH 2/2] fix static

---
 .../retrofit/JsonResponseBodyConverter.java   | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java b/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
index e181bff..cceb06b 100644
--- a/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
+++ b/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
@@ -64,33 +64,36 @@ public abstract class JsonResponseBodyConverter<T> implements Converter<Response
         }
 
         if (result instanceof ApiModel) {
-            try {
-                ((ApiModel) result).validate();
-            } catch (final ApiModel.ValidationException validationException) {
-                Lc.assertion(validationException);
-                throw validationException;
-            }
+            validateModel((ApiModel) result);
         }
         if (result instanceof Collection) {
-            try {
-                ApiModel.validateCollection((Collection) result, getValidateCollectionRule());
-            } catch (final ApiModel.ValidationException validationException) {
-                Lc.assertion(validationException);
-                throw validationException;
-            }
+            validateCollection((Collection) result);
         }
         if (result instanceof Map) {
-            try {
-                ApiModel.validateCollection(((Map) result).values(), getValidateCollectionRule());
-            } catch (final ApiModel.ValidationException validationException) {
-                Lc.assertion(validationException);
-                throw validationException;
-            }
+            validateCollection(((Map)result).values());
         }
 
         return result;
     }
 
+    private void validateModel(@NonNull final ApiModel result) throws IOException {
+        try {
+            result.validate();
+        } catch (final ApiModel.ValidationException validationException) {
+            Lc.assertion(validationException);
+            throw validationException;
+        }
+    }
+
+    private void validateCollection(@NonNull final Collection result) throws IOException {
+        try {
+            ApiModel.validateCollection(result, getValidateCollectionRule());
+        } catch (final ApiModel.ValidationException validationException) {
+            Lc.assertion(validationException);
+            throw validationException;
+        }
+    }
+
     @NonNull
     protected ApiModel.CollectionValidationRule getValidateCollectionRule() {
         return ApiModel.CollectionValidationRule.EXCEPTION_IF_ANY_INVALID;