PMT-9: Update CI Filters, to exclude all Generated Code better, and Ignoring one Warning for Specific Reasons

api/employee.yml

@@ -201,7 +201,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/EmployeeResponseDTO'
+                type: array
+                items: 
+                  $ref: '#/components/schemas/EmployeeResponseDTO'
     post:
       tags:
       - employee-controller
@@ -467,6 +469,5 @@ components:
   securitySchemes:
     bearerAuth:
       type: http
-      name: bearerAuth
       scheme: bearer
       bearerFormat: JWT

src/main/java/de/hmmh/pmt/ApiController.java

@@ -1,9 +1,8 @@
 package de.hmmh.pmt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.hmmh.pmt.auth.JwtToken;
+import de.hmmh.pmt.employee.ApiClientFactory;
-import de.hmmh.pmt.employee.ApiClient;
+import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
-import de.hmmh.pmt.employee.api.EmployeeControllerApi;
 import de.hmmh.pmt.oas.DefaultApi;
 import de.hmmh.pmt.dtos.HelloOut;
 import jakarta.servlet.http.HttpServletRequest;
@@ -17,13 +16,8 @@ import java.util.Optional;
 @Controller
 @RequestMapping("${openapi.projectManagement.base-path:/api/v1}")
 public class ApiController implements DefaultApi {
-    
     @Autowired
-    private ApiClient apiClient;
+    private ApiClientFactory apiClientFactory;
-    @Autowired
-    private JwtToken apiToken;
-    @Autowired
-    private EmployeeControllerApi employeeApi;
 
     @Override
     public Optional<ObjectMapper> getObjectMapper() {
@@ -37,15 +31,14 @@ public class ApiController implements DefaultApi {
 
     @Override
     public ResponseEntity<HelloOut> getHello() {
-        apiClient.setAccessToken(apiToken.getToken());
-        apiClient.setBasePath("https://employee.szut.dev");
-        //TODO: Get Authentication working
-        employeeApi.setApiClient(apiClient);
 
-        String data = employeeApi.findAll1().toString();
+        StringBuilder employees = new StringBuilder();
+        for (EmployeeResponseDTO employeeResponseDTO : apiClientFactory.getEmployeeApi().findAll1()) {
+            employees.append(employeeResponseDTO.toString());
+        }
         
         HelloOut hello = new HelloOut();
-        hello.setMsg(data);
+        hello.setMsg(employees.toString());
         return ResponseEntity.ok(hello);
     }
 }

src/main/java/de/hmmh/pmt/auth/JwtTokenFilter.java

@@ -4,6 +4,7 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -12,11 +13,8 @@ import java.io.IOException;
 @Component
 public class JwtTokenFilter extends OncePerRequestFilter {
 
-    private final JwtToken token;
+    @Autowired
-
+    private JwtToken token;
-    public JwtTokenFilter(JwtToken token) {
-        this.token = token;
-    }
 
     @Override
     protected void doFilterInternal(

src/main/java/de/hmmh/pmt/employee/ApiClientFactory.java

@@ -0,0 +1,37 @@
+package de.hmmh.pmt.employee;
+
+import de.hmmh.pmt.auth.JwtToken;
+import de.hmmh.pmt.employee.api.EmployeeControllerApi;
+import de.hmmh.pmt.employee.api.QualificationControllerApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApiClientFactory {
+
+    @Autowired
+    private ApiClient apiClient;
+    @Autowired
+    private JwtToken apiToken;
+    @Autowired
+    private EmployeeControllerApi employee;
+    @Autowired
+    private QualificationControllerApi qualification;
+
+    public EmployeeControllerApi getEmployeeApi() {
+        prepareApiClient();
+        employee.setApiClient(apiClient);
+        return employee;
+    }
+
+    public QualificationControllerApi getQualificationApi() {
+        prepareApiClient();
+        qualification.setApiClient(apiClient);
+        return qualification;
+    }
+
+    private void prepareApiClient() {
+        apiClient.setAccessToken(apiToken.getToken());
+        apiClient.setBasePath("https://employee.szut.dev");
+    }
+}

src/main/resources/checkstyle-ignore.xml

@@ -5,6 +5,5 @@
 >
 
 <suppressions>
-    <suppress files="[\\/]de[\\/]hmmh[\\/]pmt[\\/]oas" checks="."/>
+    <suppress files="build[\\/]" checks="."/>
-    <suppress files="[\\/]de[\\/]hmmh[\\/]pmt[\\/]dtos" checks="."/>
 </suppressions>

src/main/resources/spotbugs-exclude.xml

@@ -1,5 +1,11 @@
 <FindBugsFilter xmlns="https://raw.githubusercontent.com/spotbugs/spotbugs/4.8.6/spotbugs/etc/findbugsfilter.xsd">
     <Match>
-        <Class name="de.hmmh.pmt.OpenAPISpringBoot$ExitException"/>
+        <!-- We Want This Exposure of Resources the Way it is for our usage -->
+        <Class name="de.hmmh.pmt.employee.ApiClientFactory"/>
+        <Bug code="M,V,EI"/>
+    </Match>
+    <Match>
+        <!--Ignore Auto Generated Code -->
+        <Source name="~.*build/.*"/>
     </Match>
 </FindBugsFilter>