From aefd2e3a3062055e20880ed0ca0defbf4f3bc0ca Mon Sep 17 00:00:00 2001
From: Marvin Froeder <marvin@datasqrl.com>
Date: Wed, 9 Apr 2025 16:41:07 -0300
Subject: [PATCH] Reorganize project structure

Signed-off-by: Marvin Froeder <marvin@datasqrl.com>
---
 functions/pom.xml                             | 36 ++++++++++
 .../system-functions-discovery}/pom.xml       |  2 +-
 .../function/AutoRegisterSystemFunction.java  |  0
 pom.xml                                       | 46 ++++++++++++-
 testing/coverage/pom.xml                      | 68 +++++++++++++++++++
 testing/coverage/src/main/java/hoop/Code.java | 22 ++++++
 .../test/java/packagereport/ReportTest.java   | 28 ++++++++
 {helpers => testing}/pom.xml                  |  3 +-
 .../system-functions-sample/pom.xml           |  2 +-
 .../src/main/java/sample/Upper.java           |  0
 {helpers => testing}/udf-sample/pom.xml       |  2 +-
 .../main/java/com/myudf/MyScalarFunction.java |  0
 12 files changed, 203 insertions(+), 6 deletions(-)
 create mode 100644 functions/pom.xml
 rename {system-functions-discovery => functions/system-functions-discovery}/pom.xml (95%)
 rename {system-functions-discovery => functions/system-functions-discovery}/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java (100%)
 create mode 100644 testing/coverage/pom.xml
 create mode 100644 testing/coverage/src/main/java/hoop/Code.java
 create mode 100644 testing/coverage/src/test/java/packagereport/ReportTest.java
 rename {helpers => testing}/pom.xml (94%)
 rename {helpers => testing}/system-functions-sample/pom.xml (97%)
 rename {helpers => testing}/system-functions-sample/src/main/java/sample/Upper.java (100%)
 rename {helpers => testing}/udf-sample/pom.xml (97%)
 rename {helpers => testing}/udf-sample/src/main/java/com/myudf/MyScalarFunction.java (100%)

diff --git a/functions/pom.xml b/functions/pom.xml
new file mode 100644
index 00000000..4be71a02
--- /dev/null
+++ b/functions/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2024 DataSQRL (contact@datasqrl.com)
+
+    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="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>com.datasqrl.flinkrunner</groupId>
+    <artifactId>flink-sql-runner-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>functions</artifactId>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>system-functions-discovery</module>
+  </modules>
+
+</project>
diff --git a/system-functions-discovery/pom.xml b/functions/system-functions-discovery/pom.xml
similarity index 95%
rename from system-functions-discovery/pom.xml
rename to functions/system-functions-discovery/pom.xml
index 3ccb4c9b..1278c9d4 100644
--- a/system-functions-discovery/pom.xml
+++ b/functions/system-functions-discovery/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <groupId>com.datasqrl.flinkrunner</groupId>
-    <artifactId>flink-sql-runner-parent</artifactId>
+    <artifactId>functions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
diff --git a/system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java b/functions/system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java
similarity index 100%
rename from system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java
rename to functions/system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java
diff --git a/pom.xml b/pom.xml
index 55d5c6c8..636494a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@
   </developers>
 
   <modules>
-    <module>system-functions-discovery</module>
-    <module>helpers</module>
+    <module>functions</module>
+    <module>testing</module>
     <module>flink-sql-runner</module>
   </modules>
 
@@ -121,6 +121,31 @@
     </dependencies>
   </dependencyManagement>
 
+  <dependencies>
+    <!-- General Dependencies -->
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>${lombok.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -259,6 +284,22 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.11</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+              <goal>prepare-agent-integration</goal>
+              <goal>report</goal>
+              <goal>report-integration</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -428,4 +469,5 @@
       </build>
     </profile>
   </profiles>
+
 </project>
diff --git a/testing/coverage/pom.xml b/testing/coverage/pom.xml
new file mode 100644
index 00000000..e52f3dc1
--- /dev/null
+++ b/testing/coverage/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2024 DataSQRL (contact@datasqrl.com)
+
+    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="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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.datasqrl.flinkrunner</groupId>
+    <artifactId>testing</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>flink-sql-runner-coverage</artifactId>
+
+  <description>JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This is hoop numero uno.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>flink-sql-runner</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>system-functions-discovery</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.11</version>
+        <executions>
+          <execution>
+            <id>report-aggregate</id>
+            <goals>
+              <goal>report-aggregate</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <dataFileIncludes>
+                <dataFileInclude>**/jacoco.exec</dataFileInclude>
+                <dataFileInclude>**/jacoco-it.exec</dataFileInclude>
+              </dataFileIncludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/testing/coverage/src/main/java/hoop/Code.java b/testing/coverage/src/main/java/hoop/Code.java
new file mode 100644
index 00000000..827165fb
--- /dev/null
+++ b/testing/coverage/src/main/java/hoop/Code.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2024 DataSQRL (contact@datasqrl.com)
+ *
+ * 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.
+ */
+package hoop;
+
+/**
+ * JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
+ * is hoop numero tres.
+ */
+public class Code {}
diff --git a/testing/coverage/src/test/java/packagereport/ReportTest.java b/testing/coverage/src/test/java/packagereport/ReportTest.java
new file mode 100644
index 00000000..e5951a99
--- /dev/null
+++ b/testing/coverage/src/test/java/packagereport/ReportTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2024 DataSQRL (contact@datasqrl.com)
+ *
+ * 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.
+ */
+package packagereport;
+
+import org.junit.Test;
+
+/**
+ * JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
+ * is hoop numero dos.
+ */
+public class ReportTest {
+
+  @Test
+  public void test() {}
+}
diff --git a/helpers/pom.xml b/testing/pom.xml
similarity index 94%
rename from helpers/pom.xml
rename to testing/pom.xml
index 2dcc8b76..d2160b36 100644
--- a/helpers/pom.xml
+++ b/testing/pom.xml
@@ -26,12 +26,13 @@
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>helpers</artifactId>
+  <artifactId>testing</artifactId>
   <packaging>pom</packaging>
 
   <modules>
     <module>system-functions-sample</module>
     <module>udf-sample</module>
+    <module>coverage</module>
   </modules>
 
 </project>
diff --git a/helpers/system-functions-sample/pom.xml b/testing/system-functions-sample/pom.xml
similarity index 97%
rename from helpers/system-functions-sample/pom.xml
rename to testing/system-functions-sample/pom.xml
index d3d64a26..d0b74c13 100644
--- a/helpers/system-functions-sample/pom.xml
+++ b/testing/system-functions-sample/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <groupId>com.datasqrl.flinkrunner</groupId>
-    <artifactId>helpers</artifactId>
+    <artifactId>testing</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
diff --git a/helpers/system-functions-sample/src/main/java/sample/Upper.java b/testing/system-functions-sample/src/main/java/sample/Upper.java
similarity index 100%
rename from helpers/system-functions-sample/src/main/java/sample/Upper.java
rename to testing/system-functions-sample/src/main/java/sample/Upper.java
diff --git a/helpers/udf-sample/pom.xml b/testing/udf-sample/pom.xml
similarity index 97%
rename from helpers/udf-sample/pom.xml
rename to testing/udf-sample/pom.xml
index 4caf5a7b..0f4b10df 100644
--- a/helpers/udf-sample/pom.xml
+++ b/testing/udf-sample/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <groupId>com.datasqrl.flinkrunner</groupId>
-    <artifactId>helpers</artifactId>
+    <artifactId>testing</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
diff --git a/helpers/udf-sample/src/main/java/com/myudf/MyScalarFunction.java b/testing/udf-sample/src/main/java/com/myudf/MyScalarFunction.java
similarity index 100%
rename from helpers/udf-sample/src/main/java/com/myudf/MyScalarFunction.java
rename to testing/udf-sample/src/main/java/com/myudf/MyScalarFunction.java