From 5894cac355206833f02cfe41f40d9a56d1aac776 Mon Sep 17 00:00:00 2001
From: Yanick Minder <79108296+kcinay055679@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:17:25 +0200
Subject: [PATCH] Feature/refactor formatter (#111)

* refactor formatter

* add html files to spotless plugin

* run formatter

* update workflow and git hook

* update pretterrc

* remove old formatter

* Apply formatter

* Add prettier ignore to doctype tags to stop formatting

* Remove comments

* Format code

* Bring back upper case doctypes and add prettier ignore to them

* Add missing attributes to pages

* Format code and add missing attributs after rebase
---
 .../workflows/validate-formatting-action.yml  |  2 +-
 .prettierrc                                   |  8 +++
 pom.xml                                       | 44 +++++++++----
 pre-commit                                    |  2 +-
 .../eft/ExamFeedbackToolApplication.java      |  3 +-
 .../puzzle/eft/controller/ExamController.java |  9 ++-
 .../eft/controller/ExceptionController.java   |  6 +-
 .../puzzle/eft/controller/SiteController.java |  8 ++-
 .../java/ch/puzzle/eft/model/ExamModel.java   |  4 +-
 .../ch/puzzle/eft/service/ExamService.java    | 17 ++---
 .../puzzle/eft/service/ValidationService.java |  4 +-
 .../static/styles/cookie-consent-popup.css    |  6 +-
 .../static/styles/custom_bootstrap.css        | 57 +++++++++++-----
 src/main/resources/static/styles/header.css   |  2 +-
 src/main/resources/static/styles/search.css   |  2 +-
 src/main/resources/static/styles/styles.css   |  8 +--
 src/main/resources/templates/error.html       | 28 +++++---
 .../fragments/cookie-consent-popup.html       | 38 +++++++----
 .../templates/fragments/exam-file.html        |  5 +-
 .../fragments/exam-number-input.html          | 37 +++++++++--
 .../resources/templates/fragments/footer.html | 30 +++++++--
 .../resources/templates/fragments/header.html | 19 ++++--
 .../fragments/internal-server-error.html      | 12 ++--
 .../templates/fragments/not-found-error.html  | 12 ++--
 src/main/resources/templates/index.html       | 17 +++--
 src/main/resources/templates/layout.html      | 65 +++++++++++--------
 src/main/resources/templates/search.html      | 47 ++++++++------
 .../eft/ExamFeedbackToolApplicationTests.java |  1 +
 .../ExamFeedbackToolArchitectureTest.java     |  9 +--
 .../eft/controller/ExamControllerTest.java    |  9 +--
 .../controller/ExceptionControllerTest.java   |  6 +-
 .../eft/controller/SiteControllerTest.java    |  8 ++-
 .../puzzle/eft/service/ExamServiceTest.java   | 19 +++---
 33 files changed, 363 insertions(+), 181 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.github/workflows/validate-formatting-action.yml b/.github/workflows/validate-formatting-action.yml
index 77034e0cf..6bba98fd9 100644
--- a/.github/workflows/validate-formatting-action.yml
+++ b/.github/workflows/validate-formatting-action.yml
@@ -13,4 +13,4 @@ jobs:
           java-version: '21'
           distribution: 'oracle'
       - name: Validate that the code is formatted correctly
-        run: mvn formatter:validate
\ No newline at end of file
+        run: mvn spotless:check
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..11b963b0c
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "tabWidth": 4,
+  "useTabs": false,
+  "printWidth": 80,
+  "htmlWhitespaceSensitivity": "ignore",
+  "bracketSameLine": true,
+  "endOfLine": "lf"
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ae834799f..7d02e46ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,23 +195,45 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>net.revelc.code.formatter</groupId>
-				<artifactId>formatter-maven-plugin</artifactId>
-				<version>2.24.1</version>
-				<configuration>
-					<compilerSource>21</compilerSource>
-					<compilerCompliance>21</compilerCompliance>
-					<compilerTargetPlatform>21</compilerTargetPlatform>
-					<lineEnding>LF</lineEnding>
-					<configFile>${project.basedir}/src/main/resources/formatting.xml</configFile>
-				</configuration>
+				<groupId>com.diffplug.spotless</groupId>
+				<artifactId>spotless-maven-plugin</artifactId>
+				<version>2.40.0</version>
 				<executions>
 					<execution>
 						<goals>
-							<goal>format</goal>
+							<goal>apply</goal>
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<formats>
+						<format>
+							<includes>
+								<include>src/main/resources/**/*.css</include>
+								<include>src/main/resources/**/*.html</include>
+							</includes>
+							<excludes>
+								<exclude>src/main/resources/static/styles/bootstrap.min.css</exclude>
+							</excludes>
+							<prettier>
+								<prettierVersion>3.3.3</prettierVersion>
+								<configFile>${project.basedir}/.prettierrc</configFile>
+							</prettier>
+						</format>
+					</formats>
+					<java>
+						<eclipse>
+							<version>4.26</version>
+							<file>${project.basedir}/src/main/resources/formatting.xml</file>
+						</eclipse>
+						<removeUnusedImports />
+						<importOrder>
+							<order>java|javax,ch.puzzle,org,com,com.diffplug,,\#com.diffplug,\#</order>
+							<semanticSort>true</semanticSort>
+						</importOrder>
+						<formatAnnotations />
+					</java>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/pre-commit b/pre-commit
index 2e134e64b..1ab000ef0 100755
--- a/pre-commit
+++ b/pre-commit
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addedFiles=$(git diff --cached --name-only --diff-filter=d)
-mvn formatter:format
+mvn spotless:apply
 git add $addedFiles
\ No newline at end of file
diff --git a/src/main/java/ch/puzzle/eft/ExamFeedbackToolApplication.java b/src/main/java/ch/puzzle/eft/ExamFeedbackToolApplication.java
index 4be8201c6..5b43d190e 100644
--- a/src/main/java/ch/puzzle/eft/ExamFeedbackToolApplication.java
+++ b/src/main/java/ch/puzzle/eft/ExamFeedbackToolApplication.java
@@ -1,10 +1,11 @@
 package ch.puzzle.eft;
 
-import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
+import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
+
 @SpringBootApplication
 public class ExamFeedbackToolApplication {
 
diff --git a/src/main/java/ch/puzzle/eft/controller/ExamController.java b/src/main/java/ch/puzzle/eft/controller/ExamController.java
index 5f45dacdb..29d8852f5 100644
--- a/src/main/java/ch/puzzle/eft/controller/ExamController.java
+++ b/src/main/java/ch/puzzle/eft/controller/ExamController.java
@@ -1,16 +1,15 @@
 package ch.puzzle.eft.controller;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+
 import ch.puzzle.eft.service.ExamService;
+
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 
 @RestController
 @RequestMapping("/exams")
diff --git a/src/main/java/ch/puzzle/eft/controller/ExceptionController.java b/src/main/java/ch/puzzle/eft/controller/ExceptionController.java
index 441a82cfa..8163d1363 100644
--- a/src/main/java/ch/puzzle/eft/controller/ExceptionController.java
+++ b/src/main/java/ch/puzzle/eft/controller/ExceptionController.java
@@ -2,8 +2,7 @@
 
 
 import ch.puzzle.eft.model.ErrorModel;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -14,6 +13,9 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
 @ControllerAdvice
 @Controller
 public class ExceptionController implements ErrorController {
diff --git a/src/main/java/ch/puzzle/eft/controller/SiteController.java b/src/main/java/ch/puzzle/eft/controller/SiteController.java
index 9bd6ef496..b18decac9 100644
--- a/src/main/java/ch/puzzle/eft/controller/SiteController.java
+++ b/src/main/java/ch/puzzle/eft/controller/SiteController.java
@@ -1,8 +1,11 @@
 package ch.puzzle.eft.controller;
 
+import java.time.Duration;
+import java.util.Objects;
+
 import ch.puzzle.eft.model.ExamNumberForm;
 import ch.puzzle.eft.service.ExamService;
-import jakarta.validation.Valid;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
@@ -15,8 +18,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.time.Duration;
-import java.util.Objects;
+import jakarta.validation.Valid;
 
 @Controller
 public class SiteController {
diff --git a/src/main/java/ch/puzzle/eft/model/ExamModel.java b/src/main/java/ch/puzzle/eft/model/ExamModel.java
index 00674846c..d47c6e46a 100644
--- a/src/main/java/ch/puzzle/eft/model/ExamModel.java
+++ b/src/main/java/ch/puzzle/eft/model/ExamModel.java
@@ -1,12 +1,12 @@
 package ch.puzzle.eft.model;
 
+import java.io.File;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.File;
-
 public class ExamModel {
     private final File file;
     private static final Logger logger = LoggerFactory.getLogger(ExamModel.class);
diff --git a/src/main/java/ch/puzzle/eft/service/ExamService.java b/src/main/java/ch/puzzle/eft/service/ExamService.java
index 365ef25b9..5889262b2 100644
--- a/src/main/java/ch/puzzle/eft/service/ExamService.java
+++ b/src/main/java/ch/puzzle/eft/service/ExamService.java
@@ -1,13 +1,5 @@
 package ch.puzzle.eft.service;
 
-import ch.puzzle.eft.model.ExamModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-import org.springframework.web.server.ResponseStatusException;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,6 +9,15 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import ch.puzzle.eft.model.ExamModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
 @Service
 public class ExamService {
     private static final Logger logger = LoggerFactory.getLogger(ExamService.class);
diff --git a/src/main/java/ch/puzzle/eft/service/ValidationService.java b/src/main/java/ch/puzzle/eft/service/ValidationService.java
index f9caeeed9..2ffa7ecfc 100644
--- a/src/main/java/ch/puzzle/eft/service/ValidationService.java
+++ b/src/main/java/ch/puzzle/eft/service/ValidationService.java
@@ -1,10 +1,10 @@
 package ch.puzzle.eft.service;
 
-import org.springframework.stereotype.Service;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public class ValidationService {
     private static final Pattern EXAM_NUMBER_PATTERN = Pattern.compile("^\\d{5}$");
diff --git a/src/main/resources/static/styles/cookie-consent-popup.css b/src/main/resources/static/styles/cookie-consent-popup.css
index d41f6ea11..6edd92dcd 100644
--- a/src/main/resources/static/styles/cookie-consent-popup.css
+++ b/src/main/resources/static/styles/cookie-consent-popup.css
@@ -1,9 +1,9 @@
 .modal {
     background-color: rgba(0, 0, 0, 0.5);
 }
-.modal-header{
+.modal-header {
     border-color: var(--primary-hex);
 }
-.modal-footer{
+.modal-footer {
     border-color: var(--primary-hex);
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/styles/custom_bootstrap.css b/src/main/resources/static/styles/custom_bootstrap.css
index e1d8a541f..26e4932ed 100644
--- a/src/main/resources/static/styles/custom_bootstrap.css
+++ b/src/main/resources/static/styles/custom_bootstrap.css
@@ -1,16 +1,15 @@
 :root {
     --primary-rgb: 229, 0, 125;
-    --primary-hex: rgba(var(--bs-primary-rgb),1);
+    --primary-hex: rgba(var(--bs-primary-rgb), 1);
     /*bootstrap*/
     --bs-primary-rgb: var(--primary-rgb);
-    --bs-secondary-rgb: 0, 0,0;
+    --bs-secondary-rgb: 0, 0, 0;
 
-
-    --bs-primary-link-hover-color-rgb: 0,0,0;
+    --bs-primary-link-hover-color-rgb: 0, 0, 0;
     --bs-secondary-link-hover-color-rgb: var(--bs-primary-rgb);
 
     --button-primary-color: var(--primary-hex);
-    --button-primary-hover-color:rgb( 240, 38, 144);
+    --button-primary-hover-color: rgb(240, 38, 144);
 }
 
 .btn-outline-primary {
@@ -48,19 +47,47 @@
 /*Attention: The focus style must be defined before the hover style or it will break*/
 
 .link-primary:focus {
-    color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-opacity, 1)) !important;
-    -webkit-text-decoration-color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
-    text-decoration-color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
+    color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-opacity, 1)
+    ) !important;
+    -webkit-text-decoration-color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
+    text-decoration-color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
 }
 
-.link-secondary:focus, .link-primary:hover {
-    color: RGBA(var(--bs-primary-link-hover-color-rgb), var(--bs-link-opacity, 1)) !important;
-    -webkit-text-decoration-color: RGBA(var(--bs-primary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
-    text-decoration-color: RGBA(var(--bs-primary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
+.link-secondary:focus,
+.link-primary:hover {
+    color: RGBA(
+        var(--bs-primary-link-hover-color-rgb),
+        var(--bs-link-opacity, 1)
+    ) !important;
+    -webkit-text-decoration-color: RGBA(
+        var(--bs-primary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
+    text-decoration-color: RGBA(
+        var(--bs-primary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
 }
 
 .link-secondary:hover {
-    color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-opacity, 1)) !important;
-    -webkit-text-decoration-color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
-    text-decoration-color: RGBA(var(--bs-secondary-link-hover-color-rgb), var(--bs-link-underline-opacity, 1)) !important;
+    color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-opacity, 1)
+    ) !important;
+    -webkit-text-decoration-color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
+    text-decoration-color: RGBA(
+        var(--bs-secondary-link-hover-color-rgb),
+        var(--bs-link-underline-opacity, 1)
+    ) !important;
 }
diff --git a/src/main/resources/static/styles/header.css b/src/main/resources/static/styles/header.css
index d33e9a5fc..307ac9bc8 100644
--- a/src/main/resources/static/styles/header.css
+++ b/src/main/resources/static/styles/header.css
@@ -1,3 +1,3 @@
 #logo {
     height: 70px;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/styles/search.css b/src/main/resources/static/styles/search.css
index 3554483f1..0ec51c88d 100644
--- a/src/main/resources/static/styles/search.css
+++ b/src/main/resources/static/styles/search.css
@@ -1,3 +1,3 @@
 .content {
     padding-bottom: 6rem;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/styles/styles.css b/src/main/resources/static/styles/styles.css
index 6019a0ccb..007a85dd1 100644
--- a/src/main/resources/static/styles/styles.css
+++ b/src/main/resources/static/styles/styles.css
@@ -1,9 +1,9 @@
 @font-face {
-    font-family: 'OpenSans';
+    font-family: "OpenSans";
     src:
-            local('OpenSans Regular'),
-            url('../fonts/Open_Sans/OpenSans-Regular.ttf') format('truetype'),
-            url('../fonts/Open_Sans/OpenSans-Regular.woff2') format('woff2');
+        local("OpenSans Regular"),
+        url("../fonts/Open_Sans/OpenSans-Regular.ttf") format("truetype"),
+        url("../fonts/Open_Sans/OpenSans-Regular.woff2") format("woff2");
     font-weight: normal;
     font-style: normal;
 }
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index c5b8a366f..8674b1884 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -1,11 +1,19 @@
+<!--prettier-ignore-->
 <!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{layout.html}" lang="">
-<body>
-<section layout:fragment="content">
-    <div th:replace="~{fragments/internal-server-error}"></div>
-    <div th:replace="~{fragments/not-found-error}"></div>
-    <a data-testid="back-to-main-page" href="/return" class="link-secondary">Zurück zur Startseite</a>
-</section>
-</body>
-</html>
\ No newline at end of file
+<html
+    xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+    layout:decorate="~{layout.html}"
+    lang="de">
+    <body>
+        <section layout:fragment="content">
+            <div th:replace="~{fragments/internal-server-error}"></div>
+            <div th:replace="~{fragments/not-found-error}"></div>
+            <a
+                data-testid="back-to-main-page"
+                href="/return"
+                class="link-secondary">
+                Zurück zur Startseite
+            </a>
+        </section>
+    </body>
+</html>
diff --git a/src/main/resources/templates/fragments/cookie-consent-popup.html b/src/main/resources/templates/fragments/cookie-consent-popup.html
index 22790cdaa..ae9af25ea 100644
--- a/src/main/resources/templates/fragments/cookie-consent-popup.html
+++ b/src/main/resources/templates/fragments/cookie-consent-popup.html
@@ -1,23 +1,39 @@
-<div aria-labelledby="exampleModalLabel" class="modal d-block overflow-hidden" id="exampleModal" tabindex="-1"
-     xmlns="http://www.w3.org/1999/html">
+<div
+    aria-labelledby="exampleModalLabel"
+    class="modal d-block overflow-hidden"
+    id="exampleModal"
+    tabindex="-1"
+    xmlns="http://www.w3.org/1999/html">
     <div class="modal-dialog modal-dialog-scrollable mb-5">
         <div class="modal-content">
             <div class="modal-header justify-content-center">
-                <img alt="image not found" class="m-4" id="logo"
-                     th:src="@{images/UNILU_Schriftzug_Klein_schwarz_DE.svg}">
+                <img
+                    alt="image not found"
+                    class="m-4"
+                    id="logo"
+                    th:src="@{images/UNILU_Schriftzug_Klein_schwarz_DE.svg}" />
             </div>
-            <div class="modal-body d-flex justify-content-center align-items-center flex-column text-center">
-                <h1 class="modal-title fs-5" id="exampleModalLabel">Diese Webseite verwendet Cookies</h1>
-                <p>Wir benutzen Cookies um die Funktionalität der Seite sicher zu stellen</p>
+            <div
+                class="modal-body d-flex justify-content-center align-items-center flex-column text-center">
+                <h1 class="modal-title fs-5" id="exampleModalLabel">
+                    Diese Webseite verwendet Cookies
+                </h1>
+                <p>
+                    Wir benutzen Cookies um die Funktionalität der Seite sicher
+                    zu stellen
+                </p>
             </div>
             <form th:action="@{/}" method="post">
-                <div class="modal-footer d-flex flex-row justify-content-center">
-                    <button data-testid="cookie-consent-button" class="btn btn-primary col-3"
-                             type="submit">Zulassen
+                <div
+                    class="modal-footer d-flex flex-row justify-content-center">
+                    <button
+                        data-testid="cookie-consent-button"
+                        class="btn btn-primary col-3"
+                        type="submit">
+                        Zulassen
                     </button>
                 </div>
             </form>
         </div>
     </div>
 </div>
-
diff --git a/src/main/resources/templates/fragments/exam-file.html b/src/main/resources/templates/fragments/exam-file.html
index 2c2399248..8372d4372 100644
--- a/src/main/resources/templates/fragments/exam-file.html
+++ b/src/main/resources/templates/fragments/exam-file.html
@@ -1 +1,4 @@
-<a th:href="@{|/exams/download/${examFile.getSubjectName}/${examNumberForm.getExamNumber()}|}" th:text="${examFile.getSubjectName()}" class="link-primary"></a>
\ No newline at end of file
+<a
+    th:href="@{|/exams/download/${examFile.getSubjectName}/${examNumberForm.getExamNumber()}|}"
+    th:text="${examFile.getSubjectName()}"
+    class="link-primary"></a>
diff --git a/src/main/resources/templates/fragments/exam-number-input.html b/src/main/resources/templates/fragments/exam-number-input.html
index 58f0d6ba5..5ea0c18bd 100644
--- a/src/main/resources/templates/fragments/exam-number-input.html
+++ b/src/main/resources/templates/fragments/exam-number-input.html
@@ -1,8 +1,35 @@
-<form action="#" th:action="@{/search}" th:object="${examNumberForm}" method="post" class="was-validated" novalidate>
+<form
+    action="#"
+    th:action="@{/search}"
+    th:object="${examNumberForm}"
+    method="post"
+    class="was-validated"
+    novalidate>
     <label for="examNumber">Prüfungsnummer eingeben:</label>
     <span class="d-flex">
-    <input data-testid="exam-number-input" type="text" pattern="[0-9]{5}" name="examNumber" id="examNumber" placeholder="20202" th:value="*{examNumber}" th:maxlength="5" class="form-control" required>
-    <button data-testid="submit-button" type="submit" id="submit-button" class="btn btn-outline-primary">Suchen</button>
+        <input
+            data-testid="exam-number-input"
+            type="text"
+            pattern="[0-9]{5}"
+            name="examNumber"
+            id="examNumber"
+            placeholder="20202"
+            th:value="*{examNumber}"
+            th:maxlength="5"
+            class="form-control"
+            required />
+        <button
+            data-testid="submit-button"
+            type="submit"
+            id="submit-button"
+            class="btn btn-outline-primary">
+            Suchen
+        </button>
     </span>
-    <p th:if="${#fields.hasErrors('examNumber')}" th:errors="*{examNumber}" class="text-danger">Prüfungsnummer Error</p>
-</form>
\ No newline at end of file
+    <p
+        th:if="${#fields.hasErrors('examNumber')}"
+        th:errors="*{examNumber}"
+        class="text-danger">
+        Prüfungsnummer Error
+    </p>
+</form>
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
index 39f11cb9f..82f821d89 100644
--- a/src/main/resources/templates/fragments/footer.html
+++ b/src/main/resources/templates/fragments/footer.html
@@ -1,11 +1,29 @@
-<footer class="position-fixed bottom-0 w-100 z-1 bg-white d-flex justify-content-center">
-    <div class="align-items-center justify-content-between d-flex border-top border-black w-100 h-100 p-4 mx-3">
-        <a data-testid="swissuniversities-link" href="https://www.swissuniversities.ch/" target="_blank">
-            <img data-testid="swissuniversities-logo" alt="Swissuniversities logo" height="22px" th:src="@{images/swissuniversities.png}">
+<footer
+    class="position-fixed bottom-0 w-100 z-1 bg-white d-flex justify-content-center">
+    <div
+        class="align-items-center justify-content-between d-flex border-top border-black w-100 h-100 p-4 mx-3">
+        <a
+            data-testid="swissuniversities-link"
+            href="https://www.swissuniversities.ch/"
+            target="_blank">
+            <img
+                data-testid="swissuniversities-logo"
+                alt="Swissuniversities logo"
+                height="22px"
+                th:src="@{images/swissuniversities.png}" />
         </a>
         <div class="d-flex align-items-center gap-4">
-            <a class="link-primary" href="https://www.unilu.ch/impressum/" target="_blank" data-testid="impressum-link">Impressum & Datenschutz</a>
-            <p class="m-0" th:text="${'Version ' + @environment.getProperty('spring.application.version')}" data-testid="version"></p>
+            <a
+                class="link-primary"
+                href="https://www.unilu.ch/impressum/"
+                target="_blank"
+                data-testid="impressum-link">
+                Impressum & Datenschutz
+            </a>
+            <p
+                class="m-0"
+                th:text="${'Version ' + @environment.getProperty('spring.application.version')}"
+                data-testid="version"></p>
         </div>
     </div>
 </footer>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index d02a83c5c..79dfa8d61 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -1,13 +1,22 @@
-<header class="d-flex p-2 pb-0 align-items-center justify-content-between border-bottom border-dark mx-4 pb-3">
+<header
+    class="d-flex p-2 pb-0 align-items-center justify-content-between border-bottom border-dark mx-4 pb-3">
     <a href="/">
-        <img alt="image not found" class="m-4" id="logo" th:src="@{images/UNILU_Schriftzug_Standard_schwarz_DE.png}">
+        <img
+            alt="image not found"
+            class="m-4"
+            id="logo"
+            th:src="@{images/UNILU_Schriftzug_Standard_schwarz_DE.png}" />
     </a>
     <div class="d-flex justify-content-end flex-column">
-        <p class="me-4 fs-3 text-end">Sven Studi</p><!--Todo wenn login funktioniert auf eingeloggten user ändern-->
+        <p class="me-4 fs-3 text-end">Sven Studi</p>
+        <!--Todo wenn login funktioniert auf eingeloggten user ändern-->
         <div class="me-4 d-flex gap-3 flex-row">
             <a class="link-primary" th:href="@{/search}">Prüfungslaufnummer</a>
-            <a class="link-primary" th:href="'#'">Kontakt</a><!--Todo wenn contact.html existiert-->
-            <a class="link-primary" th:href="'#'">Logout</a> <!--Todo wenn login funktioniert-->
+            <a class="link-primary" th:href="'#'">Kontakt</a>
+            <!--Todo wenn contact.html existiert-->
+            <a class="link-primary" th:href="'#'">Logout</a>
+            <!--Todo wenn login funktioniert-->
         </div>
     </div>
 </header>
+<hr class="mt-0" />
diff --git a/src/main/resources/templates/fragments/internal-server-error.html b/src/main/resources/templates/fragments/internal-server-error.html
index 21fc5c6c7..14c615959 100644
--- a/src/main/resources/templates/fragments/internal-server-error.html
+++ b/src/main/resources/templates/fragments/internal-server-error.html
@@ -1,7 +1,11 @@
-<div th:if="${session.get('errorModel') != null and session.get('errorModel').getError().equals('unknown')}">
+<div
+    th:if="${session.get('errorModel') != null and session.get('errorModel').getError().equals('unknown')}">
     <h1>Ein unerwarteter Fehler ist aufgetreten.</h1>
     <p th:text="${session.get('errorModel').getErrorMessage()}"></p>
-    <p>Kontaktiere
-        <a class="link-secondary" href="mailto: helpdesk@unilu.ch">helpdesk@unilu.ch.</a>
+    <p>
+        Kontaktiere
+        <a class="link-secondary" href="mailto: helpdesk@unilu.ch">
+            helpdesk@unilu.ch.
+        </a>
     </p>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/resources/templates/fragments/not-found-error.html b/src/main/resources/templates/fragments/not-found-error.html
index fc7466b1d..ef84cfe1d 100644
--- a/src/main/resources/templates/fragments/not-found-error.html
+++ b/src/main/resources/templates/fragments/not-found-error.html
@@ -1,7 +1,11 @@
-<div th:if="${session.get('errorModel') == null or session.get('errorModel').getError() == '404'}">
+<div
+    th:if="${session.get('errorModel') == null or session.get('errorModel').getError() == '404'}">
     <h1>Die gesuchte Seite wurde nicht gefunden.</h1>
-    <p>Versuche eine Prüfung zu
+    <p>
+        Versuche eine Prüfung zu
         <a href="/search" class="link-secondary">suchen</a>
-        oder gehe zurück zur  <a href="/" class="link-secondary">Startseite</a>.
+        oder gehe zurück zur
+        <a href="/" class="link-secondary">Startseite</a>
+        .
     </p>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 814f684b0..b47b9894a 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,9 +1,14 @@
+<!--prettier-ignore-->
 <!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{layout.html}" lang="">
+<html
+    xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+    layout:decorate="~{layout.html}"
+    lang="de">
     <body>
-    <section layout:fragment="content">
-            <span class="display-4">Willkommen bei der Prüfungsabfrage der Uni Luzern</span>
-    </section>
+        <section layout:fragment="content">
+            <span class="display-4">
+                Willkommen bei der Prüfungsabfrage der Uni Luzern
+            </span>
+        </section>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
index dcae51402..dd48ce596 100644
--- a/src/main/resources/templates/layout.html
+++ b/src/main/resources/templates/layout.html
@@ -1,29 +1,40 @@
+<!--prettier-ignore-->
 <!DOCTYPE html>
-<html lang="" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-<head>
-    <script integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+<html lang="de" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+    <head>
+        <script
+            integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
             th:src="@{javascript/bootstrap.bundle.min.js}"></script>
-    <link rel="stylesheet" th:href="@{styles/bootstrap.min.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{styles/custom_bootstrap.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{styles/styles.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{styles/header.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{styles/footer.css}" type="text/css">
-    <link rel="stylesheet" th:href="@{styles/cookie-consent-popup.css}" type="text/css">
-    <title>Universität Luzern - Prüfungen</title>
-    <link rel="icon" th:href="@{favicon.ico}" type="image/png">
-</head>
-<body>
-<header th:replace="~{fragments/header}"></header>
-<div th:if="${cookiesMissing}">
-    <div  th:replace="~{fragments/cookie-consent-popup}"></div>
-</div>
-<div class="container-fluid">
-    <div class="d-flex justify-content-center">
-        <section layout:fragment="content">
-            <p>Page content goes here</p>
-        </section>
-    </div>
-</div>
-<footer th:replace="~{fragments/footer}"></footer>
-</body>
-</html>
\ No newline at end of file
+        <link
+            rel="stylesheet"
+            th:href="@{styles/bootstrap.min.css}"
+            type="text/css" />
+        <link
+            rel="stylesheet"
+            th:href="@{styles/custom_bootstrap.css}"
+            type="text/css" />
+        <link rel="stylesheet" th:href="@{styles/styles.css}" type="text/css" />
+        <link rel="stylesheet" th:href="@{styles/header.css}" type="text/css" />
+        <link rel="stylesheet" th:href="@{styles/footer.css}" type="text/css" />
+        <link
+            rel="stylesheet"
+            th:href="@{styles/cookie-consent-popup.css}"
+            type="text/css" />
+        <title>Universität Luzern - Prüfungen</title>
+        <link rel="icon" th:href="@{favicon.ico}" type="image/png" />
+    </head>
+    <body>
+        <header th:replace="~{fragments/header}"></header>
+        <div th:if="${cookiesMissing}">
+            <div th:replace="~{fragments/cookie-consent-popup}"></div>
+        </div>
+        <div class="container-fluid">
+            <div class="d-flex justify-content-center">
+                <section layout:fragment="content">
+                    <p>Page content goes here</p>
+                </section>
+            </div>
+        </div>
+        <footer th:replace="~{fragments/footer}"></footer>
+    </body>
+</html>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 6fdaef98b..8cc6ff0a4 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -1,22 +1,29 @@
+<!--prettier-ignore-->
 <!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{layout.html}">
-<head>
-    <link rel="stylesheet" th:href="@{styles/search.css}" type="text/css">
-</head>
-<body>
-<section layout:fragment="content" class="content">
-    <span class="display-4">Suche nach einer Prüfung...</span>
+<html
+    xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+    layout:decorate="~{layout.html}"
+    lang="de">
+    <head>
+        <link rel="stylesheet" th:href="@{styles/search.css}" type="text/css" />
+        <title>Universität Luzern - Prüfungen</title>
+    </head>
+    <body>
+        <section layout:fragment="content" class="content">
+            <span class="display-4">Suche nach einer Prüfung...</span>
 
-    <div th:replace="~{fragments/exam-number-input}"></div>
-    <div class="exam-files" th:each="examFile: ${examFiles}">
-        <div th:replace="~{fragments/exam-file}"></div>
-    </div>
-    <div th:if="${examFiles != null && examFiles.size() >= 2}">
-        <a th:href="@{'/exams/download-zip/' + ${examNumberForm.getExamNumber()}}" class="btn btn-outline-primary" data-testid="zip-download-button">
-            Alle als ZIP herunterladen
-        </a>
-    </div>
-</section>
-</body>
-</html>
\ No newline at end of file
+            <div th:replace="~{fragments/exam-number-input}"></div>
+            <div class="exam-files" th:each="examFile: ${examFiles}">
+                <div th:replace="~{fragments/exam-file}"></div>
+            </div>
+            <div th:if="${examFiles != null && examFiles.size() >= 2}">
+                <a
+                    th:href="@{'/exams/download-zip/' + ${examNumberForm.getExamNumber()}}"
+                    class="btn btn-outline-primary"
+                    data-testid="zip-download-button">
+                    Alle als ZIP herunterladen
+                </a>
+            </div>
+        </section>
+    </body>
+</html>
diff --git a/src/test/java/ch/puzzle/eft/ExamFeedbackToolApplicationTests.java b/src/test/java/ch/puzzle/eft/ExamFeedbackToolApplicationTests.java
index 4e27ce59e..1fd6a499e 100644
--- a/src/test/java/ch/puzzle/eft/ExamFeedbackToolApplicationTests.java
+++ b/src/test/java/ch/puzzle/eft/ExamFeedbackToolApplicationTests.java
@@ -4,6 +4,7 @@
 import ch.puzzle.eft.controller.SiteController;
 import ch.puzzle.eft.service.ExamService;
 import ch.puzzle.eft.service.ValidationService;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
diff --git a/src/test/java/ch/puzzle/eft/architecture/ExamFeedbackToolArchitectureTest.java b/src/test/java/ch/puzzle/eft/architecture/ExamFeedbackToolArchitectureTest.java
index 85befc49c..c28f301f6 100644
--- a/src/test/java/ch/puzzle/eft/architecture/ExamFeedbackToolArchitectureTest.java
+++ b/src/test/java/ch/puzzle/eft/architecture/ExamFeedbackToolArchitectureTest.java
@@ -1,14 +1,15 @@
 package ch.puzzle.eft.architecture;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
+
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.library.Architectures;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
diff --git a/src/test/java/ch/puzzle/eft/controller/ExamControllerTest.java b/src/test/java/ch/puzzle/eft/controller/ExamControllerTest.java
index 19baf757f..c285c3301 100644
--- a/src/test/java/ch/puzzle/eft/controller/ExamControllerTest.java
+++ b/src/test/java/ch/puzzle/eft/controller/ExamControllerTest.java
@@ -1,6 +1,11 @@
 package ch.puzzle.eft.controller;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.nio.file.Files;
+
 import ch.puzzle.eft.service.ExamService;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -10,10 +15,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.nio.file.Files;
-
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/ch/puzzle/eft/controller/ExceptionControllerTest.java b/src/test/java/ch/puzzle/eft/controller/ExceptionControllerTest.java
index 4a06ae3ee..9161af535 100644
--- a/src/test/java/ch/puzzle/eft/controller/ExceptionControllerTest.java
+++ b/src/test/java/ch/puzzle/eft/controller/ExceptionControllerTest.java
@@ -1,14 +1,16 @@
 package ch.puzzle.eft.controller;
 
 import ch.puzzle.eft.model.ErrorModel;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
+
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.ui.Model;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
 
diff --git a/src/test/java/ch/puzzle/eft/controller/SiteControllerTest.java b/src/test/java/ch/puzzle/eft/controller/SiteControllerTest.java
index 6e542d99e..a776adb5d 100644
--- a/src/test/java/ch/puzzle/eft/controller/SiteControllerTest.java
+++ b/src/test/java/ch/puzzle/eft/controller/SiteControllerTest.java
@@ -1,8 +1,11 @@
 package ch.puzzle.eft.controller;
 
+import java.io.File;
+import java.util.List;
+
 import ch.puzzle.eft.model.ExamModel;
 import ch.puzzle.eft.service.ExamService;
-import jakarta.servlet.http.Cookie;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +19,7 @@
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.File;
-import java.util.List;
+import jakarta.servlet.http.Cookie;
 
 import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
diff --git a/src/test/java/ch/puzzle/eft/service/ExamServiceTest.java b/src/test/java/ch/puzzle/eft/service/ExamServiceTest.java
index c9cdeffad..4d825f81f 100644
--- a/src/test/java/ch/puzzle/eft/service/ExamServiceTest.java
+++ b/src/test/java/ch/puzzle/eft/service/ExamServiceTest.java
@@ -1,14 +1,5 @@
 package ch.puzzle.eft.service;
 
-import ch.puzzle.eft.model.ExamModel;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Spy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.server.ResponseStatusException;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -20,6 +11,16 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import ch.puzzle.eft.model.ExamModel;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Spy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
+
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;