Resource Resolution Service

[ccsdk/cds.git] / components / core / src / main / kotlin / org / onap / ccsdk / apps / controllerblueprints / core / service / BluePrintValidatorService.kt

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt
index 7ad3833..b33cc3f 100644 (file)
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorService.kt
@@ -17,13 +17,13 @@
 \r
 package org.onap.ccsdk.apps.controllerblueprints.core.service\r
 \r
+import com.att.eelf.configuration.EELFLogger\r
+import com.att.eelf.configuration.EELFManager\r
 import com.fasterxml.jackson.databind.JsonNode\r
 import com.google.common.base.Preconditions\r
 import org.apache.commons.lang3.StringUtils\r
 import org.onap.ccsdk.apps.controllerblueprints.core.*\r
 import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils\r
 import java.io.Serializable\r
 \r
@@ -523,14 +523,14 @@ open class BluePrintValidatorDefaultService : BluePrintValidatorService {
 \r
     @Throws(BluePrintException::class)\r
     open fun validateImplementation(implementation: Implementation) {\r
-        checkNotEmptyNThrow(implementation.primary)\r
+        checkNotEmptyOrThrow(implementation.primary)\r
     }\r
 \r
     @Throws(BluePrintException::class)\r
     open fun checkValidArtifactType(artifactDefinitionName: String, artifactTypeName: String) {\r
 \r
         val artifactType = serviceTemplate.artifactTypes?.get(artifactTypeName)\r
-                ?: throw BluePrintException(format("Failed to ArtifactType for ArtifactDefinition : {}", artifactDefinitionName))\r
+                ?: throw BluePrintException("failed to artifactType($artifactTypeName) for ArtifactDefinition($artifactDefinitionName)")\r
 \r
         checkValidArtifactTypeDerivedFrom(artifactTypeName, artifactType.derivedFrom)\r
     }\r
@@ -538,14 +538,14 @@ open class BluePrintValidatorDefaultService : BluePrintValidatorService {
     @Throws(BluePrintException::class)\r
     open fun checkValidArtifactTypeDerivedFrom(artifactTypeName: String, derivedFrom: String) {\r
         check(BluePrintTypes.validArtifactTypeDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException(format("Failed to get ArtifactType ({})'s  derivedFrom({}) definition ", artifactTypeName, derivedFrom))\r
+            throw BluePrintException("failed to get artifactType($artifactTypeName)'s derivedFrom($derivedFrom) definition")\r
         }\r
     }\r
 \r
     @Throws(BluePrintException::class)\r
     open fun checkValidDataTypeDerivedFrom(dataTypeName: String, derivedFrom: String) {\r
         check(BluePrintTypes.validDataTypeDerivedFroms.contains(derivedFrom)) {\r
-            throw BluePrintException(format("Failed to get DataType ({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))\r
+            throw BluePrintException(format("Failed to get DataType({})'s  derivedFrom({}) definition ", dataTypeName, derivedFrom))\r
         }\r
     }\r
 \r