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..cceb06b 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; @@ -62,17 +64,41 @@ public abstract class JsonResponseBodyConverter implements Converter