Corrected Dockerfile, supervisord configuration and developers edit fragment view name

Author: MarkoDojkic

Dockerfile

@@ -17,12 +17,26 @@ RUN mvn clean package -DskipTests
 # Stage 2: Create an image with RabbitMQ and your Spring Boot application
 FROM rabbitmq:management-alpine AS final
 
-# Install necessary runtime packages
-RUN apk add --no-cache openjdk22-jdk supervisor \
-    && rabbitmq-plugins enable --offline rabbitmq_mqtt \
-    && rabbitmq-plugins enable --offline rabbitmq_web_mqtt \
-    && addgroup -S runtimeUsers \
-    && adduser -S runtimeUser -G runtimeUsers
+# Download OpenJDK 22 packages from Alpine Edge (since it isn`t available in latest stable alpine 3.20)
+# Check if openjdk22 is already installed, and install if not
+RUN if ! java --version 2>/dev/null; then \
+        echo "Installing OpenJDK 22..."; \
+        apk add --no-cache curl; \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-jre-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-jmods-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-jdk-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-demos-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-doc-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-jre-headless-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-src-22.0.2_p9-r2.apk && \
+            curl -O https://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/openjdk22-static-libs-22.0.2_p9-r2.apk; \
+        apk add --allow-untrusted ./*.apk && rm ./*.apk; \
+    fi; \
+    apk add --no-cache supervisor \
+      && rabbitmq-plugins enable --offline rabbitmq_mqtt \
+      && rabbitmq-plugins enable --offline rabbitmq_web_mqtt \
+      && addgroup -S runtimeUsers && adduser -S runtimeUser -G runtimeUsers
 
 # Copy the Spring Boot application from the build stage
 COPY --from=build /app/target/softwaredevelopmentsimulation-1.4.0.jar /app/software-development-simulation.jar

README.md

@@ -5,7 +5,7 @@
 ![SonarQube Quality Gate](https://img.shields.io/badge/SonarQube%20Quality%20Gate-Passed-brightgreen)
 ![SonarQube Duplicated Lines](https://img.shields.io/badge/SonarQube%20Duplicated%20Lines-0%25-brightgreen)
 ![SonarQube LOC](https://img.shields.io/badge/SonarQube%20LOC-2000-blue)
-![JaCoCo Coverage](https://img.shields.io/badge/JaCoCo%20Coverage-93.5%25-brightgreen)
+![JaCoCo Coverage](https://img.shields.io/badge/JaCoCo%20Coverage-93.1%25-brightgreen)
 
 **Note:** SonarQube information is based on the last GitHub Action run and is generated locally. As such, there is no direct link available to the SonarQube dashboard.
 

src/main/java/dev/markodojkic/softwaredevelopmentsimulation/web/DevelopersPageController.java

@@ -46,7 +46,7 @@ public ModelAndView getDevelopersPage(){
 	})
 	@GetMapping(value = "/developers/edit")
 	public ModelAndView getEditingDeveloperForm(@RequestParam("developmentTeamIndex") int developmentTeamIndex, @RequestParam("developerIndex") int developerIndex){
-		ModelAndView editingDeveloperForm = new ModelAndView("/developersPage::editingDeveloperForm"); //Warning is false positive: View is thymeleaf fragment contained in developersPage.html file
+		ModelAndView editingDeveloperForm = new ModelAndView("developersPage :: editingDeveloperForm"); //Warning is false positive: View is thymeleaf fragment contained in developersPage.html file
 
 		editingDeveloperForm.addObject("developmentTeams", getCurrentDevelopmentTeamsSetup());
 		editingDeveloperForm.addObject("developmentTeamIndex", developmentTeamIndex);

src/test/java/dev/markodojkic/softwaredevelopmentsimulation/test/DevelopersPageControllerTest.java

@@ -68,7 +68,7 @@ void when_getRequestIsSentToDevelopersEditEndpoint_editingDeveloperFormViewIsRet
                         .param("developmentTeamIndex", "0")
                         .param("developerIndex", "0"))
                 .andExpect(status().isOk())
-                .andExpect(view().name("/developersPage::editingDeveloperForm"))
+                .andExpect(view().name("developersPage :: editingDeveloperForm"))
                 .andExpect(model().attributeExists("developmentTeams"))
                 .andExpect(model().attributeExists("developerTypes"))
                 .andExpect(model().attributeExists("formEditDeveloperPlaceholder"))

supervisord.conf

@@ -1,10 +1,18 @@
 [supervisord]
 nodaemon=true
+logfile = /tmp/supervisord.log
+pidfile = /tmp/supervisord.pid
 
 [program:rabbitmq]
 command=rabbitmq-server
 autorestart=true
+stdout_logfile=/tmp/rabbitmq.log
+stderr_logfile=/tmp/rabbitmq.err.log
+loglevel = error
 
 [program:app]
 command=sh -c "until nc -z localhost 5672; do echo 'Waiting for RabbitMQ...'; sleep 1; done; java -jar /app/software-development-simulation.jar"
 autorestart=true
+stdout_logfile=/tmp/app.log
+stderr_logfile=/tmp/app.err.log
+loglevel = error