summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main
diff options
context:
space:
mode:
authormojahidi <mojahidul.islam@amdocs.com>2017-11-22 15:07:07 +0530
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2017-11-22 10:40:25 +0000
commitb110b94fe9ab62393b8c1ec64320668c7222bc6a (patch)
treedf93192e4263e060b5eb3e3a1a2506871af62973 /openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main
parentf62890e8860893fdd5985d5c605882b6fcce2e8c (diff)
ResourceBaseValidator
This task is about updating error messages with error codes for ResourceBaseValidator Change-Id: Ia6fc269e14c9b1593d908212b6517fd94190d079 Issue-ID: SDC-572 Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main')
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
index f5d01d90e8..c4d6f88074 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
@@ -2,6 +2,7 @@ package org.openecomp.sdc.validation.base;
import org.apache.commons.collections4.MapUtils;
import org.openecomp.core.utilities.CommonMethods;
+import org.openecomp.core.validation.ErrorMessageCode;
import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.datatypes.error.ErrorLevel;
@@ -34,6 +35,8 @@ public class ResourceBaseValidator implements Validator {
protected Map<String, ImplementationConfiguration> resourceTypeToImpl = new HashMap<>();
private static Logger logger = (Logger) LoggerFactory.getLogger(ResourceBaseValidator.class);
+ private static final ErrorMessageCode ERROR_CODE_RBV_1 = new ErrorMessageCode("RBV1");
+ private static final ErrorMessageCode ERROR_CODE_RBV_2 = new ErrorMessageCode("RBV2");
public void init(Map<String, Object> properties) {
@@ -42,8 +45,8 @@ public class ResourceBaseValidator implements Validator {
}
properties.entrySet().stream()
- .filter(entry -> getImplementationConfigurationFromProperties(entry.getValue()) != null).
- forEach(entry -> resourceTypeToImpl
+ .filter(entry -> getImplementationConfigurationFromProperties(entry.getValue()) != null)
+ .forEach(entry -> resourceTypeToImpl
.put(entry.getKey(), getImplementationConfigurationFromProperties(entry.getValue())));
}
@@ -69,6 +72,7 @@ public class ResourceBaseValidator implements Validator {
private void validate(String fileName, String envFileName,
GlobalValidationContext globalContext) {
+ globalContext.setMessageCode(ERROR_CODE_RBV_2);
HeatOrchestrationTemplate heatOrchestrationTemplate =
ValidationUtil.checkHeatOrchestrationPreCondition(fileName, globalContext);
if (heatOrchestrationTemplate == null) {
@@ -88,7 +92,8 @@ public class ResourceBaseValidator implements Validator {
if (Objects.isNull(resourceType)) {
globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
- .getErrorWithParameters(Messages.INVALID_RESOURCE_TYPE.getErrorMessage(), "null",
+ .getErrorWithParameters(ERROR_CODE_RBV_1,
+ Messages.INVALID_RESOURCE_TYPE.getErrorMessage(),"null",
resourceEntry.getKey()), LoggerTragetServiceName.VALIDATE_RESOURCE_TYPE,
LoggerErrorDescription.INVALID_RESOURCE_TYPE);
} else {