From 701c2b7cd3d9426fafdef7c9c7361db397ed8ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20S=C3=A4ume?= <Dominik.Saeume@hmmh.de>
Date: Fri, 27 Sep 2024 12:15:35 +0200
Subject: [PATCH] PMT-14: Refactor Generator Config and Setup

---
 .run/Run.run.xml                                    |  2 +-
 build.gradle.kts                                    | 11 ++++++-----
 src/main/java/de/hmmh/pmt/ApiController.java        |  2 +-
 .../hmmh/pmt/ProjectManagementToolApplication.java  | 13 -------------
 src/main/resources/.codegen-ignore                  |  4 +++-
 src/main/resources/checkstyle-ignore.xml            |  1 +
 src/main/resources/gen-config.json                  |  4 ++--
 src/main/resources/spotbugs-exclude.xml             |  4 ++--
 8 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/java/de/hmmh/pmt/ProjectManagementToolApplication.java

diff --git a/.run/Run.run.xml b/.run/Run.run.xml
index 057162a..b431422 100644
--- a/.run/Run.run.xml
+++ b/.run/Run.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="Project_Management_Tool.main" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="de.hmmh.pmt.ProjectManagementToolApplication" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.hmmh.pmt.OpenAPISpringBoot" />
     <method v="2">
       <option name="Make" enabled="true" />
       <option name="RunConfigurationTask" enabled="false" run_configuration_name="Postgres" run_configuration_type="docker-deploy" />
diff --git a/build.gradle.kts b/build.gradle.kts
index f3730f2..858086b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 plugins {
     java
     checkstyle
-    id("com.github.spotbugs") version "6.0.22"
+    id("com.github.spotbugs") version "6.0.23"
     id("org.springframework.boot") version "3.3.3"
     id("io.spring.dependency-management") version "1.1.6"
     id("org.hidetake.swagger.generator") version "2.19.2"
@@ -44,17 +44,17 @@ configurations {
 }
 
 dependencies {
-    //Spring
+    // Spring
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.springframework.boot:spring-boot-starter-web")
     runtimeOnly("org.postgresql:postgresql")
 
-    //Lombok
+    // Lombok
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
 
-    //Test
+    // Test
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-testcontainers")
     testImplementation("org.testcontainers:junit-jupiter")
@@ -64,6 +64,7 @@ dependencies {
     //OAS
     swaggerCodegen("io.swagger.codegen.v3:swagger-codegen-cli:3.0.61")
     implementation("io.swagger.core.v3:swagger-annotations:2.2.22")
+    implementation("jakarta.xml.bind:jakarta.xml.bind-api") //Needed for XML/HTML Validation
 }
 
 swaggerSources {
@@ -73,7 +74,6 @@ swaggerSources {
         val validationTask = validation
         code(delegateClosureOf<GenerateSwaggerCode> {
             language = "spring"
-            components = listOf("models", "apis")
             code.rawOptions =
                 listOf("--ignore-file-override=" + file("${rootDir}/src/main/resources/.codegen-ignore").absolutePath)
             dependsOn(validationTask)
@@ -90,6 +90,7 @@ tasks {
         }
     }
     withType<SpotBugsTask> {
+        
         excludeFilter.set(file("${rootDir}/src/main/resources/spotbugs-exclude.xml"))
     }
     processResources {
diff --git a/src/main/java/de/hmmh/pmt/ApiController.java b/src/main/java/de/hmmh/pmt/ApiController.java
index 550e965..d210430 100644
--- a/src/main/java/de/hmmh/pmt/ApiController.java
+++ b/src/main/java/de/hmmh/pmt/ApiController.java
@@ -2,7 +2,7 @@ package de.hmmh.pmt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.hmmh.pmt.oas.DefaultApi;
-import de.hmmh.pmt.oas.models.HelloOut;
+import de.hmmh.pmt.dtos.HelloOut;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/de/hmmh/pmt/ProjectManagementToolApplication.java b/src/main/java/de/hmmh/pmt/ProjectManagementToolApplication.java
deleted file mode 100644
index 0e72b54..0000000
--- a/src/main/java/de/hmmh/pmt/ProjectManagementToolApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.hmmh.pmt;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ProjectManagementToolApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ProjectManagementToolApplication.class, args);
-    }
-
-}
diff --git a/src/main/resources/.codegen-ignore b/src/main/resources/.codegen-ignore
index f71569b..e7d0efa 100644
--- a/src/main/resources/.codegen-ignore
+++ b/src/main/resources/.codegen-ignore
@@ -1,2 +1,4 @@
 **/*ApiController.java
-**/org/openapitools/configuration/
\ No newline at end of file
+**/*application.properties
+**/io/swagger/configuration/HomeController.java
+**/io/swagger/configuration/SwaggerUiConfiguration.java
\ No newline at end of file
diff --git a/src/main/resources/checkstyle-ignore.xml b/src/main/resources/checkstyle-ignore.xml
index 392fd6e..dd2974f 100644
--- a/src/main/resources/checkstyle-ignore.xml
+++ b/src/main/resources/checkstyle-ignore.xml
@@ -6,4 +6,5 @@
 
 <suppressions>
     <suppress files="[\\/]de[\\/]hmmh[\\/]pmt[\\/]oas" checks="."/>
+    <suppress files="[\\/]de[\\/]hmmh[\\/]pmt[\\/]dtos" checks="."/>
 </suppressions>
diff --git a/src/main/resources/gen-config.json b/src/main/resources/gen-config.json
index a87080c..c2d6f24 100644
--- a/src/main/resources/gen-config.json
+++ b/src/main/resources/gen-config.json
@@ -1,7 +1,7 @@
 {
-    "modelPackage": "de.hmmh.pmt.oas.models",
+    "modelPackage": "de.hmmh.pmt.dtos",
     "apiPackage": "de.hmmh.pmt.oas",
-    "invokerPackage": "de.hmmh.pmt.oas",
+    "invokerPackage": "de.hmmh.pmt",
     "java8": false,
     "java11": true,
     "dateLibrary": "java11",
diff --git a/src/main/resources/spotbugs-exclude.xml b/src/main/resources/spotbugs-exclude.xml
index af8fb41..2bf8281 100644
--- a/src/main/resources/spotbugs-exclude.xml
+++ b/src/main/resources/spotbugs-exclude.xml
@@ -1,5 +1,5 @@
-<FindBugsFilter>
+<FindBugsFilter xmlns="https://raw.githubusercontent.com/spotbugs/spotbugs/4.8.6/spotbugs/etc/findbugsfilter.xsd">
     <Match>
-        <Package name="de.hmmh.pmt.oas"/>
+        <Class name="de.hmmh.pmt.OpenAPISpringBoot$ExitException"/>
     </Match>
 </FindBugsFilter>