From 5181c2b0efa5fdf7cdd7589a0605393217fa5e98 Mon Sep 17 00:00:00 2001 From: Denis Karmyshakov Date: Fri, 21 Sep 2018 10:37:05 +0300 Subject: [PATCH] Java: Validation fix --- Java/utils.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Java/utils.twig b/Java/utils.twig index f2622f4..9e4786e 100644 --- a/Java/utils.twig +++ b/Java/utils.twig @@ -257,12 +257,12 @@ inputStream.readBoolean() and valueType.baseTypeName != "DateTime" and (valueTopType.values is empty) %} {%- if valueTopType.allFieldsOrdered is empty %} - if ({{ object }} instanceof ApiModel) { - ((ApiModel) {{ object }}{%- if optional -%} .get() {%- endif -%}).validate(); + if (((ApiModel) {{ object }}{%- if optional -%} .get() {%- endif -%}) instanceof ApiModel) { + ((ApiModel) {{ object }}{%- if optional -%} .get() {%- endif -%}).validate(); } else if ({{ object }} instanceof List) { - validateCollection(((List) {{ object }}), CollectionValidationRule.EXCEPTION_IF_ANY_INVALID); + validateCollection(((List) {{ object }}), CollectionValidationRule.EXCEPTION_IF_ANY_INVALID); } else if ({{ object }} instanceof Map) { - validateCollection(((Map) {{ object }}).values(), CollectionValidationRule.EXCEPTION_IF_ANY_INVALID); + validateCollection(((Map) {{ object }}).values(), CollectionValidationRule.EXCEPTION_IF_ANY_INVALID); } {%- elseif optional %} if ({{ object }}.get() != null) {