RAP-93 Re-correct logic to set Drools UUID and Severity in DroolsRule…

…sValidationService

src/main/java/org/ihtsdo/rvf/core/service/DroolsRulesValidationService.java

@@ -105,10 +105,10 @@ private void loadAndConvertDroolsRulesToAssertions() {
 	private void convertDroolsRuleToAssertion(File droolsRulesSubfile) throws IOException {
 		try (final BufferedReader reader = Files.newBufferedReader(droolsRulesSubfile.toPath())) {
 			String line;
+			UUID uuid;
 			Assertion assertion = null;
 			boolean severityWarning = false;
 			boolean severityError = false;
-			UUID uuid = null;
 			String group = getAssertionGroup(droolsRulesSubfile.getAbsolutePath());
 			while ((line = reader.readLine()) != null) {
 				if (line.startsWith("rule") && !line.contains("Always passes")) {
@@ -125,20 +125,16 @@ private void convertDroolsRuleToAssertion(File droolsRulesSubfile) throws IOExce
 						assertions.add(assertion);
 					}
 				}
-				if (line.contains("new InvalidContent")) {
+				if (assertion != null && line.contains("new InvalidContent")) {
 					uuid = extractUuid(line);
+					assertion.setUuid(uuid);
 				}
 				// check for severity
-				if (line.contains("Severity.WARNING")) {
-					severityWarning = true;
+				severityWarning = severityWarning || detectSeverity(line, "Severity.WARNING");
+				severityError = severityError || detectSeverity(line, "Severity.ERROR");
+				if (assertion != null && "end".equals(line.trim())) {
+					assertion.setSeverity(buildSeverity(severityWarning, severityError));
 				}
-				if (line.contains("Severity.ERROR")) {
-					severityError = true;
-				}
-			}
-			if (assertion != null) {
-				assertion.setUuid(uuid);
-				assertion.setSeverity(buildSeverity(severityWarning, severityError));
 			}
 		}
 	}
@@ -151,6 +147,10 @@ private static UUID extractUuid(String line) {
 		return null;
 	}
 
+	private static boolean detectSeverity(String line, String type) {
+		return line.contains(type);
+	}
+
 	@NotNull
 	private static String buildSeverity(boolean severityWarning, boolean severityError) {
 		Set<String> severities = new HashSet<>();