Merge "Controller Blueprints Component Core"

1 files changed, 31 insertions, 28 deletions

diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
index 6fed53e6..dc93825e 100644
--- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
+++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
@@ -18,6 +18,7 @@
 package org.onap.ccsdk.apps.blueprintsprocessor.core.api.data

 

 import com.fasterxml.jackson.annotation.JsonFormat

+import com.fasterxml.jackson.databind.JsonNode

 import com.fasterxml.jackson.databind.node.ObjectNode

 import io.swagger.annotations.ApiModelProperty

 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment

@@ -29,69 +30,71 @@ import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
  */

 

 open class ResourceResolutionInput {

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var resourceAssignments: MutableList<ResourceAssignment>

-    @get:ApiModelProperty(required=true )

+    @get:ApiModelProperty(required = true)

     lateinit var payload: ObjectNode

 }

 

 open class ResourceResolutionOutput {

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var status: Status

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var resourceAssignments: MutableList<ResourceAssignment>

 }

 

 open class ExecutionServiceInput {

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var payload: ObjectNode

+    var metadata: MutableMap<String, JsonNode> = hashMapOf()

 }

 

 open class ExecutionServiceOutput {

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var status: Status

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var payload: ObjectNode

+    var metadata: MutableMap<String, JsonNode> = hashMapOf()

 }

 

 open class ActionIdentifiers {

-    @get:ApiModelProperty(required=false)

+    @get:ApiModelProperty(required = false)

     lateinit var blueprintName: String

-    @get:ApiModelProperty(required=false)

+    @get:ApiModelProperty(required = false)

     lateinit var blueprintVersion: String

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var actionName: String

-    @get:ApiModelProperty(required=true, allowableValues = "sync, async")

+    @get:ApiModelProperty(required = true, allowableValues = "sync, async")

     lateinit var mode: String

 }

 

 open class CommonHeader {

-    @get:ApiModelProperty(required=true, example = "2012-04-23T18:25:43.511Z")

-    @get:JsonFormat(shape = JsonFormat.Shape.STRING,  pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")

+    @get:ApiModelProperty(required = true, example = "2012-04-23T18:25:43.511Z")

+    @get:JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")

     lateinit var timestamp: String

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var originatorId: String

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var requestId: String

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var subRequestId: String

-    @get:ApiModelProperty(required=false)

+    @get:ApiModelProperty(required = false)

     var flags: Flags? = null

 }

 

@@ -102,11 +105,11 @@ open class Flags {
 }

 

 open class Status {

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     var code: Int = 200

-    @get:ApiModelProperty(required=false)

+    @get:ApiModelProperty(required = false)

     var errorMessage: String? = null

-    @get:ApiModelProperty(required=true)

+    @get:ApiModelProperty(required = true)

     lateinit var message: String

 }