From 88b5272f747d81a575ae2abcc5289072ef44f8e6 Mon Sep 17 00:00:00 2001
From: Steve Hu <stevehu@gmail.com>
Date: Mon, 15 Apr 2024 16:06:39 -0400
Subject: [PATCH] fixes #2213 split rule-loader config from rule-loader module

---
 pom.xml                                       |  6 ++
 rule-loader/pom.xml                           |  4 ++
 ruleloader-config/pom.xml                     | 61 +++++++++++++++++++
 .../com/networknt/rule/RuleLoaderConfig.java  |  0
 ruleloader-config/src/main/java/module-info.j | 11 ++++
 .../src/main/resources/config/rule-loader.yml |  0
 6 files changed, 82 insertions(+)
 create mode 100644 ruleloader-config/pom.xml
 rename {rule-loader => ruleloader-config}/src/main/java/com/networknt/rule/RuleLoaderConfig.java (100%)
 create mode 100644 ruleloader-config/src/main/java/module-info.j
 rename {rule-loader => ruleloader-config}/src/main/resources/config/rule-loader.yml (100%)

diff --git a/pom.xml b/pom.xml
index aa27dd8474..58138f4875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,7 @@
         <module>http-entity</module>
         <module>egress-router</module>
         <module>ingress-proxy</module>
+        <module>ruleloader-config</module>
         <module>rule-loader</module>
         <module>config-reload</module>
         <module>sidecar</module>
@@ -508,6 +509,11 @@
                 <artifactId>sidecar</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.networknt</groupId>
+                <artifactId>ruleloader-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>rule-loader</artifactId>
diff --git a/rule-loader/pom.xml b/rule-loader/pom.xml
index dcb98b109b..5dd300400e 100644
--- a/rule-loader/pom.xml
+++ b/rule-loader/pom.xml
@@ -50,6 +50,10 @@
             <groupId>com.networknt</groupId>
             <artifactId>yaml-rule</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>ruleloader-config</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.undertow</groupId>
diff --git a/ruleloader-config/pom.xml b/ruleloader-config/pom.xml
new file mode 100644
index 0000000000..588493774b
--- /dev/null
+++ b/ruleloader-config/pom.xml
@@ -0,0 +1,61 @@
+<!--
+  ~ Copyright (c) 2016 Network New Technologies Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.networknt</groupId>
+        <artifactId>light-4j</artifactId>
+        <version>2.1.34-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ruleloader-config</artifactId>
+    <packaging>jar</packaging>
+    <description>A config module for rule-loader to load YAML rules.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>yaml-rule</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/rule-loader/src/main/java/com/networknt/rule/RuleLoaderConfig.java b/ruleloader-config/src/main/java/com/networknt/rule/RuleLoaderConfig.java
similarity index 100%
rename from rule-loader/src/main/java/com/networknt/rule/RuleLoaderConfig.java
rename to ruleloader-config/src/main/java/com/networknt/rule/RuleLoaderConfig.java
diff --git a/ruleloader-config/src/main/java/module-info.j b/ruleloader-config/src/main/java/module-info.j
new file mode 100644
index 0000000000..077549048d
--- /dev/null
+++ b/ruleloader-config/src/main/java/module-info.j
@@ -0,0 +1,11 @@
+module com.networknt.rule-loader {
+    exports com.networknt.rule;
+
+    requires com.networknt.config;
+    requires com.networknt.client;
+    requires com.networknt.server;
+
+    requires com.fasterxml.jackson.core;
+    requires org.slf4j;
+    requires java.logging;
+}
diff --git a/rule-loader/src/main/resources/config/rule-loader.yml b/ruleloader-config/src/main/resources/config/rule-loader.yml
similarity index 100%
rename from rule-loader/src/main/resources/config/rule-loader.yml
rename to ruleloader-config/src/main/resources/config/rule-loader.yml