Merge "Fix the tosca converter"

1 files changed, 61 insertions, 61 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 3b34182c1..1ed4a4ba6 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,7 +4,7 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:39237",
+  "host" : "localhost:46347",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
@@ -827,13 +827,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -841,6 +834,10 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -851,30 +848,33 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "string" : {
           "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
@@ -973,33 +973,23 @@
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1008,6 +998,13 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1017,6 +1014,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       },
       "x-className" : {
@@ -1174,33 +1174,23 @@
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1209,6 +1199,13 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1218,6 +1215,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       }
     },
@@ -1242,13 +1242,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1256,6 +1249,10 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1266,27 +1263,30 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }