diff options
Diffstat (limited to 'ms/blueprintsprocessor/modules/commons')
7 files changed, 58 insertions, 148 deletions
diff --git a/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml b/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml deleted file mode 100644 index 410111b4..00000000 --- a/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Copyright © 2017-2018 AT&T Intellectual Property. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> - <version>0.4.0-SNAPSHOT</version> - </parent> - - <artifactId>adaptors</artifactId> - <packaging>pom</packaging> - <name>Blueprints Processor Adaptors POM</name> - <description>Blueprints Processor Adaptors</description> - <modules> - - </modules> - -</project> diff --git a/ms/blueprintsprocessor/modules/commons/core/pom.xml b/ms/blueprintsprocessor/modules/commons/core/pom.xml index 094f42b7..626a27a3 100644 --- a/ms/blueprintsprocessor/modules/commons/core/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/core/pom.xml @@ -17,27 +17,27 @@ ~ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> - <version>0.4.0-SNAPSHOT</version> - </parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> + <artifactId>commons</artifactId> + <version>0.4.0-SNAPSHOT</version> + </parent> - <artifactId>core</artifactId> - <packaging>jar</packaging> - <name>Blueprints Processor Core</name> - <description>Blueprints Processor Core</description> + <artifactId>core</artifactId> + <packaging>jar</packaging> + <name>Blueprints Processor Core</name> + <description>Blueprints Processor Core</description> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> - <artifactId>db-lib</artifactId> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> - <artifactId>rest-lib</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> + <artifactId>db-lib</artifactId> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId> + <artifactId>rest-lib</artifactId> + </dependency> + </dependencies> </project> 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..45f684f1 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)
- lateinit var status: Status
- @get:ApiModelProperty(required=true)
+ @get:ApiModelProperty(required = true)
+ var status: Status = Status()
+ @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,12 +105,12 @@ 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)
- lateinit var message: String
+ @get:ApiModelProperty(required = true)
+ var message: String = "success"
}
diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorException.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorException.kt deleted file mode 100644 index df4d6703..00000000 --- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorException.kt +++ /dev/null @@ -1,48 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.blueprintsprocessor.core.api.data
-
-/**
- * BlueprintProcessorException
- * @author Brinda Santh
- * DATE : 8/15/2018
- */
-open class BlueprintProcessorException : Exception {
- var code: Int = 100
-
- constructor(cause: Throwable) : super(cause)
- constructor(message: String) : super(message)
- constructor(message: String, cause: Throwable) : super(message, cause)
- constructor(cause: Throwable, message: String, vararg args: Any?) : super(String.format(message, *args), cause)
-
- constructor(code: Int, cause: Throwable) : super(cause) {
- this.code = code
- }
-
- constructor(code: Int, message: String) : super(message) {
- this.code = code
- }
-
- constructor(code: Int, message: String, cause: Throwable) : super(message, cause) {
- this.code = code
- }
-
- constructor(code: Int, cause: Throwable, message: String, vararg args: Any?)
- : super(String.format(message, *args), cause) {
- this.code = code
- }
-}
\ No newline at end of file diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ComponentNodeFactory.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ComponentNodeFactory.kt index feacbcab..66643ee0 100644 --- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ComponentNodeFactory.kt +++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ComponentNodeFactory.kt @@ -21,7 +21,6 @@ import com.att.eelf.configuration.EELFManager import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
import org.springframework.context.ApplicationContext
import org.springframework.context.ApplicationContextAware
-import org.springframework.stereotype.Service
/**
* ComponentNode
@@ -48,7 +47,6 @@ interface ComponentNode { *
* @author Brinda Santh
*/
-@Service
open class ComponentNodeFactory : ApplicationContextAware {
private val log = EELFManager.getInstance().getLogger(ComponentNodeFactory::class.java)
diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ResourceAssignmentProcessorFactory.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ResourceAssignmentProcessorFactory.kt index 01a110d5..80ad0e67 100644 --- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ResourceAssignmentProcessorFactory.kt +++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/factory/ResourceAssignmentProcessorFactory.kt @@ -21,14 +21,14 @@ import com.att.eelf.configuration.EELFManager import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignmentProcessor
import org.springframework.context.ApplicationContext
import org.springframework.context.ApplicationContextAware
-import org.springframework.stereotype.Service
+import org.springframework.context.annotation.Configuration
/**
* ResourceAssignmentProcessorFactory
*
* @author Brinda Santh
*/
-@Service
+@Configuration
open class ResourceAssignmentProcessorFactory : ApplicationContextAware {
private val log = EELFManager.getInstance().getLogger(ResourceAssignmentProcessorFactory::class.java)
diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 299a87d6..7bfec58c 100644 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -31,21 +31,12 @@ <modules> <module>db-lib</module> <module>rest-lib</module> - <module>adaptors</module> <module>core</module> </modules> <dependencies> <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-kotlin</artifactId> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-stdlib-jdk8</artifactId> - </dependency> - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-reflect</artifactId> + <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId> + <artifactId>resource-dict</artifactId> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> |