Merge "Fix the tosca converter"

2 files changed, 64 insertions, 64 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 3b34182c..1ed4a4ba 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"
         }
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index a1d7b18d..1095ce71 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200309160816-07'00')
-/ModDate (D:20200309160816-07'00')
+/CreationDate (D:20200310073214-07'00')
+/ModDate (D:20200310073214-07'00')
 >>
 endobj
 2 0 obj
@@ -5910,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3339323337> Tj
+<203a206c6f63616c686f73743a3436333437> Tj
 ET
 
 0.000 0.000 0.000 SCN