refactor

dyndrest-data/pom.xml

@@ -8,7 +8,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dyndrest-data</artifactId>
-    <name>dyndrest-model</name>
+    <name>dyndrest-data</name>
+    <packaging>jar</packaging>
 
     <description>This modules contains the model and the database layer.</description>
 
@@ -18,6 +19,14 @@
             <artifactId>dyndrest-checkstyle</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>

dyndrest-api/pom.xml → dyndrest-routes/pom.xml

@@ -5,10 +5,11 @@
         <groupId>codes.thischwa</groupId>
         <artifactId>dyndrest</artifactId>
         <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>dyndrest-api</artifactId>
-    <name>dyndrest-api</name>
+    <artifactId>dyndrest-routes</artifactId>
+    <name>dyndrest-routes</name>
+
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -19,7 +20,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations-jakarta</artifactId>
-            <version>2.2.19</version>
+            <version>${swaggerv3-annotation.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

dyndrest-api/src/main/java/codes/thischwa/dyndrest/AdminRoutes.java → dyndrest-routes/src/main/java/codes/thischwa/dyndrest/route/AdminRoutes.java

@@ -1,4 +1,4 @@
-package codes.thischwa.dyndrest;
+package codes.thischwa.dyndrest.route;
 
 import codes.thischwa.dyndrest.model.FullHost;
 import codes.thischwa.dyndrest.model.Zone;

dyndrest-api/src/main/java/codes/thischwa/dyndrest/ApiRoutes.java → dyndrest-routes/src/main/java/codes/thischwa/dyndrest/route/ApiRoutes.java

@@ -1,4 +1,4 @@
-package codes.thischwa.dyndrest;
+package codes.thischwa.dyndrest.route;
 
 import codes.thischwa.dyndrest.model.IpSetting;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -41,9 +41,9 @@
         @ExternalDocumentation(
             description = "DynDRest on Github",
             url = "https://github.com/th-schwarz/DynDRest"))
-public// @formatter:on
+// @formatter:on
 // naming conventions: https://restfulapi.net/resource-naming/
-interface ApiRoutes {
+public interface ApiRoutes {
 
   @Operation(
       summary =

dyndrest-api/src/main/java/codes/thischwa/dyndrest/RouterRoutes.java → dyndrest-routes/src/main/java/codes/thischwa/dyndrest/route/RouterRoutes.java

@@ -1,4 +1,4 @@
-package codes.thischwa.dyndrest;
+package codes.thischwa.dyndrest.route;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,7 +16,7 @@
  */
 public interface RouterRoutes {
   /*+
-   * It's a duplicate of {@link codes.thischwa.dyndrest.ApiRoutes#updateHost} for routers which can't use the Put method.
+   * It's a duplicate of {@link codes.thischwa.dyndrest.api.ApiRoutes#updateHost} for routers which can't use the Put method.
    */
   @Operation(
       summary =

dyndrest-server/pom.xml

@@ -9,6 +9,7 @@
     </parent>
     <artifactId>dyndrest-server</artifactId>
     <name>dyndrest-server</name>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -23,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>codes.thischwa</groupId>
-            <artifactId>dyndrest-api</artifactId>
+            <artifactId>dyndrest-routes</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

dyndrest-server/src/main/java/codes/thischwa/dyndrest/server/AdminController.java

@@ -1,6 +1,6 @@
 package codes.thischwa.dyndrest.server;
 
-import codes.thischwa.dyndrest.AdminRoutes;
+import codes.thischwa.dyndrest.route.AdminRoutes;
 import codes.thischwa.dyndrest.model.config.AppConfig;
 import codes.thischwa.dyndrest.model.FullHost;
 import codes.thischwa.dyndrest.model.Zone;

dyndrest-server/src/main/java/codes/thischwa/dyndrest/server/ApiController.java

@@ -1,7 +1,7 @@
 package codes.thischwa.dyndrest.server;
 
-import codes.thischwa.dyndrest.ApiRoutes;
-import codes.thischwa.dyndrest.RouterRoutes;
+import codes.thischwa.dyndrest.route.ApiRoutes;
+import codes.thischwa.dyndrest.route.RouterRoutes;
 import codes.thischwa.dyndrest.model.config.AppConfig;
 import codes.thischwa.dyndrest.model.IpSetting;
 import codes.thischwa.dyndrest.model.UpdateLog;

dyndrest-service/pom.xml

@@ -9,6 +9,7 @@
     </parent>
     <artifactId>dyndrest-service</artifactId>
     <name>dyndrest-service</name>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

pom.xml

@@ -17,13 +17,13 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>dyndrest-data</module>
         <module>dyndrest-server</module>
         <module>dyndrest-checkstyle</module>
-        <module>dyndrest-data</module>
 <!--        <module>dyndrest-opendoc</module>-->
-        <module>dyndrest-api</module>
         <module>dyndrest-service</module>
         <module>test-module</module>
+        <module>dyndrest-routes</module>
     </modules>
 
     <properties>
@@ -36,6 +36,7 @@
         <domainrobot.version>0.2.8</domainrobot.version>
         <dnsjava.version>3.5.3</dnsjava.version>
         <janino.version>3.1.11</janino.version>
+        <swaggerv3-annotation.version>2.2.21</swaggerv3-annotation.version>
 
         <fakerepo.dir>${project.basedir}/fake-repo</fakerepo.dir>
 
@@ -85,14 +86,6 @@
             <artifactId>janino</artifactId>
             <version>${janino.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -113,6 +106,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>