From ed9f2defbc5e8f9120194d9af230840af16f10d4 Mon Sep 17 00:00:00 2001
From: yhampe <yannik.hampe@knecon.com>
Date: Wed, 16 Oct 2024 09:29:01 +0200
Subject: [PATCH] RED-9472: seperation of system rules

fixed failing tests
---
 .../RuleManagementResources.java              | 32 +++----------------
 ...java => RuleFileBluePrintMergingTest.java} |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/{RuleCompilationResultMergingTest.java => RuleFileBluePrintMergingTest.java} (93%)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleManagementResources.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleManagementResources.java
index 7ee94869..331b1e25 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleManagementResources.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleManagementResources.java
@@ -1,56 +1,34 @@
 package com.iqser.red.service.redaction.v1.server.rulesmanagement;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 
 import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.ApplicationType;
 
-import lombok.SneakyThrows;
-
 @SuppressWarnings("PMD")
 public class RuleManagementResources {
 
     public static InputStream getAllRulesInputStream(ApplicationType applicationType) {
 
         if (applicationType == ApplicationType.RM) {
-            return RuleManagementResources.class.getClassLoader().getResourceAsStream("all_redact_manager_rules.drl");
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("drools/all_redact_manager_rules.drl");
         }
-        return RuleManagementResources.class.getClassLoader().getResourceAsStream("all_rules_documine.drl");
+        return RuleManagementResources.class.getClassLoader().getResourceAsStream("drools/all_rules_documine.drl");
     }
 
 
     public static InputStream getDefaultRuleIdentifiesInputStream(ApplicationType applicationType) {
 
         if (applicationType == ApplicationType.RM) {
-            return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers.txt");
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/default_rule_identifiers.txt");
         } else {
-            return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers_dm.txt");
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/default_rule_identifiers_dm.txt");
         }
     }
 
 
     public static InputStream getTemplateInputStream() {
 
-        return RuleManagementResources.class.getClassLoader().getResourceAsStream("order_template.txt");
-    }
-
-
-    public static InputStream getOldRulesCsvInputStream() {
-
-        return RuleManagementResources.class.getClassLoader().getResourceAsStream("old_rules_with_translations.csv");
-    }
-
-
-    @SneakyThrows
-    public static String createTempOldRulesCsv(String formattedAsCsv) {
-
-        File csvFile = File.createTempFile("old_rules_with_translations-", ".csv");
-        try (var out = new FileOutputStream(csvFile)) {
-            out.write(formattedAsCsv.getBytes(StandardCharsets.UTF_8));
-        }
-        return csvFile.toString();
+        return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/order_template.txt");
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleCompilationResultMergingTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleFileBluePrintMergingTest.java
similarity index 93%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleCompilationResultMergingTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleFileBluePrintMergingTest.java
index 74b950d6..577f996a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleCompilationResultMergingTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleFileBluePrintMergingTest.java
@@ -8,7 +8,7 @@ import com.iqser.red.service.redaction.v1.server.rulesmanagement.factory.RuleFil
 import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFileBluePrint;
 import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleIdentifier;
 
-public class RuleCompilationResultMergingTest {
+public class RuleFileBluePrintMergingTest  {
 
     @Test
     public void testBothRuleFilesCanBeMerged() {