Switch from JSP to Thymeleaf for view technology

.gitignore

@@ -155,3 +155,5 @@ local.properties
 
 # Code Recommenders
 .recommenders/
+
+tmp-home/

airsonic-main/pom.xml

@@ -3,7 +3,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>airsonic-main</artifactId>
-    <packaging>war</packaging>
     <name>Airsonic Main</name>
 
     <parent>
@@ -56,16 +55,26 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>jakarta.servlet.jsp</groupId>
-            <artifactId>jakarta.servlet.jsp-api</artifactId>
-            <version>2.3.6</version>
-            <scope>provided</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.logging</groupId>
+                    <artifactId>jboss-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -86,6 +95,20 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.logging</groupId>
+                    <artifactId>jboss-logging-processor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib-nodep</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.logging</groupId>
+                    <artifactId>jboss-logging-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.cache</groupId>
@@ -149,20 +172,6 @@
         </dependency>
         <!-- END Spring -->
 
-        <!-- taglibs -->
-        <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>string</artifactId>
-            <version>1.1.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- END taglibs -->
-
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
@@ -218,6 +227,7 @@
             <version>1.24.0</version>
         </dependency>
         <dependency>
+<!--            compression library-->
             <groupId>org.tukaani</groupId>
             <artifactId>xz</artifactId>
             <version>1.9</version>
@@ -301,18 +311,14 @@
             <version>1.2.6</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-		    <groupId>net.sargue</groupId>
-		    <artifactId>java-time-jsptags</artifactId>
-		    <version>1.1.4</version>
-		</dependency>
 
         <dependency>
             <groupId>jakarta.mail</groupId>
             <artifactId>jakarta.mail-api</artifactId>
         </dependency>
 
         <dependency>
+
             <groupId>com.hoodcomputing</groupId>
             <artifactId>natpmp</artifactId>
             <version>0.1</version>
@@ -353,6 +359,12 @@
             <!-- Cling removed the org.fourthline.cling.transport.impl.apache package in 2.1, which is needed to make Cling work with Tomcat. -->
             <!-- Don't upgrade this unless you can test UPnP/DLNA support properly! -->
             <version>2.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -367,6 +379,20 @@
             <groupId>org.seamless</groupId>
             <artifactId>seamless-util</artifactId>
             <version>1.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -427,6 +453,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- Fixes liquibase not using slf4j -->
@@ -452,6 +482,12 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
             <version>${liquibase.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -461,6 +497,7 @@
         </dependency>
 
         <dependency>
+<!--            playlist tooling-->
             <groupId>com.github.muff1nman.chameleon</groupId>
             <artifactId>core</artifactId>
             <version>${chameleon.version}</version>
@@ -514,6 +551,10 @@
                     <groupId>commons-collections</groupId>
                     <artifactId>commons-collections</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.sun.istack</groupId>
+                    <artifactId>istack-commons-runtime</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -527,17 +568,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <!-- Embedded tomcat -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>${tomcat.server.scope}</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>${tomcat.server.scope}</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-json</artifactId>
@@ -637,7 +667,6 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <mainClass>org.airsonic.player.Application</mainClass>
-                    <layout>WAR</layout>
                 </configuration>
             </plugin>
             <plugin>
@@ -720,27 +749,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jspc-maven-plugin</artifactId>
-                <version>9.4.41.v20210516</version>
-                <executions>
-                    <execution>
-                        <id>jspc</id>
-                        <goals>
-                            <goal>jspc</goal>
-                        </goals>
-                        <phase>compile</phase>
-                        <configuration>
-                            <!-- Since we are using spring boot - we do not have a web.xml so there is no sense
-                            enabling merging. Furthermore, we output the webXmlFragment to the target/classes
-                            directory such that it will be on the classpath for use during runtime -->
-                            <mergeFragment>false</mergeFragment>
-                            <webXmlFragment>${project.build.outputDirectory}/precompiled-jsp-web.xml</webXmlFragment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <reporting>

airsonic-main/src/main/java/org/airsonic/player/Application.java

@@ -3,6 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -17,7 +18,8 @@
 import java.lang.reflect.Method;
 
 @SpringBootApplication(exclude = {
-    JmxAutoConfiguration.class
+    JmxAutoConfiguration.class,
+    JmxEndpointAutoConfiguration.class
 })
 @EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
 @ConfigurationPropertiesScan

airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java

@@ -23,6 +23,7 @@
 import org.airsonic.player.service.PersonalSettingsService;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Controller;
@@ -43,6 +44,8 @@ public class AvatarController {
 
     @Autowired
     private ResourceLoader loader;
+    @Value("${resourceRootLocation:}")
+    private String resourceRootLocation = "";
 
     @Autowired
     private PersonalSettingsService personalSettingsService;
@@ -83,8 +86,11 @@ public void handleRequest(
         response.setContentType(avatar.getMimeType());
         Resource res = loader.getResource(avatar.getPath().toString());
         if (!res.exists()) {
-            res = loader.getResource("file:" + avatar.getPath().toString());
+            res = loader.getResource("file:" + resourceRootLocation + avatar.getPath().toString());
         }
+//        if (!res.exists()) {
+//            res = loader.getResource("file:" + avatar.getPath().toString());
+//        }
         IOUtils.copy(res.getInputStream(), response.getOutputStream());
     }
 }

airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtJspController.java

@@ -8,11 +8,26 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Controller
 @RequestMapping("/coverArtJsp")
 public class CoverArtJspController {
     @GetMapping
     public ModelAndView get(HttpServletRequest request, HttpServletResponse response) {
-        return new ModelAndView("coverArt", request.getParameterMap());
+        Map<String, Object> model = new HashMap<>();
+        model.put("hideOverflow", "true".equalsIgnoreCase(request.getParameter("hideOverflow")));
+        model.put("showLink", "true".equalsIgnoreCase(request.getParameter("showLink")));
+        model.put("coverArtSize", Integer.parseInt(request.getParameter("coverArtSize")));
+        model.put("albumId", request.getParameter("albumId"));
+        model.put("playlistId", request.getParameter("playlistId"));
+        model.put("podcastChannelId", request.getParameter("podcastChannelId"));
+        model.put("caption1", request.getParameter("caption1"));
+        model.put("caption2", request.getParameter("caption2"));
+        model.put("caption3", request.getParameter("caption3"));
+        model.put("captionCount", request.getParameter("captionCount"));
+
+        return new ModelAndView("coverArt", model);
     }
 }

airsonic-main/src/main/java/org/airsonic/player/controller/CredentialsManagementController.java

@@ -22,7 +22,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -136,7 +135,7 @@ protected String createNewCreds(Principal user,
         return "redirect:credentialsSettings.view";
     }
 
-    @PutMapping
+    @PostMapping("update")
     protected String updateCreds(Principal user,
             @ModelAttribute("command") @Validated(value = { Default.class, CredentialUpdateChecks.class }) CredentialsManagementCommand cmc,
             BindingResult br, RedirectAttributes redirectAttributes) {
@@ -148,7 +147,7 @@ protected String updateCreds(Principal user,
 
         redirectAttributes.addFlashAttribute("settings_toast", result);
 
-        return "redirect:credentialsSettings.view";
+        return "redirect:/credentialsSettings.view";
     }
 
     @PostMapping(path = "/admin")