Skip to content

Commit 6784e68

Browse files
velovelo
authored
Merge pull request #69 from DataSQRL/reorg
Reorganize project structure
2 parents ec21458 + aefd2e3 commit 6784e68

File tree

12 files changed

+203
-6
lines changed

12 files changed

+203
-6
lines changed

‎functions/pom.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright © 2024 DataSQRL (contact@datasqrl.com)
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<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">
20+
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<parent>
24+
<groupId>com.datasqrl.flinkrunner</groupId>
25+
<artifactId>flink-sql-runner-parent</artifactId>
26+
<version>1.0.0-SNAPSHOT</version>
27+
</parent>
28+
29+
<artifactId>functions</artifactId>
30+
<packaging>pom</packaging>
31+
32+
<modules>
33+
<module>system-functions-discovery</module>
34+
</modules>
35+
36+
</project>

‎system-functions-discovery/pom.xml renamed to ‎functions/system-functions-discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<parent>
2323
<groupId>com.datasqrl.flinkrunner</groupId>
24-
<artifactId>flink-sql-runner-parent</artifactId>
24+
<artifactId>functions</artifactId>
2525
<version>1.0.0-SNAPSHOT</version>
2626
</parent>
2727

‎system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java renamed to ‎functions/system-functions-discovery/src/main/java/com/datasqrl/function/AutoRegisterSystemFunction.java

File renamed without changes.

‎pom.xml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
</developers>
5151

5252
<modules>
53-
<module>system-functions-discovery</module>
54-
<module>helpers</module>
53+
<module>functions</module>
54+
<module>testing</module>
5555
<module>flink-sql-runner</module>
5656
</modules>
5757

@@ -121,6 +121,31 @@
121121
</dependencies>
122122
</dependencyManagement>
123123

124+
<dependencies>
125+
<!-- General Dependencies -->
126+
<dependency>
127+
<groupId>org.projectlombok</groupId>
128+
<artifactId>lombok</artifactId>
129+
<version>${lombok.version}</version>
130+
<scope>provided</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.junit.platform</groupId>
134+
<artifactId>junit-platform-launcher</artifactId>
135+
<scope>test</scope>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.junit.vintage</groupId>
139+
<artifactId>junit-vintage-engine</artifactId>
140+
<scope>test</scope>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.junit.jupiter</groupId>
144+
<artifactId>junit-jupiter-engine</artifactId>
145+
<scope>test</scope>
146+
</dependency>
147+
</dependencies>
148+
124149
<build>
125150
<plugins>
126151
<plugin>
@@ -259,6 +284,22 @@
259284
</execution>
260285
</executions>
261286
</plugin>
287+
288+
<plugin>
289+
<groupId>org.jacoco</groupId>
290+
<artifactId>jacoco-maven-plugin</artifactId>
291+
<version>0.8.11</version>
292+
<executions>
293+
<execution>
294+
<goals>
295+
<goal>prepare-agent</goal>
296+
<goal>prepare-agent-integration</goal>
297+
<goal>report</goal>
298+
<goal>report-integration</goal>
299+
</goals>
300+
</execution>
301+
</executions>
302+
</plugin>
262303
</plugins>
263304
</build>
264305

@@ -428,4 +469,5 @@
428469
</build>
429470
</profile>
430471
</profiles>
472+
431473
</project>

‎testing/coverage/pom.xml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright © 2024 DataSQRL (contact@datasqrl.com)
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<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">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>com.datasqrl.flinkrunner</groupId>
23+
<artifactId>testing</artifactId>
24+
<version>1.0.0-SNAPSHOT</version>
25+
</parent>
26+
27+
<artifactId>flink-sql-runner-coverage</artifactId>
28+
29+
<description>JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This is hoop numero uno.</description>
30+
31+
<dependencies>
32+
<dependency>
33+
<groupId>${project.groupId}</groupId>
34+
<artifactId>flink-sql-runner</artifactId>
35+
<version>${project.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>${project.groupId}</groupId>
39+
<artifactId>system-functions-discovery</artifactId>
40+
<version>${project.version}</version>
41+
</dependency>
42+
</dependencies>
43+
44+
<build>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.jacoco</groupId>
48+
<artifactId>jacoco-maven-plugin</artifactId>
49+
<version>0.8.11</version>
50+
<executions>
51+
<execution>
52+
<id>report-aggregate</id>
53+
<goals>
54+
<goal>report-aggregate</goal>
55+
</goals>
56+
<phase>verify</phase>
57+
<configuration>
58+
<dataFileIncludes>
59+
<dataFileInclude>**/jacoco.exec</dataFileInclude>
60+
<dataFileInclude>**/jacoco-it.exec</dataFileInclude>
61+
</dataFileIncludes>
62+
</configuration>
63+
</execution>
64+
</executions>
65+
</plugin>
66+
</plugins>
67+
</build>
68+
</project>

‎testing/coverage/src/main/java/hoop/Code.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright © 2024 DataSQRL (contact@datasqrl.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package hoop;
17+
18+
/**
19+
* JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
20+
* is hoop numero tres.
21+
*/
22+
public class Code {}

‎testing/coverage/src/test/java/packagereport/ReportTest.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright © 2024 DataSQRL (contact@datasqrl.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package packagereport;
17+
18+
import org.junit.Test;
19+
20+
/**
21+
* JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
22+
* is hoop numero dos.
23+
*/
24+
public class ReportTest {
25+
26+
@Test
27+
public void test() {}
28+
}

‎helpers/pom.xml renamed to ‎testing/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@
2626
<version>1.0.0-SNAPSHOT</version>
2727
</parent>
2828

29-
<artifactId>helpers</artifactId>
29+
<artifactId>testing</artifactId>
3030
<packaging>pom</packaging>
3131

3232
<modules>
3333
<module>system-functions-sample</module>
3434
<module>udf-sample</module>
35+
<module>coverage</module>
3536
</modules>
3637

3738
</project>

‎helpers/system-functions-sample/pom.xml renamed to ‎testing/system-functions-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<parent>
2323
<groupId>com.datasqrl.flinkrunner</groupId>
24-
<artifactId>helpers</artifactId>
24+
<artifactId>testing</artifactId>
2525
<version>1.0.0-SNAPSHOT</version>
2626
</parent>
2727

‎helpers/system-functions-sample/src/main/java/sample/Upper.java renamed to ‎testing/system-functions-sample/src/main/java/sample/Upper.java

File renamed without changes.

‎helpers/udf-sample/pom.xml renamed to ‎testing/udf-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<parent>
2323
<groupId>com.datasqrl.flinkrunner</groupId>
24-
<artifactId>helpers</artifactId>
24+
<artifactId>testing</artifactId>
2525
<version>1.0.0-SNAPSHOT</version>
2626
</parent>
2727

‎helpers/udf-sample/src/main/java/com/myudf/MyScalarFunction.java renamed to ‎testing/udf-sample/src/main/java/com/myudf/MyScalarFunction.java

File renamed without changes.

0 commit comments

Comments
 (0)