Refractor controller blueprint modules

Move controller blueprints modules to blueprints processor and change the maven group name.

Fix test cba and model type paths

Fix dependencies issues.

Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b

19 files changed, 0 insertions, 1794 deletions

diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml
deleted file mode 100644
index 5bc2e2a6b..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2017-2018 AT&T Intellectual Property.
-  ~
-  ~ Modifications 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.
-  -->
-<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.cds.controllerblueprints</groupId>
-        <artifactId>modules</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>blueprint-validation</artifactId>
-
-    <name>Controller Blueprints Validation Service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
-            <artifactId>blueprint-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.cds.controllerblueprints</groupId>
-            <artifactId>resource-dict</artifactId>
-        </dependency>
-
-        <!--Testing dependencies-->
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-test</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactDefinitionValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactDefinitionValidatorImpl.kt
deleted file mode 100644
index 73504314b..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactDefinitionValidatorImpl.kt
+++ /dev/null
@@ -1,99 +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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service("default-artifact-definition-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintArtifactDefinitionValidatorImpl(
-    private val bluePrintTypeValidatorService: BluePrintTypeValidatorService
-) : BluePrintArtifactDefinitionValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintArtifactDefinitionValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-    lateinit var bluePrintContext: BluePrintContext
-    var paths: MutableList<String> = arrayListOf()
-
-    override fun validate(
-        bluePrintRuntimeService: BluePrintRuntimeService<*>,
-        name: String,
-        artifactDefinition: ArtifactDefinition
-    ) {
-
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-        this.bluePrintContext = bluePrintRuntimeService.bluePrintContext()
-
-        paths.add(name)
-        val type: String = artifactDefinition.type
-        log.trace("Validation ArtifactDefinition of type {$type}")
-        // Check Artifact Type
-        checkValidArtifactType(name, type)
-
-        val file: String = artifactDefinition.file
-
-        val completePath = bluePrintContext.rootPath.plus(File.separator).plus(file)
-
-        check(File(completePath).exists()) {
-            throw BluePrintException("couldn't find file ($completePath)")
-        }
-
-        // Perform Extension Validation
-        validateExtension("$type-artifact-definition-validator", name, artifactDefinition)
-
-        paths.removeAt(paths.lastIndex)
-    }
-
-    open fun checkValidArtifactType(artifactDefinitionName: String, artifactTypeName: String) {
-
-        val artifactType = bluePrintContext.serviceTemplate.artifactTypes?.get(artifactTypeName)
-            ?: throw BluePrintException("failed to get artifactType($artifactTypeName) for ArtifactDefinition($artifactDefinitionName)")
-
-        checkValidArtifactTypeDerivedFrom(artifactTypeName, artifactType.derivedFrom)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun checkValidArtifactTypeDerivedFrom(artifactTypeName: String, derivedFrom: String) {
-        check(BluePrintTypes.validArtifactTypeDerivedFroms.contains(derivedFrom)) {
-            throw BluePrintException("failed to get artifactType($artifactTypeName)'s derivedFrom($derivedFrom) definition")
-        }
-    }
-
-    private fun validateExtension(referencePrefix: String, name: String, artifactDefinition: ArtifactDefinition) {
-
-        val customValidators = bluePrintTypeValidatorService
-            .bluePrintValidators(referencePrefix, BluePrintArtifactDefinitionValidator::class.java)
-
-        customValidators?.let {
-            it.forEach { validator ->
-                validator.validate(bluePrintRuntimeService, name, artifactDefinition)
-            }
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactTypeValidatorImpl.kt
deleted file mode 100644
index b31211e2d..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintArtifactTypeValidatorImpl.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactType
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.springframework.stereotype.Service
-
-@Service("default-artifact-type-validator")
-open class BluePrintArtifactTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintArtifactTypeValidator {
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, artifactType: ArtifactType) {
-
-        artifactType.properties?.let {
-            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, artifactType.properties!!)
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintAttributeDefinitionValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintAttributeDefinitionValidatorImpl.kt
deleted file mode 100644
index 9a4650104..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintAttributeDefinitionValidatorImpl.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.data.AttributeDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.format
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-attribute-definition-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintAttributeDefinitionValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintAttributeDefinitionValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-
-    override fun validate(
-        bluePrintRuntimeService: BluePrintRuntimeService<*>,
-        name: String,
-        attributeDefinition: AttributeDefinition
-    ) {
-
-        log.trace("Validating AttributeDefinition($name)")
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-        val dataType: String = attributeDefinition.type
-
-        when {
-            BluePrintTypes.validPrimitiveTypes().contains(dataType) -> {
-                // Do Nothing
-            }
-            BluePrintTypes.validComplexTypes().contains(dataType) -> {
-                // Do Nothing
-            }
-            BluePrintTypes.validCollectionTypes().contains(dataType) -> {
-                val entrySchemaType: String = attributeDefinition.entrySchema?.type
-                    ?: throw BluePrintException("Entry schema for DataType ($dataType) for the property ($name) not found")
-                checkPrimitiveOrComplex(entrySchemaType, name)
-            }
-            else -> checkPropertyDataType(dataType, name)
-        }
-    }
-
-    private fun checkPrimitiveOrComplex(dataType: String, propertyName: String): Boolean {
-        if (BluePrintTypes.validPrimitiveTypes().contains(dataType) || checkDataType(dataType)) {
-            return true
-        } else {
-            throw BluePrintException("DataType($dataType) for the attribute($propertyName) is not valid")
-        }
-    }
-
-    private fun checkPropertyDataType(dataTypeName: String, propertyName: String) {
-
-        val dataType = bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.get(dataTypeName)
-            ?: throw BluePrintException(format("DataType ({}) for the property ({}) not found", dataTypeName, propertyName))
-
-        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
-    }
-
-    private fun checkDataType(key: String): Boolean {
-        return bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.containsKey(key) ?: false
-    }
-
-    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
-        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
-            throw BluePrintException("Failed to get DataType($dataTypeName)'s  derivedFrom($derivedFrom) definition ")
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDataTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDataTypeValidatorImpl.kt
deleted file mode 100644
index dab6a78bc..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDataTypeValidatorImpl.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.data.DataType
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintDataTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.springframework.stereotype.Service
-
-@Service("default-data-type-validator")
-open class BluePrintDataTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintDataTypeValidator {
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, dataType: DataType) {
-        dataType.properties?.let {
-
-            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, dataType.properties!!)
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorService.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorService.kt
deleted file mode 100644
index 5df2decdb..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorService.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDictionaryConstants
-import org.onap.ccsdk.cds.controllerblueprints.validation.extension.ResourceDefinitionValidator
-import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Service
-import java.io.File
-import java.util.UUID
-
-@Service("bluePrintDesignTimeValidatorService")
-open class BluePrintDesignTimeValidatorService(
-    private val bluePrintTypeValidatorService: BluePrintTypeValidatorService,
-    private val resourceDefinitionValidator: ResourceDefinitionValidator
-) :
-    BluePrintValidatorService {
-
-    private val log = LoggerFactory.getLogger(BluePrintDesignTimeValidatorService::class.toString())
-
-    override fun validateBluePrints(basePath: String): Boolean {
-
-        val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(UUID.randomUUID().toString(), basePath)
-        return validateBluePrints(bluePrintRuntimeService)
-    }
-
-    override fun validateBluePrints(bluePrintRuntimeService: BluePrintRuntimeService<*>): Boolean {
-
-        bluePrintTypeValidatorService.validateServiceTemplate(
-            bluePrintRuntimeService, "service_template",
-            bluePrintRuntimeService.bluePrintContext().serviceTemplate
-        )
-
-        // Validate Resource Definitions
-        validateResourceDefinitions(bluePrintRuntimeService)
-
-        if (bluePrintRuntimeService.getBluePrintError().errors.size > 0) {
-            throw BluePrintException("failed in blueprint validation : ${bluePrintRuntimeService.getBluePrintError().errors.joinToString("\n")}")
-        }
-        return true
-    }
-
-    private fun validateResourceDefinitions(bluePrintRuntimeService: BluePrintRuntimeService<*>) {
-        // Validate Resource Dictionary
-        val blueprintBasePath = bluePrintRuntimeService.bluePrintContext().rootPath
-
-        val resourceDefinitionsPath = blueprintBasePath.plus(File.separator)
-            .plus(BluePrintConstants.TOSCA_DEFINITIONS_DIR).plus(File.separator)
-            .plus("${ResourceDictionaryConstants.PATH_RESOURCE_DEFINITION_TYPE}.json")
-
-        val resourceDefinitionFile = File(resourceDefinitionsPath)
-
-        if (resourceDefinitionFile.exists()) {
-            val resourceDefinitionMap = JacksonUtils.getMapFromFile(resourceDefinitionFile, ResourceDefinition::class.java)
-
-            resourceDefinitionMap?.forEach { resourceDefinitionName, resourceDefinition ->
-                resourceDefinitionValidator.validate(bluePrintRuntimeService, resourceDefinitionName, resourceDefinition)
-            }
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTemplateValidatorImpl.kt
deleted file mode 100644
index 2dfc09be6..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTemplateValidatorImpl.kt
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018-2019 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.CapabilityAssignment
-import org.onap.ccsdk.cds.controllerblueprints.core.data.CapabilityDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.InterfaceAssignment
-import org.onap.ccsdk.cds.controllerblueprints.core.data.InterfaceDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.RequirementAssignment
-import org.onap.ccsdk.cds.controllerblueprints.core.data.RequirementDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.validation.utils.PropertyAssignmentValidationUtils
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-node-template-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintNodeTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintNodeTemplateValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintNodeTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-    lateinit var bluePrintContext: BluePrintContext
-    lateinit var propertyAssignmentValidationUtils: PropertyAssignmentValidationUtils
-    var paths: MutableList<String> = arrayListOf()
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, nodeTemplate: NodeTemplate) {
-        log.debug("Validating NodeTemplate($name)")
-
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-        this.bluePrintContext = bluePrintRuntimeService.bluePrintContext()
-
-        propertyAssignmentValidationUtils = PropertyAssignmentValidationUtils(bluePrintContext)
-
-        paths.add(name)
-
-        val type: String = nodeTemplate.type
-
-        val nodeType: NodeType = bluePrintContext.serviceTemplate.nodeTypes?.get(type)
-            ?: throw BluePrintException("Failed to get NodeType($type) definition for NodeTemplate($name)")
-
-        nodeTemplate.properties?.let {
-            propertyAssignmentValidationUtils
-                .validatePropertyAssignments(nodeType.properties!!, nodeTemplate.properties!!)
-        }
-        nodeTemplate.capabilities?.let { validateCapabilityAssignments(nodeType, name, nodeTemplate) }
-        nodeTemplate.requirements?.let { validateRequirementAssignments(nodeType, name, nodeTemplate) }
-        nodeTemplate.interfaces?.let { validateInterfaceAssignments(nodeType, name, nodeTemplate) }
-        nodeTemplate.artifacts?.let { validateArtifactDefinitions(nodeTemplate.artifacts!!) }
-
-        // Perform Extension Validation
-        validateExtension("$type-node-template-validator", name, nodeTemplate)
-
-        paths.removeAt(paths.lastIndex)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateArtifactDefinitions(artifacts: MutableMap<String, ArtifactDefinition>) {
-        paths.add("artifacts")
-        artifacts.forEach { artifactDefinitionName, artifactDefinition ->
-            bluePrintTypeValidatorService.validateArtifactDefinition(
-                bluePrintRuntimeService,
-                artifactDefinitionName, artifactDefinition
-            )
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateCapabilityAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
-        val capabilities = nodeTemplate.capabilities
-        paths.add("capabilities")
-        capabilities?.forEach { capabilityName, capabilityAssignment ->
-            paths.add(capabilityName)
-
-            val capabilityDefinition = nodeType.capabilities?.get(capabilityName)
-                ?: throw BluePrintException(
-                    "Failed to get NodeTemplate($nodeTemplateName) capability definition ($capabilityName) " +
-                            "from NodeType(${nodeTemplate.type})"
-                )
-
-            validateCapabilityAssignment(nodeTemplateName, capabilityName, capabilityDefinition, capabilityAssignment)
-
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateCapabilityAssignment(
-        nodeTemplateName: String,
-        capabilityName: String,
-        capabilityDefinition: CapabilityDefinition,
-        capabilityAssignment: CapabilityAssignment
-    ) {
-
-        capabilityAssignment.properties?.let {
-            propertyAssignmentValidationUtils
-                .validatePropertyAssignments(capabilityDefinition.properties!!, capabilityAssignment.properties!!)
-        }
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateRequirementAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
-        val requirements = nodeTemplate.requirements
-        paths.add("requirements")
-        requirements?.forEach { requirementName, requirementAssignment ->
-            paths.add(requirementName)
-            val requirementDefinition = nodeType.requirements?.get(requirementName)
-                ?: throw BluePrintException(
-                    "Failed to get NodeTemplate($nodeTemplateName) requirement definition ($requirementName) from" +
-                            " NodeType(${nodeTemplate.type})"
-                )
-            // Validate Requirement Assignment
-            validateRequirementAssignment(nodeTemplateName, requirementName, requirementDefinition, requirementAssignment)
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateRequirementAssignment(
-        nodeTemplateName: String,
-        requirementAssignmentName: String,
-        requirementDefinition: RequirementDefinition,
-        requirementAssignment: RequirementAssignment
-    ) {
-        log.debug(
-            "Validating NodeTemplate({}) requirement assignment ({}) ", nodeTemplateName,
-            requirementAssignmentName
-        )
-        val requirementNodeTemplateName = requirementAssignment.node!!
-        val capabilityName = requirementAssignment.capability
-        val relationship = requirementAssignment.relationship!!
-
-        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {
-            throw BluePrintException("Failed to get relationship type ($relationship) for NodeTemplate($nodeTemplateName)'s requirement($requirementAssignmentName)")
-        }
-
-        val relationShipNodeTemplate = bluePrintContext.serviceTemplate.topologyTemplate?.nodeTemplates?.get(requirementNodeTemplateName)
-            ?: throw BluePrintException(
-                "Failed to get requirement NodeTemplate($requirementNodeTemplateName)'s " +
-                        "for NodeTemplate($nodeTemplateName) requirement($requirementAssignmentName)"
-            )
-
-        relationShipNodeTemplate.capabilities?.get(capabilityName)
-            ?: throw BluePrintException(
-                "Failed to get requirement NodeTemplate($requirementNodeTemplateName)'s " +
-                        "capability($capabilityName) for NodeTemplate ($nodeTemplateName)'s requirement($requirementAssignmentName)"
-            )
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateInterfaceAssignments(nodeType: NodeType, nodeTemplateName: String, nodeTemplate: NodeTemplate) {
-
-        val interfaces = nodeTemplate.interfaces
-        paths.add("interfaces")
-        interfaces?.forEach { interfaceAssignmentName, interfaceAssignment ->
-            paths.add(interfaceAssignmentName)
-            val interfaceDefinition = nodeType.interfaces?.get(interfaceAssignmentName)
-                ?: throw BluePrintException(
-                    "Failed to get NodeTemplate($nodeTemplateName) interface definition ($interfaceAssignmentName) from" +
-                            " NodeType(${nodeTemplate.type})"
-                )
-
-            validateInterfaceAssignment(
-                nodeTemplateName, interfaceAssignmentName, interfaceDefinition,
-                interfaceAssignment
-            )
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateInterfaceAssignment(
-        nodeTemplateName: String,
-        interfaceAssignmentName: String,
-        interfaceDefinition: InterfaceDefinition,
-        interfaceAssignment: InterfaceAssignment
-    ) {
-
-        val operations = interfaceAssignment.operations
-        operations?.let {
-            validateInterfaceOperationsAssignment(
-                nodeTemplateName, interfaceAssignmentName, interfaceDefinition,
-                interfaceAssignment
-            )
-        }
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateInterfaceOperationsAssignment(
-        nodeTemplateName: String,
-        interfaceAssignmentName: String,
-        interfaceDefinition: InterfaceDefinition,
-        interfaceAssignment: InterfaceAssignment
-    ) {
-
-        val operations = interfaceAssignment.operations
-        operations?.let {
-            it.forEach { operationAssignmentName, operationAssignments ->
-
-                val operationDefinition = interfaceDefinition.operations?.get(operationAssignmentName)
-                    ?: throw BluePrintException("Failed to get NodeTemplate($nodeTemplateName) operation definition ($operationAssignmentName)")
-
-                log.debug(
-                    "Validation NodeTemplate($nodeTemplateName) Interface($interfaceAssignmentName) Operation " +
-                            "($operationAssignmentName)"
-                )
-
-                val inputs = operationAssignments.inputs
-                val outputs = operationAssignments.outputs
-
-                inputs?.forEach { propertyName, propertyAssignment ->
-                    val propertyDefinition = operationDefinition.inputs?.get(propertyName)
-                        ?: throw BluePrintException(
-                            "Failed to get NodeTemplate($nodeTemplateName) operation " +
-                                    "definition ($operationAssignmentName) property definition($propertyName)"
-                        )
-                    // Check the property values with property definition
-                    propertyAssignmentValidationUtils
-                        .validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
-                }
-
-                outputs?.forEach { propertyName, propertyAssignment ->
-                    val propertyDefinition = operationDefinition.outputs?.get(propertyName)
-                        ?: throw BluePrintException(
-                            "Failed to get NodeTemplate($nodeTemplateName) operation definition ($operationAssignmentName) " +
-                                    "output property definition($propertyName)"
-                        )
-                    // Check the property values with property definition
-                    propertyAssignmentValidationUtils
-                        .validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
-                }
-            }
-        }
-    }
-
-    private fun validateExtension(referencePrefix: String, name: String, nodeTemplate: NodeTemplate) {
-        val customValidator = bluePrintTypeValidatorService
-            .bluePrintValidator(referencePrefix, BluePrintNodeTemplateValidator::class.java)
-
-        customValidator?.let {
-            it.validate(bluePrintRuntimeService, name, nodeTemplate)
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTypeValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTypeValidatorImpl.kt
deleted file mode 100644
index 5384744ee..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintNodeTypeValidatorImpl.kt
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.checkNotEmpty
-import org.onap.ccsdk.cds.controllerblueprints.core.data.CapabilityDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Implementation
-import org.onap.ccsdk.cds.controllerblueprints.core.data.InterfaceDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.OperationDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.RequirementDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-node-type-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintNodeTypeValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintNodeTypeValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-    lateinit var bluePrintContext: BluePrintContext
-    var paths: MutableList<String> = arrayListOf()
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, nodeTypeName: String, nodeType: NodeType) {
-        log.trace("Validating NodeType($nodeTypeName)")
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-        this.bluePrintContext = bluePrintRuntimeService.bluePrintContext()
-
-        paths.add(nodeTypeName)
-
-        val derivedFrom: String = nodeType.derivedFrom
-        // Check Derived From
-        checkValidNodeTypesDerivedFrom(nodeTypeName, derivedFrom)
-
-        if (!BluePrintTypes.rootNodeTypes().contains(derivedFrom)) {
-            bluePrintContext.serviceTemplate.nodeTypes?.get(derivedFrom)
-                ?: throw BluePrintException("Failed to get derivedFrom NodeType($derivedFrom)'s for NodeType($nodeTypeName)")
-        }
-
-        nodeType.attributes?.let {
-            bluePrintTypeValidatorService.validateAttributeDefinitions(bluePrintRuntimeService, nodeType.attributes!!)
-        }
-
-        nodeType.properties?.let {
-            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, nodeType.properties!!)
-        }
-
-        nodeType.capabilities?.let { validateCapabilityDefinitions(nodeTypeName, nodeType) }
-        nodeType.requirements?.let { validateRequirementDefinitions(nodeTypeName, nodeType) }
-        nodeType.interfaces?.let { validateInterfaceDefinitions(nodeType.interfaces!!) }
-
-        paths.removeAt(paths.lastIndex)
-    }
-
-    fun checkValidNodeTypesDerivedFrom(nodeTypeName: String, derivedFrom: String) {
-        check(BluePrintTypes.validNodeTypeDerivedFroms.contains(derivedFrom)) {
-            throw BluePrintException("Failed to get node type ($nodeTypeName)'s  derivedFrom($derivedFrom) definition ")
-        }
-    }
-
-    open fun validateCapabilityDefinitions(nodeTypeName: String, nodeType: NodeType) {
-        val capabilities = nodeType.capabilities
-        paths.add("capabilities")
-        capabilities?.forEach { capabilityName, capabilityDefinition ->
-            paths.add(capabilityName)
-
-            validateCapabilityDefinition(nodeTypeName, nodeType, capabilityName, capabilityDefinition)
-
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    open fun validateCapabilityDefinition(
-        nodeTypeName: String,
-        nodeType: NodeType,
-        capabilityName: String,
-        capabilityDefinition: CapabilityDefinition
-    ) {
-        val capabilityType = capabilityDefinition.type
-        check(BluePrintTypes.validCapabilityTypes.contains(capabilityType)) {
-            throw BluePrintException("failed to get CapabilityType($capabilityType) for NodeType($nodeTypeName)")
-        }
-    }
-
-    open fun validateRequirementDefinitions(nodeName: String, nodeType: NodeType) {
-        paths.add("requirements")
-        val requirements = nodeType.requirements
-
-        requirements?.forEach { requirementDefinitionName, requirementDefinition ->
-            paths.add(requirementDefinitionName)
-            validateRequirementDefinition(nodeName, nodeType, requirementDefinitionName, requirementDefinition)
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    open fun validateRequirementDefinition(
-        nodeTypeName: String,
-        nodeType: NodeType,
-        requirementDefinitionName: String,
-        requirementDefinition: RequirementDefinition
-    ) {
-
-        log.info("validating NodeType({}) RequirementDefinition ({}) ", nodeTypeName, requirementDefinitionName)
-        val requirementNodeTypeName = requirementDefinition.node!!
-        val capabilityName = requirementDefinition.capability
-        val relationship = requirementDefinition.relationship!!
-
-        check(BluePrintTypes.validRelationShipDerivedFroms.contains(relationship)) {
-            throw BluePrintException("failed to get relationship($relationship) for NodeType($nodeTypeName)'s requirement($requirementDefinitionName)")
-        }
-
-        val relationShipNodeType = bluePrintContext.serviceTemplate.nodeTypes?.get(requirementNodeTypeName)
-            ?: throw BluePrintException("failed to get requirement NodeType($requirementNodeTypeName)'s for requirement($requirementDefinitionName) ")
-
-        relationShipNodeType.capabilities?.get(capabilityName)
-            ?: throw BluePrintException(
-                "failed to get requirement NodeType($requirementNodeTypeName)'s " +
-                        "capability($nodeTypeName) for NodeType ($capabilityName)'s requirement($requirementDefinitionName) "
-            )
-    }
-
-    open fun validateInterfaceDefinitions(interfaces: MutableMap<String, InterfaceDefinition>) {
-        paths.add("interfaces")
-        interfaces.forEach { interfaceName, interfaceDefinition ->
-            paths.add(interfaceName)
-            interfaceDefinition.operations?.let { validateOperationDefinitions(interfaceDefinition.operations!!) }
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    open fun validateOperationDefinitions(operations: MutableMap<String, OperationDefinition>) {
-        paths.add("operations")
-        operations.forEach { opertaionName, operationDefinition ->
-            paths.add(opertaionName)
-            operationDefinition.implementation?.let { validateImplementation(operationDefinition.implementation!!) }
-
-            operationDefinition.inputs?.let {
-                bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, operationDefinition.inputs!!)
-            }
-
-            operationDefinition.outputs?.let {
-                bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, operationDefinition.outputs!!)
-            }
-            paths.removeAt(paths.lastIndex)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    open fun validateImplementation(implementation: Implementation) {
-        checkNotEmpty(implementation.primary) { "couldn't get implementation" }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintPropertyDefinitionValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintPropertyDefinitionValidatorImpl.kt
deleted file mode 100644
index 5683c0170..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintPropertyDefinitionValidatorImpl.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.format
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-property-definition-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintPropertyDefinitionValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintPropertyDefinitionValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, propertyDefinition: PropertyDefinition) {
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-
-        log.trace("Validating PropertyDefinition($name)")
-
-        val dataType: String = propertyDefinition.type
-
-        when {
-            BluePrintTypes.validPrimitiveTypes().contains(dataType) -> {
-                // Do Nothing
-            }
-            BluePrintTypes.validComplexTypes().contains(dataType) -> {
-                // Do Nothing
-            }
-            BluePrintTypes.validCollectionTypes().contains(dataType) -> {
-                val entrySchemaType: String = propertyDefinition.entrySchema?.type
-                    ?: throw BluePrintException(format("Entry schema for DataType ({}) for the property ({}) not found", dataType, name))
-                checkPrimitiveOrComplex(entrySchemaType, name)
-            }
-            else -> checkPropertyDataType(dataType, name)
-        }
-    }
-
-    private fun checkPrimitiveOrComplex(dataType: String, propertyName: String): Boolean {
-        if (BluePrintTypes.validPrimitiveTypes().contains(dataType) || checkDataType(dataType)) {
-            return true
-        } else {
-            throw BluePrintException(format("DataType({}) for the property({}) is not valid", dataType, propertyName))
-        }
-    }
-
-    private fun checkPropertyDataType(dataTypeName: String, propertyName: String) {
-
-        val dataType = bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.get(dataTypeName)
-            ?: throw BluePrintException(format("DataType ({}) for the property ({}) not found", dataTypeName, propertyName))
-
-        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
-    }
-
-    private fun checkDataType(key: String): Boolean {
-        return bluePrintRuntimeService.bluePrintContext().serviceTemplate.dataTypes?.containsKey(key) ?: false
-    }
-
-    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
-        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
-            throw BluePrintException(format("Failed to get DataType({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintServiceTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintServiceTemplateValidatorImpl.kt
deleted file mode 100644
index d71e78c43..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintServiceTemplateValidatorImpl.kt
+++ /dev/null
@@ -1,115 +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.cds.controllerblueprints.validation
-
-import com.google.common.base.Preconditions
-import org.apache.commons.lang3.StringUtils
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintError
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.DataType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.TopologyTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintServiceTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-service-template-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintServiceTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintServiceTemplateValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-    lateinit var error: BluePrintError
-
-    var paths: MutableList<String> = arrayListOf()
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, serviceTemplate: ServiceTemplate) {
-        log.trace("Validating Service Template..")
-        try {
-            this.bluePrintRuntimeService = bluePrintRuntimeService
-            this.error = bluePrintRuntimeService.getBluePrintError()
-
-            serviceTemplate.metadata?.let { validateMetadata(serviceTemplate.metadata!!) }
-            serviceTemplate.dataTypes?.let { validateDataTypes(serviceTemplate.dataTypes!!) }
-            serviceTemplate.artifactTypes?.let { validateArtifactTypes(serviceTemplate.artifactTypes!!) }
-            serviceTemplate.nodeTypes?.let { validateNodeTypes(serviceTemplate.nodeTypes!!) }
-            serviceTemplate.topologyTemplate?.let { validateTopologyTemplate(serviceTemplate.topologyTemplate!!) }
-        } catch (e: Exception) {
-            log.error("failed in blueprint service template validation", e)
-            error.addError(BluePrintConstants.PATH_SERVICE_TEMPLATE, paths.joinToString(BluePrintConstants.PATH_DIVIDER), e.message!!)
-        }
-    }
-
-    fun validateMetadata(metaDataMap: MutableMap<String, String>) {
-
-        paths.add(BluePrintConstants.PATH_METADATA)
-
-        val templateName = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_NAME]
-        val templateVersion = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_VERSION]
-        val templateTags = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_TAGS]
-        val templateAuthor = metaDataMap[BluePrintConstants.METADATA_TEMPLATE_AUTHOR]
-
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateName), "failed to get template name metadata")
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateVersion), "failed to get template version metadata")
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateTags), "failed to get template tags metadata")
-        Preconditions.checkArgument(StringUtils.isNotBlank(templateAuthor), "failed to get template author metadata")
-
-        paths.removeAt(paths.lastIndex)
-    }
-
-    fun validateDataTypes(dataTypes: MutableMap<String, DataType>) {
-
-        paths.add(BluePrintConstants.PATH_DATA_TYPES)
-        dataTypes.forEach { dataTypeName, dataType ->
-            // Validate Single Data Type
-            bluePrintTypeValidatorService.validateDataType(bluePrintRuntimeService, dataTypeName, dataType)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    fun validateArtifactTypes(artifactTypes: MutableMap<String, ArtifactType>) {
-        paths.add(BluePrintConstants.PATH_ARTIFACT_TYPES)
-        artifactTypes.forEach { artifactName, artifactType ->
-            // Validate Single Artifact Type
-            bluePrintTypeValidatorService.validateArtifactType(bluePrintRuntimeService, artifactName, artifactType)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    fun validateNodeTypes(nodeTypes: MutableMap<String, NodeType>) {
-        paths.add(BluePrintConstants.PATH_NODE_TYPES)
-        nodeTypes.forEach { nodeTypeName, nodeType ->
-            // Validate Single Node Type
-            bluePrintTypeValidatorService.validateNodeType(bluePrintRuntimeService, nodeTypeName, nodeType)
-        }
-        paths.removeAt(paths.lastIndex)
-    }
-
-    fun validateTopologyTemplate(topologyTemplate: TopologyTemplate) {
-        paths.add(BluePrintConstants.PATH_TOPOLOGY_TEMPLATE)
-        bluePrintTypeValidatorService.validateTopologyTemplate(bluePrintRuntimeService, "topologyTemplate", topologyTemplate)
-        paths.removeAt(paths.lastIndex)
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTopologyTemplateValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTopologyTemplateValidatorImpl.kt
deleted file mode 100644
index a7fb3d57e..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTopologyTemplateValidatorImpl.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.data.TopologyTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Workflow
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTopologyTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-topology-template-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintTopologyTemplateValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintTopologyTemplateValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, name: String, topologyTemplate: TopologyTemplate) {
-        log.trace("Validating Topology Template..")
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-
-        // Validate Inputs
-        topologyTemplate.inputs?.let { validateInputs(topologyTemplate.inputs!!) }
-        // Validate Node Templates
-        topologyTemplate.nodeTemplates?.let { validateNodeTemplates(topologyTemplate.nodeTemplates!!) }
-        // Validate Workflow
-        topologyTemplate.workflows?.let { validateWorkflows(topologyTemplate.workflows!!) }
-    }
-
-    @Throws(BluePrintException::class)
-    fun validateInputs(inputs: MutableMap<String, PropertyDefinition>) {
-        bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, inputs)
-    }
-
-    @Throws(BluePrintException::class)
-    fun validateNodeTemplates(nodeTemplates: MutableMap<String, NodeTemplate>) {
-
-        nodeTemplates.forEach { nodeTemplateName, nodeTemplate ->
-            // Validate Single Node Template
-            bluePrintTypeValidatorService.validateNodeTemplate(bluePrintRuntimeService, nodeTemplateName, nodeTemplate)
-        }
-    }
-
-    @Throws(BluePrintException::class)
-    open fun validateWorkflows(workflows: MutableMap<String, Workflow>) {
-
-        workflows.forEach { workflowName, workflow ->
-            // Validate Single workflow
-            bluePrintTypeValidatorService.validateWorkflow(bluePrintRuntimeService, workflowName, workflow)
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTypeValidatorServiceImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTypeValidatorServiceImpl.kt
deleted file mode 100644
index 1fb70503f..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintTypeValidatorServiceImpl.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintDataTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintServiceTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTopologyTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintWorkflowValidator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.context.ApplicationContext
-import org.springframework.stereotype.Service
-
-@Service
-class BluePrintTypeValidatorServiceImpl : BluePrintTypeValidatorService {
-
-    companion object {
-        const val PREFIX_DEFAULT = "default"
-    }
-
-    @Autowired
-    private lateinit var context: ApplicationContext
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidator(referenceName: String, classType: Class<T>): T? {
-        return if (context.containsBean(referenceName)) {
-            context.getBean(referenceName, classType)
-        } else {
-            null
-        }
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(referenceNamePrefix: String, classType: Class<T>): List<T>? {
-        return context.getBeansOfType(classType)
-            .filter { it.key.startsWith(referenceNamePrefix) }
-            .mapNotNull { it.value }
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(classType: Class<T>): List<T>? {
-        return context.getBeansOfType(classType).mapNotNull { it.value }
-    }
-
-    override fun getServiceTemplateValidators(): List<BluePrintServiceTemplateValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintServiceTemplateValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default ServiceTemplate validators")
-    }
-
-    override fun getDataTypeValidators(): List<BluePrintDataTypeValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintDataTypeValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default DataType validators")
-    }
-
-    override fun getArtifactTypeValidators(): List<BluePrintArtifactTypeValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintArtifactTypeValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default ArtifactType validators")
-    }
-
-    override fun getArtifactDefinitionsValidators(): List<BluePrintArtifactDefinitionValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintArtifactDefinitionValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default ArtifactDefinition validators")
-    }
-
-    override fun getNodeTypeValidators(): List<BluePrintNodeTypeValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintNodeTypeValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default NodeType validators")
-    }
-
-    override fun getTopologyTemplateValidators(): List<BluePrintTopologyTemplateValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintTopologyTemplateValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default TopologyTemplate validators")
-    }
-
-    override fun getNodeTemplateValidators(): List<BluePrintNodeTemplateValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintNodeTemplateValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default NodeTemplate validators")
-    }
-
-    override fun getWorkflowValidators(): List<BluePrintWorkflowValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintWorkflowValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default Workflow validators")
-    }
-
-    override fun getPropertyDefinitionValidators(): List<BluePrintPropertyDefinitionValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintPropertyDefinitionValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default PropertyDefinition validators")
-    }
-
-    override fun getAttributeDefinitionValidators(): List<BluePrintAttributeDefinitionValidator> {
-        return bluePrintValidators(PREFIX_DEFAULT, BluePrintAttributeDefinitionValidator::class.java)
-            ?: throw BluePrintProcessorException("failed to get default AttributeDefinition validators")
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintValidationConfiguration.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintValidationConfiguration.kt
deleted file mode 100644
index a1a9eb913..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintValidationConfiguration.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Copyright © 2019 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.cds.controllerblueprints.validation
-
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-@ComponentScan
-open class BluePrintValidationConfiguration
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt
deleted file mode 100644
index a2b598017..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2019 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Workflow
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintWorkflowValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.validation.utils.PropertyAssignmentValidationUtils
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-@Service("default-workflow-validator")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class BluePrintWorkflowValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : BluePrintWorkflowValidator {
-
-    private val log = LoggerFactory.getLogger(BluePrintServiceTemplateValidatorImpl::class.toString())
-    lateinit var bluePrintRuntimeService: BluePrintRuntimeService<*>
-
-    var paths: MutableList<String> = arrayListOf()
-
-    override fun validate(bluePrintRuntimeService: BluePrintRuntimeService<*>, workflowName: String, workflow: Workflow) {
-        log.info("Validating Workflow($workflowName)")
-
-        this.bluePrintRuntimeService = bluePrintRuntimeService
-
-        paths.add(workflowName)
-        paths.joinToString(BluePrintConstants.PATH_DIVIDER)
-
-        // Validate Workflow Inputs
-        validateInputs(workflow)
-
-        // Validate Workflow outputs
-        validateOutputs(workflow)
-
-        // Step Validation Start
-        paths.add("steps")
-        workflow.steps?.forEach { stepName, step ->
-            paths.add(stepName)
-            paths.joinToString(BluePrintConstants.PATH_DIVIDER)
-
-            // Validate target
-            step.target?.let {
-                try {
-                    val nodeTemplate = bluePrintRuntimeService.bluePrintContext().nodeTemplateByName(it)
-
-                    val nodeTypeDerivedFrom = bluePrintRuntimeService.bluePrintContext().nodeTemplateNodeType(it).derivedFrom
-
-                    check(
-                        nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW ||
-                                nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_COMPONENT
-                    ) {
-                        "NodeType(${nodeTemplate.type}) derived from is '$nodeTypeDerivedFrom', Expected " +
-                                "'${BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW}' or '${BluePrintConstants.MODEL_TYPE_NODE_COMPONENT}'"
-                    }
-                } catch (e: Exception) {
-                    bluePrintRuntimeService.getBluePrintError()
-                        .addError(
-                            "Failed to validate Workflow($workflowName)'s step($stepName)'s " +
-                                    "definition", paths.joinToString(BluePrintConstants.PATH_DIVIDER), e.message!!
-                        )
-                }
-            }
-        }
-        paths.removeAt(paths.lastIndex)
-        // Step Validation Ends
-        paths.removeAt(paths.lastIndex)
-
-        paths.removeAt(paths.lastIndex)
-    }
-
-    private fun validateInputs(workflow: Workflow) {
-        workflow.inputs?.let {
-            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, workflow.inputs!!)
-        }
-    }
-
-    private fun validateOutputs(workflow: Workflow) {
-        workflow.outputs?.let {
-
-            bluePrintTypeValidatorService.validatePropertyDefinitions(bluePrintRuntimeService, workflow.outputs!!)
-
-            PropertyAssignmentValidationUtils(bluePrintRuntimeService.bluePrintContext())
-                .validatePropertyDefinitionNAssignments(workflow.outputs!!)
-        }
-        // Validate Value or Expression
-        workflow.outputs?.forEach { propertyName, propertyDefinition ->
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ArtifactMappingResourceValidator.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ArtifactMappingResourceValidator.kt
deleted file mode 100644
index 78a5d379e..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ArtifactMappingResourceValidator.kt
+++ /dev/null
@@ -1,50 +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.cds.controllerblueprints.validation.extension
-
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ArtifactDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.service.ResourceAssignmentValidationServiceImpl
-import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Service
-import java.io.File
-
-@Service("artifact-mapping-resource-artifact-definition-validator")
-open class ArtifactMappingResourceValidator(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) :
-    BluePrintArtifactDefinitionValidator {
-
-    private val log = LoggerFactory.getLogger(ArtifactMappingResourceValidator::class.toString())
-
-    override fun validate(
-        bluePrintRuntimeService: BluePrintRuntimeService<*>,
-        name: String,
-        artifactDefinition: ArtifactDefinition
-    ) {
-
-        val bluePrintContext = bluePrintRuntimeService.bluePrintContext()
-        val file: String = artifactDefinition.file
-        val completePath = bluePrintContext.rootPath.plus(File.separator).plus(file)
-        log.trace("Validation artifact-mapping-resource($completePath)")
-        val resourceAssignment = JacksonUtils.getListFromFile(completePath, ResourceAssignment::class.java)
-        val resourceAssignmentValidationService = ResourceAssignmentValidationServiceImpl()
-        resourceAssignmentValidationService.validate(resourceAssignment)
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ResourceDefinitionValidation.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ResourceDefinitionValidation.kt
deleted file mode 100644
index dc5da2669..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/extension/ResourceDefinitionValidation.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright © 2019 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.cds.controllerblueprints.validation.extension
-
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
-import org.springframework.context.annotation.Scope
-import org.springframework.stereotype.Service
-
-interface ResourceDefinitionValidator : BluePrintValidator<ResourceDefinition>
-
-@Service
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-open class ResourceDefinitionValidatorImpl(private val bluePrintTypeValidatorService: BluePrintTypeValidatorService) : ResourceDefinitionValidator {
-
-    private val log = LoggerFactory.getLogger(ResourceDefinitionValidatorImpl::class.java)
-
-    override fun validate(
-        bluePrintRuntimeService: BluePrintRuntimeService<*>,
-        name: String,
-        resourceDefinition: ResourceDefinition
-    ) {
-        log.trace("validating resource definition($name)")
-        resourceDefinition.sources.forEach { name, nodeTemplate ->
-            bluePrintTypeValidatorService.validateNodeTemplate(bluePrintRuntimeService, name, nodeTemplate)
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/utils/PropertyAssignmentValidationUtils.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/utils/PropertyAssignmentValidationUtils.kt
deleted file mode 100644
index 63aa7e537..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/utils/PropertyAssignmentValidationUtils.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *  Modifications Copyright © 2019 Bell Canada.
- *
- *  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.cds.controllerblueprints.validation.utils
-
-import com.fasterxml.jackson.databind.JsonNode
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes
-import org.onap.ccsdk.cds.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.cds.controllerblueprints.core.format
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintExpressionService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-
-open class PropertyAssignmentValidationUtils(private val bluePrintContext: BluePrintContext) {
-
-    // Property Definition holds both Definitons and Expression in same construct
-    open fun validatePropertyDefinitionNAssignments(propertyDefinitions: MutableMap<String, PropertyDefinition>) {
-        propertyDefinitions.forEach { propertyName, propertyDefinition ->
-            validatePropertyDefinitionNAssignment(propertyName, propertyDefinition)
-        }
-    }
-
-    // Property Definition holds both Definitons and Expression in same construct
-    open fun validatePropertyDefinitionNAssignment(propertyName: String, propertyDefinition: PropertyDefinition) {
-        // Check and Validate if Expression Node
-        checkNotNull(propertyDefinition.value) {
-            throw BluePrintException("couldn't get 'value' property from PropertyDefinition($propertyName)")
-        }
-        val propertyAssignment = propertyDefinition.value!!
-        val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)
-        if (!expressionData.isExpression) {
-            checkPropertyValue(propertyName, propertyDefinition, propertyAssignment)
-        }
-    }
-
-    open fun validatePropertyAssignments(
-        nodeTypeProperties: MutableMap<String, PropertyDefinition>,
-        properties: MutableMap<String, JsonNode>
-    ) {
-        properties.forEach { propertyName, propertyAssignment ->
-            val propertyDefinition: PropertyDefinition = nodeTypeProperties[propertyName]
-                ?: throw BluePrintException("validatePropertyAssignments failed to get definition for the property ($propertyName)")
-
-            validatePropertyAssignment(propertyName, propertyDefinition, propertyAssignment)
-        }
-    }
-
-    open fun validatePropertyAssignment(
-        propertyName: String,
-        propertyDefinition: PropertyDefinition,
-        propertyAssignment: JsonNode
-    ) {
-        // Check and Validate if Expression Node
-        val expressionData = BluePrintExpressionService.getExpressionData(propertyAssignment)
-        if (!expressionData.isExpression) {
-            checkPropertyValue(propertyName, propertyDefinition, propertyAssignment)
-        }
-    }
-
-    open fun checkPropertyValue(propertyName: String, propertyDefinition: PropertyDefinition, propertyAssignment: JsonNode) {
-        val propertyType = propertyDefinition.type
-        val isValid: Boolean
-
-        if (BluePrintTypes.validPrimitiveTypes().contains(propertyType)) {
-            isValid = JacksonUtils.checkJsonNodeValueOfPrimitiveType(propertyType, propertyAssignment)
-        } else if (BluePrintTypes.validComplexTypes().contains(propertyType)) {
-            isValid = true
-        } else if (BluePrintTypes.validCollectionTypes().contains(propertyType)) {
-
-            val entrySchemaType = propertyDefinition.entrySchema?.type
-                ?: throw BluePrintException(format("Failed to get EntrySchema type for the collection property ({})", propertyName))
-
-            if (!BluePrintTypes.validPropertyTypes().contains(entrySchemaType)) {
-                checkPropertyDataType(entrySchemaType, propertyName)
-            }
-            isValid = JacksonUtils.checkJsonNodeValueOfCollectionType(propertyType, propertyAssignment)
-        } else {
-            checkPropertyDataType(propertyType, propertyName)
-            isValid = true
-        }
-
-        check(isValid) {
-            throw BluePrintException("property($propertyName) defined of type($propertyType) is not compatible with the value ($propertyAssignment)")
-        }
-    }
-
-    open fun checkPropertyDataType(dataTypeName: String, propertyName: String) {
-
-        val dataType = bluePrintContext.serviceTemplate.dataTypes?.get(dataTypeName)
-            ?: throw BluePrintException("DataType ($dataTypeName) for the property ($propertyName) not found")
-
-        checkValidDataTypeDerivedFrom(propertyName, dataType.derivedFrom)
-    }
-
-    open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {
-        check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {
-            throw BluePrintException("Failed to get DataType($dataTypeName)'s  derivedFrom($derivedFrom) definition ")
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
deleted file mode 100644
index 375bd8eae..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2019 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.cds.controllerblueprints.validation
-
-import io.mockk.every
-import io.mockk.mockk
-import org.junit.Test
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintError
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeTemplate
-import org.onap.ccsdk.cds.controllerblueprints.core.data.NodeType
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Step
-import org.onap.ccsdk.cds.controllerblueprints.core.data.Workflow
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.DefaultBluePrintRuntimeService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
-import org.onap.ccsdk.cds.controllerblueprints.validation.extension.ResourceDefinitionValidator
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class BluePrintDesignTimeValidatorServiceTest {
-
-    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
-    private val bluePrintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
-    private val mockBluePrintTypeValidatorService = MockBluePrintTypeValidatorService()
-    private val resourceDefinitionValidator = mockk<ResourceDefinitionValidator>()
-    private val defaultBluePrintValidatorService = BluePrintDesignTimeValidatorService(mockBluePrintTypeValidatorService, resourceDefinitionValidator)
-    private val workflowValidator = BluePrintWorkflowValidatorImpl(mockBluePrintTypeValidatorService)
-
-    @Test
-    fun testValidateOfType() {
-        every { resourceDefinitionValidator.validate(bluePrintRuntime, any(), any()) } returns Unit
-
-        val valid = defaultBluePrintValidatorService.validateBluePrints(bluePrintRuntime)
-        assertTrue(valid, "failed in blueprint Validation")
-    }
-
-    @Test
-    fun testValidateWorkflowFailToFoundNodeTemplate() {
-        val workflowName = "resource-assignment"
-
-        val step = Step()
-        step.target = "TestCaseFailNoNodeTemplate"
-        val workflow = Workflow()
-        workflow.steps = mutableMapOf("test" to step)
-        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
-
-        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
-        assertEquals(
-            "Failed to validate Workflow(resource-assignment)'s step(test)'s definition : resource-assignment/steps/test : could't get node template for the name(TestCaseFailNoNodeTemplate)",
-            bluePrintRuntime.getBluePrintError().errors[0]
-        )
-    }
-
-    @Test
-    fun testValidateWorkflowFailNodeTemplateNotDgGeneric() {
-        val workflowName = "resource-assignment"
-        val nodeTemplateName = "resource-assignment-process"
-
-        val nodeTemplate = mockk<NodeTemplate>()
-        every { nodeTemplate.type } returns "TestNodeType"
-
-        val nodeType = mockk<NodeType>()
-        every { nodeType.derivedFrom } returns "tosca.nodes.TEST"
-
-        val blueprintContext = mockk<BluePrintContext>()
-        every { blueprintContext.nodeTemplateByName(nodeTemplateName) } returns nodeTemplate
-        every { blueprintContext.nodeTemplateNodeType(nodeTemplateName) } returns nodeType
-
-        val bluePrintRuntime = mockk<DefaultBluePrintRuntimeService>("1234")
-
-        every { bluePrintRuntime.getBluePrintError() } returns BluePrintError()
-        every { bluePrintRuntime.bluePrintContext() } returns blueprintContext
-
-        val step = Step()
-        step.target = nodeTemplateName
-        val workflow = Workflow()
-        workflow.steps = mutableMapOf("test" to step)
-        workflowValidator.validate(bluePrintRuntime, workflowName, workflow)
-
-        assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
-        assertEquals(
-            "Failed to validate Workflow(resource-assignment)'s step(test)'s definition : " +
-                    "resource-assignment/steps/test : NodeType(TestNodeType) derived from is 'tosca.nodes.TEST', " +
-                    "Expected 'tosca.nodes.Workflow' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0]
-        )
-    }
-
-    @Test
-    fun testValidateWorkflowSuccess() {
-        val workflowName = "resource-assignment"
-        workflowValidator.validate(bluePrintRuntime, workflowName, bluePrintRuntime.bluePrintContext().workflowByName(workflowName))
-    }
-}
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt
deleted file mode 100644
index 11c6c037c..000000000
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/MockBluePrintTypeValidatorService.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications 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.cds.controllerblueprints.validation
-
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintArtifactTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintAttributeDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintDataTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintNodeTypeValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintPropertyDefinitionValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintServiceTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTopologyTemplateValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidator
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintWorkflowValidator
-
-class MockBluePrintTypeValidatorService : BluePrintTypeValidatorService {
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidator(referenceName: String, classType: Class<T>): T? {
-        return null
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(referenceNamePrefix: String, classType: Class<T>): List<T>? {
-        return null
-    }
-
-    override fun <T : BluePrintValidator<*>> bluePrintValidators(classType: Class<T>): List<T>? {
-        return null
-    }
-
-    override fun getServiceTemplateValidators(): List<BluePrintServiceTemplateValidator> {
-        return listOf(BluePrintServiceTemplateValidatorImpl(this))
-    }
-
-    override fun getDataTypeValidators(): List<BluePrintDataTypeValidator> {
-        return listOf(BluePrintDataTypeValidatorImpl(this))
-    }
-
-    override fun getArtifactTypeValidators(): List<BluePrintArtifactTypeValidator> {
-        return listOf(BluePrintArtifactTypeValidatorImpl(this))
-    }
-
-    override fun getArtifactDefinitionsValidators(): List<BluePrintArtifactDefinitionValidator> {
-        return listOf(BluePrintArtifactDefinitionValidatorImpl(this))
-    }
-
-    override fun getNodeTypeValidators(): List<BluePrintNodeTypeValidator> {
-        return listOf(BluePrintNodeTypeValidatorImpl(this))
-    }
-
-    override fun getTopologyTemplateValidators(): List<BluePrintTopologyTemplateValidator> {
-        return listOf(BluePrintTopologyTemplateValidatorImpl(this))
-    }
-
-    override fun getNodeTemplateValidators(): List<BluePrintNodeTemplateValidator> {
-        return listOf(BluePrintNodeTemplateValidatorImpl(this))
-    }
-
-    override fun getWorkflowValidators(): List<BluePrintWorkflowValidator> {
-        return listOf(BluePrintWorkflowValidatorImpl(this))
-    }
-
-    override fun getPropertyDefinitionValidators(): List<BluePrintPropertyDefinitionValidator> {
-        return listOf(BluePrintPropertyDefinitionValidatorImpl(this))
-    }
-
-    override fun getAttributeDefinitionValidators(): List<BluePrintAttributeDefinitionValidator> {
-        return listOf(BluePrintAttributeDefinitionValidatorImpl(this))
-    }
-}