Avoid Thymeleaf 3.1+ Forbidden Method Calls by Precomputing Class Simple Names

.github/workflows/release.yml

@@ -13,8 +13,8 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'adopt'
+          java-version: '26'
+          distribution: 'temurin'
       - name: Publish package
         env:
           JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>4.1.1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>tech.ailef</groupId>
@@ -15,7 +15,7 @@
 	<name>SnapAdmin</name>
 	<description>SnapAdmin is an auto-generated CRUD admin panel for Spring Boot/JPA apps</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>26</java.version>
 	</properties>
 	<licenses>
 		<license>

src/main/java/tech/ailef/snapadmin/external/StartupAuthCheckRunner.java

@@ -25,7 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.context.ServletWebServerInitializedEvent;
+import org.springframework.boot.web.server.servlet.context.ServletWebServerInitializedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java

@@ -51,8 +51,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
 
 import tech.ailef.snapadmin.external.SnapAdmin;
 import tech.ailef.snapadmin.external.dbmapping.DbFieldValue;
@@ -278,16 +278,16 @@ private String toJsonl(List<DbObject> items, List<String> fields, boolean raw) {
 			try {
 				String json = mapper.writeValueAsString(map);
 				sb.append(json);
-			} catch (JsonProcessingException e) {
+			} catch (JacksonException e) {
 				throw new SnapAdminException(e);
 			}
-			
+
 			sb.append("\n");
 		}
 
 		return sb.toString();
 	}
-	
+
 	private String toJsonlQuery(DbQueryResult result, List<String> fields) {
 		if (result.isEmpty())
 			return "";
@@ -299,10 +299,10 @@ private String toJsonlQuery(DbQueryResult result, List<String> fields) {
 			try {
 				String json = mapper.writeValueAsString(map);
 				sb.append(json);
-			} catch (JsonProcessingException e) {
+			} catch (JacksonException e) {
 				throw new SnapAdminException(e);
 			}
-			
+
 			sb.append("\n");
 		}
 

src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java

@@ -148,7 +148,10 @@ public SnapAdmin getSnapAdmin() {
 	public Class<?> getJavaClass() {
 		return entityClass;
 	}
-
+
+	public String getJavaClassSimpleName(){
+		return entityClass.getSimpleName();
+	}
 	/**
 	 * Returns the name of the Java class for the underlying `@Entity` this schema
 	 * corresponds to

src/main/resources/templates/snapadmin/model/create.html

@@ -16,7 +16,7 @@ <h1 class="fw-bold mb-4">
 						<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities </a></span>
 						<i class="align-middle bi bi-chevron-double-right"></i> 
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|">
-						 [[ ${schema.getJavaClass().getSimpleName()} ]] </a>
+						 [[ ${schema.javaClassSimpleName} ]] </a>
 						<i class="align-middle bi bi-chevron-double-right"></i> 
 						<span class="align-middle" th:text="${create ? 'Create' : 'Edit'}"></span>
 						<th:block th:if="${!create}">
@@ -27,7 +27,7 @@ <h1 class="fw-bold mb-4">
 		    		<div class="row mt-4">
 		    			<div class="col">
 		    				<div class="box">
-								<h3 class="fw-bold mb-4" th:text="${create ? schema.getJavaClass().getSimpleName() : object.getDisplayName()}"></h3>
+								<h3 class="fw-bold mb-4" th:text="${create ? schema.javaClassSimpleName : object.getDisplayName()}"></h3>
 		        				<form class="form" enctype="multipart/form-data" method="post" th:action="|/${snapadmin_baseUrl}/model/${className}/create|">
 		        					<input type="hidden" name="__snapadmin_create" th:value="${create}">
 									<div th:each="field : ${schema.getSortedFields(false)}" class="mt-2"

src/main/resources/templates/snapadmin/model/list.html

@@ -104,7 +104,7 @@ <h5 class="fw-bold mt-3">Export format</h3>
 					<h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 						<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities</a></span> 
 						<i class="align-middle bi bi-chevron-double-right"></i> 
-						<span class="align-middle"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+						<span class="align-middle"> [[ ${schema.getJavaClassSimpleName} ]] </span>
 					</h1>
 		    		<div class="row mt-4">
 		    			<div th:class="${schema.getFilterableFields().isEmpty() ? 'col' : 'col-9'}">
@@ -147,7 +147,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 
 
 									<h3 class="fw-bold mb-4 align-baseline flex-grow-1">
-										<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+										<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
 										<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
 											[[ ${schema.getTableName()} ]]
 										</span>

src/main/resources/templates/snapadmin/model/schema.html

@@ -12,7 +12,7 @@
 					<h1 class="fw-bold mb-4"><i class="bi bi-database"></i> 
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a> 
 						<i class="align-middle bi bi-chevron-double-right"></i>
-						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.getJavaClass().getSimpleName()} ]]</a>
+						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.javaClassSimpleName } ]]</a>
 						<i class="align-middle bi bi-chevron-double-right"></i><span class="align-middle"> Schema</span>
 					</h1>
 		    		<div class="row mt-4">
@@ -34,7 +34,7 @@ <h1 class="fw-bold mb-4"><i class="bi bi-database"></i>
 		    				<div class="box with-navigation">
 		    					<div class="d-flex justify-content-between">
 									<h3 class="fw-bold align-baseline">
-										<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+										<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
 										<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
 											[[ ${schema.getTableName()} ]]
 										</span>

src/main/resources/templates/snapadmin/model/show.html

@@ -13,7 +13,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a> 
 						<i class="align-middle bi bi-chevron-double-right"></i>
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> 
-						[[ ${schema.getJavaClass().getSimpleName()} ]]</a>
+						[[ ${schema.javaClassSimpleName } ]]</a>
 						<i class="align-middle bi bi-chevron-double-right"></i>
 						<span class="align-middle"> [[ ${object.getDisplayName()} ]]</span>
 					</h1>

src/test/java/tech/ailef/snapadmin/smoketest/SmokeTestApplication.java

@@ -0,0 +1,11 @@
+package tech.ailef.snapadmin.smoketest;
+
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import tech.ailef.snapadmin.external.SnapAdminAutoConfiguration;
+
+@SpringBootApplication
+@ImportAutoConfiguration(SnapAdminAutoConfiguration.class)
+public class SmokeTestApplication {
+}

src/test/java/tech/ailef/snapadmin/smoketest/SmokeTestApplicationTests.java

@@ -0,0 +1,38 @@
+package tech.ailef.snapadmin.smoketest;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class SmokeTestApplicationTests {
+
+	@LocalServerPort
+	private int port;
+
+	@Test
+	void contextLoadsAndAdminPanelIsServed() throws Exception {
+		HttpClient client = HttpClient.newHttpClient();
+
+		HttpResponse<String> index = get(client, "/admin");
+		assertThat(index.statusCode()).isEqualTo(200);
+
+		HttpResponse<String> model = get(client, "/admin/model/tech.ailef.snapadmin.smoketest.SmokeTestEntity");
+		assertThat(model.statusCode()).isEqualTo(200);
+	}
+
+	private HttpResponse<String> get(HttpClient client, String path) throws Exception {
+		HttpRequest request = HttpRequest.newBuilder()
+				.uri(URI.create("http://localhost:" + port + path))
+				.GET()
+				.build();
+		return client.send(request, HttpResponse.BodyHandlers.ofString());
+	}
+}

src/test/java/tech/ailef/snapadmin/smoketest/SmokeTestEntity.java

@@ -0,0 +1,27 @@
+package tech.ailef.snapadmin.smoketest;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+@Entity
+public class SmokeTestEntity {
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	private String name;
+
+	public Long getId() {
+		return id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

src/test/resources/application.properties

@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:h2:mem:smoketest;DB_CLOSE_DELAY=-1
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+
+snapadmin.enabled=true
+snapadmin.baseUrl=admin
+snapadmin.modelsPackage=tech.ailef.snapadmin.smoketest
+snapadmin.testMode=true