From ff66351889a435316e2e8e3038a26e4db2baefdd Mon Sep 17 00:00:00 2001
From: Jeremie Bresson <dev@jmini.fr>
Date: Thu, 15 Mar 2018 06:21:34 +0100
Subject: [PATCH] Migrate {{#isInteger}}, {{#isLong}}, {{#isDouble}},
 {{#isFloat}}

---
 src/main/resources/v2/JavaJaxRS/cxf/enumClass.mustache       | 2 +-
 src/main/resources/v2/JavaJaxRS/cxf/enumOuterClass.mustache  | 2 +-
 src/main/resources/v2/JavaJaxRS/enumClass.mustache           | 2 +-
 src/main/resources/v2/JavaJaxRS/enumOuterClass.mustache      | 2 +-
 src/main/resources/v2/JavaJaxRS/modelEnum.mustache           | 2 +-
 src/main/resources/v2/JavaJaxRS/spec/enumOuterClass.mustache | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/v2/JavaJaxRS/cxf/enumClass.mustache b/src/main/resources/v2/JavaJaxRS/cxf/enumClass.mustache
index 2662e8e1c3..6877d65cef 100644
--- a/src/main/resources/v2/JavaJaxRS/cxf/enumClass.mustache
+++ b/src/main/resources/v2/JavaJaxRS/cxf/enumClass.mustache
@@ -3,7 +3,7 @@
 public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-{{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{datatype}}.valueOf({{{value}}})){{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
+{{#enumVars}}@XmlEnumValue({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}) {{name}}({{datatype}}.valueOf({{{value}}})){{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
     {{/allowableValues}}
 
 
diff --git a/src/main/resources/v2/JavaJaxRS/cxf/enumOuterClass.mustache b/src/main/resources/v2/JavaJaxRS/cxf/enumOuterClass.mustache
index 41ee748ef5..6d06d4f4af 100644
--- a/src/main/resources/v2/JavaJaxRS/cxf/enumOuterClass.mustache
+++ b/src/main/resources/v2/JavaJaxRS/cxf/enumOuterClass.mustache
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#if gson}}
   {{#allowableValues}}{{#enumVars}}
-  @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+  @SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
   {{{name}}}({{{value}}}){{^@last}},
   {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
   {{/if}}
diff --git a/src/main/resources/v2/JavaJaxRS/enumClass.mustache b/src/main/resources/v2/JavaJaxRS/enumClass.mustache
index 4e9f8f2a51..9c7d07e5ab 100644
--- a/src/main/resources/v2/JavaJaxRS/enumClass.mustache
+++ b/src/main/resources/v2/JavaJaxRS/enumClass.mustache
@@ -5,7 +5,7 @@
     {{#if gson}}
         {{#allowableValues}}
             {{#enumVars}}
-    @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+    @SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
     {{{name}}}({{{value}}}){{^@last}},
     {{/@last}}{{#@last}};{{/@last}}
             {{/enumVars}}
diff --git a/src/main/resources/v2/JavaJaxRS/enumOuterClass.mustache b/src/main/resources/v2/JavaJaxRS/enumOuterClass.mustache
index c410202df8..97a0a180d9 100644
--- a/src/main/resources/v2/JavaJaxRS/enumOuterClass.mustache
+++ b/src/main/resources/v2/JavaJaxRS/enumOuterClass.mustache
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#if gson}}
   {{#allowableValues}}{{#enumVars}}
-  @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+  @SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
   {{{name}}}({{{value}}}){{^@last}},
   {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
   {{/if}}
diff --git a/src/main/resources/v2/JavaJaxRS/modelEnum.mustache b/src/main/resources/v2/JavaJaxRS/modelEnum.mustache
index e7fb0dc0ca..e811e777f5 100644
--- a/src/main/resources/v2/JavaJaxRS/modelEnum.mustache
+++ b/src/main/resources/v2/JavaJaxRS/modelEnum.mustache
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#if gson}}
   {{#allowableValues}}{{#enumVars}}
-  @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+  @SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
   {{{name}}}({{{value}}}){{^@last}},
   {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
   {{/if}}
diff --git a/src/main/resources/v2/JavaJaxRS/spec/enumOuterClass.mustache b/src/main/resources/v2/JavaJaxRS/spec/enumOuterClass.mustache
index 961975d028..0d33f1f57f 100644
--- a/src/main/resources/v2/JavaJaxRS/spec/enumOuterClass.mustache
+++ b/src/main/resources/v2/JavaJaxRS/spec/enumOuterClass.mustache
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#if gson}}
   {{#allowableValues}}{{#enumVars}}
-  @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+  @SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
   {{{name}}}({{{value}}}){{^@last}},
   {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
   {{/if}}