Fix the CDS calls

Fix the CDS calls for generic tosca policies, the new tosca parser must be interrupted so that clamp can do json schema enrichment

Issue-ID: CLAMP-786
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ib7e85a6cc3849f614a3025779d29e8024f7a2ef2

1 files changed, 255 insertions, 223 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index e1e133771..d8a9ddca5 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,13 +4,13 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:41607",
+  "host" : "localhost:42393",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/clampInformation" : {
       "get" : {
-        "operationId" : "route35",
+        "operationId" : "route112",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,13 +20,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route35"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route112"
       }
     },
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route21",
+        "operationId" : "route98",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -36,11 +36,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route98"
       },
       "put" : {
-        "operationId" : "route23",
+        "operationId" : "route100",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -59,8 +59,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route100"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
@@ -80,7 +80,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -109,11 +109,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "delete" : {
-        "operationId" : "route25",
+        "operationId" : "route102",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -124,8 +124,8 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route102"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
@@ -145,7 +145,7 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -163,13 +163,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route79",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -185,13 +185,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route79"
       }
     },
     "/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
       "put" : {
-        "operationId" : "route16",
+        "operationId" : "route93",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -217,13 +217,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route16"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route93"
       }
     },
     "/v2/loop/create/{loopName}?templateName={templateName}" : {
       "post" : {
-        "operationId" : "route18",
+        "operationId" : "route95",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -240,13 +240,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route95"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route14",
+        "operationId" : "route91",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -256,13 +256,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route91"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route84",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -278,13 +278,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route78",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -297,13 +297,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route78"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route15",
+        "operationId" : "route92",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -319,19 +319,51 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route92"
       }
     },
-    "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
+    "/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}" : {
       "put" : {
-        "operationId" : "route9",
+        "operationId" : "route85",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
           "required" : true,
           "type" : "string"
+        }, {
+          "name" : "microServicePolicyName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Loop"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route85"
+      }
+    },
+    "/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}" : {
+      "put" : {
+        "operationId" : "route86",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "operationalPolicyName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
@@ -341,13 +373,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route86"
       }
     },
     "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
       "put" : {
-        "operationId" : "route17",
+        "operationId" : "route94",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -373,13 +405,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route17"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route94"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route12",
+        "operationId" : "route89",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -395,13 +427,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route89"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route11",
+        "operationId" : "route88",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -417,13 +449,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route88"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route13",
+        "operationId" : "route90",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -439,13 +471,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route90"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route4",
+        "operationId" : "route80",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -461,13 +493,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route87",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -483,13 +515,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route87"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route5",
+        "operationId" : "route81",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -513,13 +545,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route81"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route7",
+        "operationId" : "route83",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -543,13 +575,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route83"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route6",
+        "operationId" : "route82",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -573,13 +605,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route28",
+        "operationId" : "route105",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -589,11 +621,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route105"
       },
       "post" : {
-        "operationId" : "route29",
+        "operationId" : "route106",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -612,8 +644,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route106"
       }
     },
     "/v2/policyToscaModels/{policyModelType}/{policyModelVersion}" : {
@@ -638,11 +670,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route30",
+        "operationId" : "route107",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -671,8 +703,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route107"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}" : {
@@ -697,13 +729,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route34",
+        "operationId" : "route111",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -713,8 +745,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route34"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route111"
       }
     },
     "/v2/templates/{templateName}" : {
@@ -734,7 +766,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -755,7 +787,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -773,13 +805,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route36",
+        "operationId" : "route113",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -789,19 +821,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route36"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route113"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route37",
+        "operationId" : "route114",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route37"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route114"
       }
     }
   },
@@ -986,28 +1018,28 @@
     "JsonPrimitive" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asBoolean" : {
+          "type" : "boolean"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "number" : {
+          "type" : "boolean"
+        },
+        "asString" : {
+          "type" : "string"
         },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "boolean" : {
-          "type" : "boolean"
-        },
-        "asBoolean" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "number" : {
-          "type" : "boolean"
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
         },
-        "asString" : {
+        "asCharacter" : {
           "type" : "string"
         },
         "asBigDecimal" : {
@@ -1020,44 +1052,44 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
-        },
-        "asCharacter" : {
-          "type" : "string"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "boolean" : {
+          "type" : "boolean"
         },
         "string" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonNull" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
@@ -1135,44 +1167,32 @@
     "JsonObject" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
         "asString" : {
           "type" : "string"
         },
-        "jsonObject" : {
-          "type" : "boolean"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "jsonNull" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asCharacter" : {
+          "type" : "string"
         },
         "asBigDecimal" : {
           "type" : "number"
@@ -1184,22 +1204,34 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "jsonArray" : {
+          "type" : "boolean"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonObject" : {
+          "type" : "boolean"
         },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
+        "jsonPrimitive" : {
+          "type" : "boolean"
         },
-        "asCharacter" : {
-          "type" : "string"
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         }
       },
       "x-className" : {
@@ -1336,44 +1368,32 @@
     "JsonNull" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
         "asString" : {
           "type" : "string"
         },
-        "jsonObject" : {
-          "type" : "boolean"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "jsonNull" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asCharacter" : {
+          "type" : "string"
         },
         "asBigDecimal" : {
           "type" : "number"
@@ -1385,44 +1405,59 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "jsonArray" : {
+          "type" : "boolean"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonObject" : {
+          "type" : "boolean"
         },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
+        "jsonPrimitive" : {
+          "type" : "boolean"
         },
-        "asCharacter" : {
-          "type" : "string"
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         }
       }
     },
     "JsonArray" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asBoolean" : {
+          "type" : "boolean"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "asString" : {
+          "type" : "string"
         },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "asBoolean" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "asString" : {
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "asCharacter" : {
           "type" : "string"
         },
         "asBigDecimal" : {
@@ -1435,41 +1470,38 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
-        },
-        "asCharacter" : {
-          "type" : "string"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonNull" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }