1 files changed, 11 insertions, 20 deletions

diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MappingRulesValidator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MappingRulesValidator.java
index 90fda4d..baaff9e 100644
--- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MappingRulesValidator.java
+++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MappingRulesValidator.java
@@ -1,6 +1,5 @@
 package org.onap.sdc.dcae.rule.editor.validators;
 
-import org.onap.sdc.common.onaplog.Enums.LogLevel;
 import org.onap.sdc.dcae.composition.restmodels.ruleeditor.MappingRules;
 import org.onap.sdc.dcae.composition.restmodels.ruleeditor.Rule;
 import org.onap.sdc.dcae.errormng.ActionStatus;
@@ -27,31 +26,23 @@ public class MappingRulesValidator implements IRuleElementValidator<MappingRules
 	private MappingRulesValidator(){}
 
 	public boolean validate(MappingRules rules, List<ResponseFormat> errors) {
-	    return validateVersionAndType(rules, errors) && validateImportedGroupDefinitions(rules, errors) && rules.getRules().values().stream().map(r -> ruleValidator.validate(r, errors))
-				.reduce(true, (x,y) -> x && y);
-	    // TODO consider using 'allMatch' which will stop on the first error
+		boolean valid = true;
+		if(rules.isEmpty()) {
+			valid = false;
+			errors.add(ErrConfMgr.INSTANCE.getResponseFormat(ActionStatus.INVALID_RULE_FORMAT, "", "no rules found"));
+		}
+		return rules.getRules().values().stream().map(r -> ruleValidator.validate(r, errors))
+				.reduce(true, (x,y) -> x && y) && valid;
+		// TODO consider using 'allMatch' which will stop on the first error
 	}
 
-	private boolean validateVersionAndType(MappingRules rules, List<ResponseFormat> errors) {
+	public boolean validateVersionAndType(MappingRules rules) {
 		Map<String, Set<String>> supportedVersions = VesStructureLoader.getAvailableVersionsAndEventTypes();
-		boolean valid = ValidationUtils.validateNotEmpty(rules.getVersion()) && supportedVersions.containsKey(rules.getVersion()) && ValidationUtils.validateNotEmpty(rules.getEventType()) && supportedVersions.get(rules.getVersion()).contains(rules.getEventType());
-		errLogger.log(LogLevel.INFO, this.getClass().getName(), "validate mapping rules fields: eventType/version {}", valid);
-		if(!valid) {
-			errors.add(ErrConfMgr.INSTANCE.getResponseFormat(ActionStatus.VES_SCHEMA_NOT_FOUND, null));
-		}
-		return valid;
+		return ValidationUtils.validateNotEmpty(rules.getVersion()) && supportedVersions.containsKey(rules.getVersion()) && ValidationUtils.validateNotEmpty(rules.getEventType()) && supportedVersions.get(rules.getVersion()).contains(rules.getEventType());
 	}
 
-	private boolean validateImportedGroupDefinitions(MappingRules rules, List<ResponseFormat> errors) {
-		boolean valid = !rules.isEmpty() && (rules.getRules().values().stream().noneMatch(r -> ValidationUtils.validateNotEmpty(r.getGroupId()) || ValidationUtils.validateNotEmpty(r.getPhase())) || validateGroupDefinitions(rules));
-		errLogger.log(LogLevel.INFO, this.getClass().getName(), "validate group definitions {}", valid);
-		if(!valid) {
-			errors.add(ErrConfMgr.INSTANCE.getResponseFormat(ActionStatus.INVALID_RULE_FORMAT, null, "invalid phase definitions"));
-		}
-		return valid;
-	}
 
-	private boolean validateGroupDefinitions(MappingRules rules) {
+	public boolean validateGroupDefinitions(MappingRules rules) {
 		return rules.getRules().values().stream().allMatch(r -> ValidationUtils.validateNotEmpty(r.getGroupId()) && ValidationUtils.validateNotEmpty(r.getPhase()))
 				&& rules.getRules().values().stream().collect(Collectors.groupingBy(Rule::getGroupId, Collectors.mapping(Rule::getPhase, Collectors.toSet()))).values().stream().allMatch(p -> 1 == p.size());
 	}