Merge "Fix entityId bug"

1 files changed, 93 insertions, 85 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 30155353c..15329f99d 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,10 +1,10 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "5.0.2-SNAPSHOT",
+    "version" : "5.0.5-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:34889",
+  "host" : "localhost:40065",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
@@ -381,7 +381,7 @@
         "x-routeId" : "route48"
       }
     },
-    "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
+    "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" : {
       "put" : {
         "operationId" : "route56",
         "produces" : [ "application/json" ],
@@ -400,6 +400,11 @@
           "in" : "path",
           "required" : true,
           "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
         } ],
         "responses" : {
           "200" : {
@@ -1036,20 +1041,6 @@
         "number" : {
           "type" : "boolean"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
@@ -1075,10 +1066,21 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "string" : {
-          "type" : "boolean"
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         },
-        "jsonArray" : {
+        "asString" : {
+          "type" : "string"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
+        "string" : {
           "type" : "boolean"
         },
         "jsonObject" : {
@@ -1096,6 +1098,9 @@
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -1166,6 +1171,9 @@
         },
         "dcaeBlueprintId" : {
           "type" : "string"
+        },
+        "legacy" : {
+          "type" : "boolean"
         }
       },
       "x-className" : {
@@ -1179,8 +1187,30 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "asCharacter" : {
+          "type" : "string"
+        },
+        "asBigDecimal" : {
+          "type" : "number"
+        },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "jsonObject" : {
           "type" : "boolean"
@@ -1197,6 +1227,9 @@
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -1216,31 +1249,6 @@
         "asFloat" : {
           "type" : "number",
           "format" : "float"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
-        },
-        "asCharacter" : {
-          "type" : "string"
-        },
-        "asBigDecimal" : {
-          "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
         }
       },
       "x-className" : {
@@ -1380,8 +1388,30 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "asByte" : {
+          "type" : "string",
+          "format" : "byte"
+        },
+        "asCharacter" : {
+          "type" : "string"
+        },
+        "asBigDecimal" : {
+          "type" : "number"
+        },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "jsonObject" : {
           "type" : "boolean"
@@ -1398,6 +1428,9 @@
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -1417,6 +1450,14 @@
         "asFloat" : {
           "type" : "number",
           "format" : "float"
+        }
+      }
+    },
+    "JsonArray" : {
+      "type" : "object",
+      "properties" : {
+        "asBoolean" : {
+          "type" : "boolean"
         },
         "asLong" : {
           "type" : "integer",
@@ -1442,14 +1483,6 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
-        }
-      }
-    },
-    "JsonArray" : {
-      "type" : "object",
-      "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
@@ -1465,34 +1498,6 @@
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asByte" : {
-          "type" : "string",
-          "format" : "byte"
-        },
-        "asCharacter" : {
-          "type" : "string"
-        },
-        "asBigDecimal" : {
-          "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
@@ -1508,6 +1513,9 @@
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },