Controller Blueprints Microservice

Refactor controller blueprint core and resource dictionary modules to components module.

Change-Id: If5ba5e35e9c95bc19bc78fb10bd62d6551ba7aca
Issue-ID: CCSDK-514
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

9 files changed, 0 insertions, 767 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceAssignmentProcessor.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceAssignmentProcessor.kt
deleted file mode 100644
index a6802f67..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceAssignmentProcessor.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  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.controllerblueprints.resource.dict
-
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException
-
-interface ResourceAssignmentProcessor {
-
-    @Throws(BluePrintProcessorException::class)
-    fun validate(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun process(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun errorHandle(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-
-    @Throws(BluePrintProcessorException::class)
-    fun reTrigger(resourceAssignment: ResourceAssignment, context : MutableMap<String, Any>)
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
deleted file mode 100644
index 0808073f..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  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.controllerblueprints.resource.dict
-
-import com.fasterxml.jackson.annotation.JsonFormat
-import com.fasterxml.jackson.annotation.JsonProperty
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
-import java.io.Serializable
-import java.util.*
-
-open class ResourceDefinition {
-
-    @JsonProperty(value = "name", required = true)
-    lateinit var name: String
-
-    @JsonProperty(value = "property", required = true)
-    lateinit var property: PropertyDefinition
-
-    var tags: String? = null
-
-    @JsonProperty(value = "updated-by")
-    lateinit var updatedBy: String
-
-    @JsonProperty(value = "resource-type", required = true)
-    lateinit var resourceType: String
-
-    @JsonProperty(value = "resource-path", required = true)
-    lateinit var resourcePath: String
-
-    @JsonProperty(value = "sources", required = true)
-    lateinit var sources: MutableMap<String, NodeTemplate>
-}
-
-open class ResourceAssignment {
-
-    @JsonProperty(value = "name", required = true)
-    lateinit var name: String
-
-    @JsonProperty(value = "property")
-    var property: PropertyDefinition? = null
-
-    @JsonProperty("input-param")
-    var inputParameter: Boolean = false
-
-    @JsonProperty("dictionary-name")
-    var dictionaryName: String? = null
-
-    @JsonProperty("dictionary-source")
-    var dictionarySource: String? = null
-
-    @JsonProperty("dependencies")
-    var dependencies: MutableList<String>? = null
-
-    @JsonProperty("version")
-    var version: Int = 0
-
-    @JsonProperty("status")
-    var status: String? = null
-
-    @JsonProperty("message")
-    var message: String? = null
-
-    @JsonProperty("updated-date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-    var updatedDate: Date? = null
-
-    @JsonProperty("updated-by")
-    var updatedBy: String? = null
-
-    override fun toString(): String {
-        return StringBuilder()
-                .append("[")
-                .append("name=", name)
-                .append(", dictionaryName=", dictionaryName)
-                .append(", dictionarySource=", dictionarySource)
-                .append("]")
-                .toString()
-    }
-}
-
-/**
- * Interface for Source Definitions (ex Input Source,
- * Default Source, Database Source, Rest Sources, etc)
- */
-interface ResourceSource : Serializable
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
deleted file mode 100644
index aa6a9fb6..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  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.controllerblueprints.resource.dict
-/**
- * ResourceDictionaryConstants
- *
- * @author Brinda Santh
- */
-object ResourceDictionaryConstants {
-    const val SOURCE_INPUT = "input"
-    const val SOURCE_DEFAULT = "default"
-    const val SOURCE_DB = "db"
-
-    const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
-
-    const val PROPERTY_TYPE = "type"
-    const val PROPERTY_INPUT_KEY_MAPPING = "input-key-mapping"
-    const val PROPERTY_OUTPUT_KEY_MAPPING = "output-key-mapping"
-    const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt
deleted file mode 100644
index c5a78a9c..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt
+++ /dev/null
@@ -1,86 +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.controllerblueprints.resource.dict.service

-

-import com.att.eelf.configuration.EELFLogger

-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException

-import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerDefaultService

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerService

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

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition

-import com.att.eelf.configuration.EELFManager

-

-/**

- * ResourceAssignmentEnhancerService.

- *

- * @author Brinda Santh

- */

-interface ResourceAssignmentEnhancerService {

-

-    @Throws(BluePrintException::class)

-    fun enhanceBluePrint(bluePrintEnhancerService: BluePrintEnhancerService,

-                         resourceAssignments: List<ResourceAssignment>)

-

-    @Throws(BluePrintException::class)

-    fun enhanceBluePrint(resourceAssignments: List<ResourceAssignment>): ServiceTemplate

-}

-

-/**

- * ResourceAssignmentEnhancerDefaultService.

- *

- * @author Brinda Santh

- */

-open class ResourceAssignmentEnhancerDefaultService(private val resourceDefinitionRepoService: ResourceDefinitionRepoService)

-    : ResourceAssignmentEnhancerService {

-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationDefaultService::class.java)

-

-    /**

-     * Get the defined source instance from the ResourceAssignment,

-     * then get the NodeType of the Sources assigned

-     */

-    override fun enhanceBluePrint(bluePrintEnhancerService: BluePrintEnhancerService,

-                                  resourceAssignments: List<ResourceAssignment>) {

-

-        // Iterate the Resource Assignment and

-        resourceAssignments.map { resourceAssignment ->

-            val dictionaryName = resourceAssignment.dictionaryName!!

-            val dictionarySource = resourceAssignment.dictionarySource!!

-            log.info("Enriching Assignment name({}), dictionary name({}), source({})", resourceAssignment.name,

-                    dictionaryName, dictionarySource)

-            // Get the Resource Definition from Repo

-            val resourceDefinition: ResourceDefinition = getResourceDefinition(dictionaryName)

-

-            val sourceNodeTemplate = resourceDefinition.sources.get(dictionarySource)

-

-            // Enrich as NodeTemplate

-            bluePrintEnhancerService.enrichNodeTemplate(dictionarySource, sourceNodeTemplate!!)

-        }

-    }

-

-    override fun enhanceBluePrint(resourceAssignments: List<ResourceAssignment>): ServiceTemplate {

-        val bluePrintEnhancerService = BluePrintEnhancerDefaultService(resourceDefinitionRepoService)

-        bluePrintEnhancerService.serviceTemplate = ServiceTemplate()

-        bluePrintEnhancerService.initialCleanUp()

-        enhanceBluePrint(bluePrintEnhancerService, resourceAssignments)

-        return bluePrintEnhancerService.serviceTemplate

-    }

-

-    private fun getResourceDefinition(name: String): ResourceDefinition {

-        return resourceDefinitionRepoService.getResourceDefinition(name)!!.block()!!

-    }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
deleted file mode 100644
index 228b39e2..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationService.kt
+++ /dev/null
@@ -1,151 +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.controllerblueprints.resource.dict.service
-
-import com.att.eelf.configuration.EELFLogger
-import org.apache.commons.collections.CollectionUtils
-import org.apache.commons.lang3.StringUtils
-import org.apache.commons.lang3.text.StrBuilder
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import com.att.eelf.configuration.EELFManager
-import java.io.Serializable
-
-/**
- * ResourceAssignmentValidationService.
- *
- * @author Brinda Santh
- */
-interface ResourceAssignmentValidationService : Serializable {
-
-    @Throws(BluePrintException::class)
-    fun validate(resourceAssignments: List<ResourceAssignment>): Boolean
-}
-
-/**
- * ResourceAssignmentValidationDefaultService.
- *
- * @author Brinda Santh
- */
-open class ResourceAssignmentValidationDefaultService : ResourceAssignmentValidationService {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationDefaultService::class.java)
-
-    open var resourceAssignmentMap: Map<String, ResourceAssignment> = hashMapOf()
-    open val validationMessage = StrBuilder()
-
-    override fun validate(resourceAssignments: List<ResourceAssignment>): Boolean {
-        try {
-            validateSources(resourceAssignments)
-            validateTemplateNDictionaryKeys(resourceAssignments)
-            validateCyclicDependency(resourceAssignments)
-            if (StringUtils.isNotBlank(validationMessage)) {
-                throw BluePrintException("Resource Assignment Validation Failure")
-            }
-        } catch (e: Exception) {
-            throw BluePrintException("Resource Assignment Validation :" + validationMessage.toString(), e)
-        }
-        return true
-    }
-
-    open fun validateSources(resourceAssignments: List<ResourceAssignment>) {
-        log.info("validating resource assignment sources")
-    }
-
-    open fun validateTemplateNDictionaryKeys(resourceAssignments: List<ResourceAssignment>) {
-
-        resourceAssignmentMap = resourceAssignments.map { it.name to it }.toMap()
-
-        val duplicateKeyNames = resourceAssignments.groupBy { it.name }
-                .filter { it.value.size > 1 }
-                .map { it.key }
-
-        if (duplicateKeyNames.isNotEmpty()) {
-            validationMessage.appendln(String.format("Duplicate Assignment Template Keys (%s) is Present", duplicateKeyNames))
-        }
-
-        val duplicateDictionaryKeyNames = resourceAssignments.groupBy { it.dictionaryName }
-                .filter { it.value.size > 1 }
-                .map { it.key }
-        if (duplicateDictionaryKeyNames.isNotEmpty()) {
-            validationMessage.appendln(String.format("Duplicate Assignment Dictionary Keys (%s) is Present", duplicateDictionaryKeyNames))
-        }
-
-        val dependenciesNames = resourceAssignments.mapNotNull { it.dependencies }.flatten()
-
-        log.info("Resource assignment definitions : {}", resourceAssignmentMap.keys)
-        log.info("Resource assignment Dictionary dependencies : {}", dependenciesNames)
-
-        val notPresentDictionaries = dependenciesNames.filter { !resourceAssignmentMap.containsKey(it) }.distinct()
-        if (notPresentDictionaries.isNotEmpty()) {
-            validationMessage.appendln(String.format("No assignments for Dictionary Keys (%s)", notPresentDictionaries))
-        }
-
-        if (StringUtils.isNotBlank(validationMessage)) {
-            throw BluePrintException("Resource Assignment Validation Failure")
-        }
-    }
-
-    open fun validateCyclicDependency(resourceAssignments: List<ResourceAssignment>) {
-        val startResourceAssignment = ResourceAssignment()
-        startResourceAssignment.name = "*"
-
-        val topologySorting = TopologicalSortingUtils<ResourceAssignment>()
-
-        resourceAssignmentMap.map { it.value }.map { resourceAssignment ->
-            if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {
-                resourceAssignment.dependencies!!.map {
-                    log.info("Topological Graph link from {} to {}", it, resourceAssignment.name)
-                    topologySorting.add(resourceAssignmentMap[it]!!, resourceAssignment)
-                }
-            } else {
-                topologySorting.add(startResourceAssignment, resourceAssignment)
-            }
-        }
-
-        if (!topologySorting.isDag) {
-            val graph = getTopologicalGraph(topologySorting)
-            validationMessage.appendln("Cyclic Dependency :$graph")
-        }
-    }
-
-    open fun getTopologicalGraph(topologySorting: TopologicalSortingUtils<ResourceAssignment>): String {
-        val s = StringBuilder()
-        val neighbors = topologySorting.getNeighbors()
-
-        neighbors.forEach { v, vs ->
-            if (v.name == "*") {
-                s.append("\n    * -> [")
-                for (resourceAssignment in vs) {
-                    s.append("(" + resourceAssignment.dictionaryName + ":" + resourceAssignment.name
-                            + "),")
-                }
-                s.append("]")
-            } else {
-                s.append("\n    (" + v.dictionaryName + ":" + v.name + ") -> [")
-                for (resourceAssignment in vs) {
-                    s.append("(" + resourceAssignment.dictionaryName + ":" + resourceAssignment.name
-                            + "),")
-                }
-                s.append("]")
-            }
-        }
-        return s.toString()
-    }
-
-
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
deleted file mode 100644
index d51338ca..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt
+++ /dev/null
@@ -1,61 +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.controllerblueprints.resource.dict.service

-

-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoFileService

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService

-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonReactorUtils

-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition

-import reactor.core.publisher.Mono

-/**

- * ResourceDefinitionRepoService.

- *

- * @author Brinda Santh

- */

-interface ResourceDefinitionRepoService : BluePrintRepoService {

-

-    fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition>?

-}

-

-/**

- * ResourceDefinitionFileRepoService.

- *

- * @author Brinda Santh

- */

-open class ResourceDefinitionFileRepoService : BluePrintRepoFileService,

-        ResourceDefinitionRepoService {

-

-    private var resourceDefinitionPath: String

-    private val extension = ".json"

-

-    constructor(basePath: String) : this(basePath,

-            basePath.plus(BluePrintConstants.PATH_DIVIDER)

-                    .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE))

-

-    constructor(basePath: String, modelTypePath: String) : super(modelTypePath) {

-        resourceDefinitionPath = basePath.plus("/resource_dictionary")

-    }

-

-    override fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition>? {

-

-        val fileName = resourceDefinitionPath.plus(BluePrintConstants.PATH_DIVIDER)

-                .plus(resourceDefinitionName).plus(extension)

-

-        return JacksonReactorUtils.readValueFromFile(fileName, ResourceDefinition::class.java)

-    }

-}

diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt
deleted file mode 100644
index 14855d4b..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationService.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *  Modifications 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.controllerblueprints.resource.dict.service
-
-import com.att.eelf.configuration.EELFLogger
-import com.fasterxml.jackson.databind.JsonNode
-import com.google.common.base.Preconditions
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.apps.controllerblueprints.core.format
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintExpressionService
-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import com.att.eelf.configuration.EELFManager
-import java.io.Serializable
-/**
- * ResourceDefinitionValidationService.
- *
- * @author Brinda Santh
- */
-interface ResourceDefinitionValidationService : Serializable {
-
-    @Throws(BluePrintException::class)
-    fun validate(resourceDefinition: ResourceDefinition)
-
-}
-/**
- * ResourceDefinitionValidationService.
- *
- * @author Brinda Santh
- */
-open class ResourceDefinitionDefaultValidationService(private val bluePrintRepoService: BluePrintRepoService) : ResourceDefinitionValidationService {
-
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceDefinitionValidationService::class.java)
-
-    override fun validate(resourceDefinition: ResourceDefinition) {
-        Preconditions.checkNotNull(resourceDefinition, "Failed to get Resource Definition")
-        log.trace("Validating Resource Dictionary Definition {}", resourceDefinition.name)
-
-        resourceDefinition.sources.forEach { (name, nodeTemplate) ->
-            val sourceType = nodeTemplate.type
-
-            val sourceNodeType = bluePrintRepoService.getNodeType(sourceType)?.block()
-                    ?: throw BluePrintException(format("Failed to get source({}) node type definition({})", name, sourceType))
-
-            // Validate Property Name, expression, values and Data Type
-            validateNodeTemplateProperties(nodeTemplate, sourceNodeType)
-        }
-    }
-
-
-    open fun validateNodeTemplateProperties(nodeTemplate: NodeTemplate, nodeType: NodeType) {
-        nodeTemplate.properties?.let { validatePropertyAssignments(nodeType.properties!!, nodeTemplate.properties!!) }
-    }
-
-
-    open fun validatePropertyAssignments(nodeTypeProperties: MutableMap<String, PropertyDefinition>,
-                                         properties: MutableMap<String, JsonNode>) {
-        properties.forEach { propertyName, propertyAssignment ->
-            val propertyDefinition: PropertyDefinition = nodeTypeProperties[propertyName]
-                    ?: throw BluePrintException(format("failed to get definition for the property ({})", propertyName))
-            // Check and Validate if Expression Node
-            val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)
-            if (!expressionData.isExpression) {
-                checkPropertyValue(propertyDefinition, propertyName, propertyAssignment)
-            } else {
-                throw BluePrintException(format("property({}) of expression ({}) is not supported",
-                        propertyName, propertyAssignment))
-            }
-        }
-    }
-
-    open fun checkPropertyValue(propertyDefinition: PropertyDefinition, propertyName: String, propertyAssignment: JsonNode) {
-        val propertyType = propertyDefinition.type
-        val isValid : Boolean
-
-        if (BluePrintTypes.validPrimitiveTypes().contains(propertyType)) {
-            isValid = JacksonUtils.checkJsonNodeValueOfPrimitiveType(propertyType, propertyAssignment)
-
-        } else if (BluePrintTypes.validCollectionTypes().contains(propertyType)) {
-
-            isValid = JacksonUtils.checkJsonNodeValueOfCollectionType(propertyType, propertyAssignment)
-        } else {
-            bluePrintRepoService.getDataType(propertyType)
-                    ?: throw BluePrintException(format("property({}) defined of data type({}) is not in repository",
-                            propertyName, propertyType))
-            isValid = true
-        }
-
-        check(isValid) {
-            throw BluePrintException(format("property({}) defined of type({}) is not compatable with the value ({})",
-                    propertyName, propertyType, propertyAssignment))
-        }
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
deleted file mode 100644
index 747639c8..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
+++ /dev/null
@@ -1,109 +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.controllerblueprints.resource.dict.utils

-

-import com.att.eelf.configuration.EELFLogger

-import org.apache.commons.collections.CollectionUtils

-import org.onap.ccsdk.apps.controllerblueprints.core.utils.TopologicalSortingUtils

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

-import com.att.eelf.configuration.EELFManager

-import java.util.ArrayList

-/**

- * BulkResourceSequencingUtils.

- *

- * @author Brinda Santh

- */

-object BulkResourceSequencingUtils {

-    private val log: EELFLogger = EELFManager.getInstance().getLogger(BulkResourceSequencingUtils::class.java)

-

-    @JvmStatic

-    fun process(resourceAssignments: MutableList<ResourceAssignment>): List<List<ResourceAssignment>> {

-        val resourceAssignmentMap: MutableMap<String, ResourceAssignment> = hashMapOf()

-        val sequenceBatchResourceAssignment = ArrayList<List<ResourceAssignment>>()

-        log.info("Assignments ({})", resourceAssignments)

-        // Prepare Map

-        resourceAssignments.forEach { resourceAssignment ->

-            log.trace("Processing Key ({})", resourceAssignment.name)

-            resourceAssignmentMap.put(resourceAssignment.name, resourceAssignment)

-        }

-

-        val startResourceAssignment = ResourceAssignment()

-        startResourceAssignment.name = "*"

-

-        // Preepare Sorting Map

-        val topologySorting = TopologicalSortingUtils<ResourceAssignment>()

-        resourceAssignmentMap.forEach { _, resourceAssignment ->

-            if (CollectionUtils.isNotEmpty(resourceAssignment.dependencies)) {

-                for (dependency in resourceAssignment.dependencies!!) {

-                    topologySorting.add(resourceAssignmentMap[dependency]!!, resourceAssignment)

-                }

-            } else {

-                topologySorting.add(startResourceAssignment, resourceAssignment)

-            }

-        }

-

-        val sequencedResourceAssignments: MutableList<ResourceAssignment> = topologySorting.topSort()!! as MutableList<ResourceAssignment>

-        log.info("Sorted Sequenced Assignments ({})", sequencedResourceAssignments)

-

-        var batchResourceAssignment: MutableList<ResourceAssignment>? = null

-        var batchAssignmentName: MutableList<String>? = null

-

-        // Prepare Sorting

-        sequencedResourceAssignments.forEachIndexed { index, resourceAssignment ->

-

-            var previousResourceAssignment: ResourceAssignment? = null

-

-            if (index > 0) {

-                previousResourceAssignment = sequencedResourceAssignments[index - 1]

-            }

-

-            var dependencyPresence = false

-            if (batchAssignmentName != null && resourceAssignment.dependencies != null) {

-                dependencyPresence = CollectionUtils.containsAny(batchAssignmentName, resourceAssignment.dependencies)

-            }

-

-            log.trace("({}) -> Checking ({}), with ({}), result ({})", resourceAssignment.name,

-                    batchAssignmentName, resourceAssignment.dependencies, dependencyPresence)

-

-            if (previousResourceAssignment != null && resourceAssignment.dictionarySource != null

-                    && resourceAssignment.dictionarySource!!.equals(previousResourceAssignment.dictionarySource, true)

-                    && !dependencyPresence) {

-                batchResourceAssignment!!.add(resourceAssignment)

-                batchAssignmentName!!.add(resourceAssignment.name)

-            } else {

-                if (batchResourceAssignment != null) {

-                    sequenceBatchResourceAssignment.add(batchResourceAssignment!!)

-                    log.trace("Created old Set ({})", batchAssignmentName)

-                }

-                batchResourceAssignment = arrayListOf()

-                batchResourceAssignment!!.add(resourceAssignment)

-

-                batchAssignmentName = arrayListOf()

-                batchAssignmentName!!.add(resourceAssignment.name)

-            }

-

-            if (index == sequencedResourceAssignments.size - 1) {

-                log.trace("Created old Set ({})", batchAssignmentName)

-                sequenceBatchResourceAssignment.add(batchResourceAssignment!!)

-            }

-        }

-        log.info("Batched Sequence : ({})", sequenceBatchResourceAssignment)

-

-        return sequenceBatchResourceAssignment

-    }

-

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt
deleted file mode 100644
index a3456cd4..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtils.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright © 2018 IBM.
- *
- *  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.controllerblueprints.resource.dict.utils
-
-import com.att.eelf.configuration.EELFLogger
-import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.databind.node.NullNode
-import org.apache.commons.collections.MapUtils
-import org.apache.commons.lang3.StringUtils
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants
-import com.att.eelf.configuration.EELFManager
-
-
-object ResourceDictionaryUtils {
-    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceDictionaryUtils::class.java)
-
-    @JvmStatic
-    fun populateSourceMapping(resourceAssignment: ResourceAssignment,
-                              resourceDefinition: ResourceDefinition) {
-
-        if (StringUtils.isBlank(resourceAssignment.dictionarySource)) {
-
-            if (MapUtils.isNotEmpty(resourceDefinition.sources)) {
-                val source = findFirstSource(resourceDefinition.sources)
-
-                // Populate and Assign First Source
-                if (StringUtils.isNotBlank(source)) {
-                    // Set Dictionary Source
-                    resourceAssignment.dictionarySource = source
-                } else {
-                    resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
-                }
-                log.info("auto map resourceAssignment : {}", resourceAssignment)
-            }else {
-                resourceAssignment.dictionarySource = ResourceDictionaryConstants.SOURCE_INPUT
-            }
-        }
-    }
-
-    @JvmStatic
-    fun findFirstSource(sources: Map<String, NodeTemplate>): String? {
-        var source: String? = null
-        if (MapUtils.isNotEmpty(sources)) {
-            source = sources.keys.stream().findFirst().get()
-        }
-        return source
-    }
-
-    @JvmStatic
-    fun assignInputs(data: JsonNode, context: MutableMap<String, Any>) {
-        log.trace("assignInputs from input JSON ({})", data.toString())
-        data.fields().forEach { field ->
-            val valueNode: JsonNode = data.at("/".plus(field.key)) ?: NullNode.getInstance()
-
-            val path = BluePrintConstants.PATH_INPUTS.plus(BluePrintConstants.PATH_DIVIDER).plus(field.key)
-            log.trace("setting path ({}), values ({})", path, valueNode)
-            context[path] = valueNode
-        }
-    }
-}
\ No newline at end of file