From a4fe510b6d61c428f8ebede59f2a1b125fc78de9 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 17 Oct 2024 09:43:45 +0200 Subject: [PATCH] RED-9472: seperation of system rules fixed pmd error --- .../rulesmanagement/factory/RuleFileParser.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/factory/RuleFileParser.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/factory/RuleFileParser.java index c32d067d..db0ece77 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/factory/RuleFileParser.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/factory/RuleFileParser.java @@ -4,6 +4,7 @@ import static java.util.stream.Collectors.groupingBy; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -118,18 +119,19 @@ public class RuleFileParser { private List groupingByGroup(List rules) { - try { - Map> rulesPerUnit = rules.stream() - .collect(groupingBy(rule -> rule.identifier().unit())); + Map> rulesPerUnit = rules.stream() + .collect(groupingBy(rule -> rule.identifier().unit())); + if (rulesPerUnit.keySet() != null) { + return rulesPerUnit.keySet() .stream() .sorted() .map(unit -> new RuleUnit(unit, rulesPerUnit.get(unit))) .collect(Collectors.toList()); - } catch (NullPointerException e) { - System.out.println(rules); - throw e; + } else { + return new ArrayList<>(); } + }