fix: update after CodeRabbit review

Author: juherr

steve-api/src/test/java/de/rwth/idsg/steve/web/api/OcppTagsRestControllerTest.java

@@ -326,7 +326,9 @@ public void test12() throws Exception {
                         .contentType(MediaType.APPLICATION_JSON)))
                 .hasStatusOk();
 
-        verify(ocppTagsService).updateOcppTag(form);
+        var captor = ArgumentCaptor.forClass(OcppTagForm.class);
+        verify(ocppTagsService).updateOcppTag(captor.capture());
+        assertThat(captor.getValue()).usingRecursiveComparison().isEqualTo(form);
     }
 
     @Test

steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/RootRedirectController.java

@@ -19,8 +19,8 @@
 package de.rwth.idsg.steve.web.controller;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -30,7 +30,7 @@
 @RequestMapping("/")
 public class RootRedirectController {
 
-    @GetMapping
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.HEAD})
     public String redirectToManager() {
         return "redirect:/manager";
     }

steve/src/main/java/de/rwth/idsg/steve/Application.java

@@ -36,12 +36,15 @@
 @Slf4j
 public class Application {
 
+    private final SteveConfiguration config;
+    private final LogFileRetriever logFileRetriever;
     private final JettyServer server;
 
     public Application(SteveConfiguration config, LogFileRetriever logFileRetriever) {
+        this.config = config;
+        this.logFileRetriever = logFileRetriever;
         this.server = new JettyServer(config);
-        WebConfig.config = config;
-        WebConfig.logFileRetriever = logFileRetriever;
+
     }
 
     public static void main(String[] args) throws Exception {
@@ -83,6 +86,7 @@ public static void main(String[] args) throws Exception {
     }
 
     public void start() throws Exception {
+        WebConfig.initialize(config, logFileRetriever);
         server.start();
     }
 
@@ -92,5 +96,6 @@ public void join() throws Exception {
 
     public void stop() throws Exception {
         server.stop();
+        WebConfig.clear();
     }
 }

steve/src/main/java/de/rwth/idsg/steve/config/WebConfig.java

@@ -47,8 +47,22 @@
 @RequiredArgsConstructor
 public class WebConfig implements WebApplicationInitializer {
 
-    public static SteveConfiguration config;
-    public static LogFileRetriever logFileRetriever;
+    // TEMP workaround before spring boot migration
+    private static SteveConfiguration config;
+    private static LogFileRetriever logFileRetriever;
+
+    public static synchronized void initialize(SteveConfiguration cfg, LogFileRetriever retriever) {
+        if (config != null || logFileRetriever != null) {
+            throw new IllegalStateException("WebConfig already initialized");
+        }
+        config = cfg;
+        logFileRetriever = retriever;
+    }
+
+    public static void clear() {
+        config = null;
+        logFileRetriever = null;
+    }
 
     @Override
     public void onStartup(ServletContext servletContext) throws ServletException {