From 90edd014ab5690fb8f695998f1d0e54d536f0019 Mon Sep 17 00:00:00 2001
From: "igor.petrenko" <nofateg@users.noreply.github.com>
Date: Fri, 26 Jan 2024 19:26:08 +0200
Subject: [PATCH] refactoring hadoop modules

---
 .../oap-hadoop-test}/pom.xml                  |  4 +-
 .../main/java/oap/hadoop/S3MockFixture.java   |  0
 .../test/java/oap/hadoop/FileSystemTest.java  |  0
 .../hadoop/OapHadoopConfigurationTest.java    |  0
 .../src/test/resources/logback-test.xml       |  0
 oap-hadoop/oap-hadoop/pom.xml                 | 62 +++++++++++++++++++
 .../src/main/java/oap/hadoop/FileSystem.java  |  0
 .../java/oap/hadoop/OapFileSystemType.java    |  0
 .../oap/hadoop/OapHadoopConfiguration.java    |  0
 .../main/resources/META-INF/oap-module.conf   |  0
 oap-hadoop/pom.xml                            | 57 +++--------------
 pom.xml                                       |  3 +-
 12 files changed, 73 insertions(+), 53 deletions(-)
 rename {oap-hadoop-test => oap-hadoop/oap-hadoop-test}/pom.xml (97%)
 rename {oap-hadoop-test => oap-hadoop/oap-hadoop-test}/src/main/java/oap/hadoop/S3MockFixture.java (100%)
 rename {oap-hadoop-test => oap-hadoop/oap-hadoop-test}/src/test/java/oap/hadoop/FileSystemTest.java (100%)
 rename {oap-hadoop-test => oap-hadoop/oap-hadoop-test}/src/test/java/oap/hadoop/OapHadoopConfigurationTest.java (100%)
 rename {oap-hadoop-test => oap-hadoop/oap-hadoop-test}/src/test/resources/logback-test.xml (100%)
 create mode 100644 oap-hadoop/oap-hadoop/pom.xml
 rename oap-hadoop/{ => oap-hadoop}/src/main/java/oap/hadoop/FileSystem.java (100%)
 rename oap-hadoop/{ => oap-hadoop}/src/main/java/oap/hadoop/OapFileSystemType.java (100%)
 rename oap-hadoop/{ => oap-hadoop}/src/main/java/oap/hadoop/OapHadoopConfiguration.java (100%)
 rename oap-hadoop/{ => oap-hadoop}/src/main/resources/META-INF/oap-module.conf (100%)

diff --git a/oap-hadoop-test/pom.xml b/oap-hadoop/oap-hadoop-test/pom.xml
similarity index 97%
rename from oap-hadoop-test/pom.xml
rename to oap-hadoop/oap-hadoop-test/pom.xml
index 65c42985a7..8fcb20aff9 100644
--- a/oap-hadoop-test/pom.xml
+++ b/oap-hadoop/oap-hadoop-test/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>oap</groupId>
-        <artifactId>oap</artifactId>
+        <artifactId>oap-hadoop-parent</artifactId>
         <version>${oap.project.version}</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>oap-hadoop-test</artifactId>
 
     <dependencies>
diff --git a/oap-hadoop-test/src/main/java/oap/hadoop/S3MockFixture.java b/oap-hadoop/oap-hadoop-test/src/main/java/oap/hadoop/S3MockFixture.java
similarity index 100%
rename from oap-hadoop-test/src/main/java/oap/hadoop/S3MockFixture.java
rename to oap-hadoop/oap-hadoop-test/src/main/java/oap/hadoop/S3MockFixture.java
diff --git a/oap-hadoop-test/src/test/java/oap/hadoop/FileSystemTest.java b/oap-hadoop/oap-hadoop-test/src/test/java/oap/hadoop/FileSystemTest.java
similarity index 100%
rename from oap-hadoop-test/src/test/java/oap/hadoop/FileSystemTest.java
rename to oap-hadoop/oap-hadoop-test/src/test/java/oap/hadoop/FileSystemTest.java
diff --git a/oap-hadoop-test/src/test/java/oap/hadoop/OapHadoopConfigurationTest.java b/oap-hadoop/oap-hadoop-test/src/test/java/oap/hadoop/OapHadoopConfigurationTest.java
similarity index 100%
rename from oap-hadoop-test/src/test/java/oap/hadoop/OapHadoopConfigurationTest.java
rename to oap-hadoop/oap-hadoop-test/src/test/java/oap/hadoop/OapHadoopConfigurationTest.java
diff --git a/oap-hadoop-test/src/test/resources/logback-test.xml b/oap-hadoop/oap-hadoop-test/src/test/resources/logback-test.xml
similarity index 100%
rename from oap-hadoop-test/src/test/resources/logback-test.xml
rename to oap-hadoop/oap-hadoop-test/src/test/resources/logback-test.xml
diff --git a/oap-hadoop/oap-hadoop/pom.xml b/oap-hadoop/oap-hadoop/pom.xml
new file mode 100644
index 0000000000..381439a1aa
--- /dev/null
+++ b/oap-hadoop/oap-hadoop/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>oap</groupId>
+        <artifactId>oap-hadoop-parent</artifactId>
+        <version>${oap.project.version}</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>oap-hadoop</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-bundle</artifactId>
+            <version>${oap.deps.aws-java-sdk-bundle.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-stdlib</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-aws</artifactId>
+            <version>${oap.deps.hadoop.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>${oap.deps.hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${oap.deps.lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/oap-hadoop/src/main/java/oap/hadoop/FileSystem.java b/oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/FileSystem.java
similarity index 100%
rename from oap-hadoop/src/main/java/oap/hadoop/FileSystem.java
rename to oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/FileSystem.java
diff --git a/oap-hadoop/src/main/java/oap/hadoop/OapFileSystemType.java b/oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/OapFileSystemType.java
similarity index 100%
rename from oap-hadoop/src/main/java/oap/hadoop/OapFileSystemType.java
rename to oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/OapFileSystemType.java
diff --git a/oap-hadoop/src/main/java/oap/hadoop/OapHadoopConfiguration.java b/oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/OapHadoopConfiguration.java
similarity index 100%
rename from oap-hadoop/src/main/java/oap/hadoop/OapHadoopConfiguration.java
rename to oap-hadoop/oap-hadoop/src/main/java/oap/hadoop/OapHadoopConfiguration.java
diff --git a/oap-hadoop/src/main/resources/META-INF/oap-module.conf b/oap-hadoop/oap-hadoop/src/main/resources/META-INF/oap-module.conf
similarity index 100%
rename from oap-hadoop/src/main/resources/META-INF/oap-module.conf
rename to oap-hadoop/oap-hadoop/src/main/resources/META-INF/oap-module.conf
diff --git a/oap-hadoop/pom.xml b/oap-hadoop/pom.xml
index 8773eb348a..4aced5d190 100644
--- a/oap-hadoop/pom.xml
+++ b/oap-hadoop/pom.xml
@@ -2,6 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+    <packaging>pom</packaging>
+
     <parent>
         <groupId>oap</groupId>
         <artifactId>oap</artifactId>
@@ -9,54 +11,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>oap-hadoop</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-bundle</artifactId>
-            <version>${oap.deps.aws-java-sdk-bundle.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>oap</groupId>
-            <artifactId>oap-stdlib</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-aws</artifactId>
-            <version>${oap.deps.hadoop.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>${oap.deps.hadoop.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-reload4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${oap.deps.lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <artifactId>oap-hadoop-parent</artifactId>
+    <name>oap-hadoop-parent</name>
 
+    <modules>
+        <module>oap-hadoop</module>
+        <module>oap-hadoop-test</module>
+    </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 7c42dfa135..e1831d4435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
         <module>oap-jpath</module>
         <module>oap-pnio</module>
         <module>oap-hadoop</module>
-        <module>oap-hadoop-test</module>
         <module>oap-maven-plugin</module>
     </modules>
 
@@ -46,7 +45,7 @@
     </repositories>
 
     <properties>
-        <oap.project.version>21.3.1</oap.project.version>
+        <oap.project.version>21.3.2</oap.project.version>
 
         <oap.deps.config.version>21.0.0</oap.deps.config.version>