cleanup

hpi-schul-cloud · Dec 29, 2023 · 1d6bfc5 · 1d6bfc5
1 parent 5bba42f
commit 1d6bfc5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 255 deletions.
diff --git a/.github/workflows/build-and-push-container-image.yml b/.github/workflows/build-and-push-container-image.yml
@@ -24,10 +24,10 @@ jobs:
         id: extract_ref
         shell: bash
         run: echo "git_ref_name=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: maven
       - name: Log in to the Container registry

diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
diff --git a/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar
diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native
diff --git a/src/main/docker/Dockerfile.native-micro b/src/main/docker/Dockerfile.native-micro
diff --git a/src/main/java/de/svs/status/StatusDto.java b/src/main/java/de/svs/status/StatusDto.java
@@ -1,7 +1,10 @@
 package de.svs.status;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import java.time.LocalDateTime;
 
+@RegisterForReflection
 public record StatusDto(String message, String namespaceBaseUri, java.time.LocalDateTime date, boolean success, boolean finalMessage) {
     public StatusDto(String message, String namespaceBaseUri, boolean success, boolean finalMessage) {
         this(message, namespaceBaseUri, LocalDateTime.now(), success, finalMessage);

diff --git a/src/main/resources/templates/Namespace/namespace.html b/src/main/resources/templates/Namespace/namespace.html
@@ -106,16 +106,18 @@
 
 <script>
 
+    function displayMessage(date = new Date(), message) {
+        const liveConsole = document.getElementById('liveConsole');
+        liveConsole.textContent += new Date(date).toISOString() + ': ' + message + '\n';
+    }
+
     function setupSSE() {
         const liveConsole = document.getElementById('liveConsole');
         liveConsole.style.display = 'block';
 
-        const eventSource = new EventSource('namespace/status?namespace={defaultNamespace}');
+        displayMessage("you will be automatically redirected when your namespace becomes ready")
 
-        function displayMessage(date = new Date(), message) {
-            const liveConsole = document.getElementById('liveConsole');
-            liveConsole.textContent += new Date(date).toISOString() + ': ' + message + '\n';
-        }
+        const eventSource = new EventSource('namespace/status?namespace={defaultNamespace}');
 
         eventSource.addEventListener('namespace-status', (e) => {
             const eventData = JSON.parse(e.data);