fix thymleaf deprecations since upgrade to spring boot 3

Co-authored-by: Florian Torkler <[email protected]> Co-authored-by: Riko Stave <[email protected]> Co-authored-by: Matthias Geißendörfer <[email protected]>
otto-de · Jun 15, 2023 · 471e018 · 471e018
1 parent 9b075ee
commit 471e018
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/synapse-edison/src/main/resources/templates/fragments/message.html b/synapse-edison/src/main/resources/templates/fragments/message.html
@@ -63,11 +63,11 @@
                 <td class="col-md-1" th:text="${message.sequenceNumber}">#</td>
                 <td class="col-md-11">
                     <div class="col-md-3">
-                        <span th:replace="fragments/message :: key(${message})" />
-                        <span th:replace="fragments/message :: header(${message})" />
+                        <span th:replace="~{fragments/message :: key(${message})}" />
+                        <span th:replace="~{fragments/message :: header(${message})}" />
                     </div>
                     <div class="col-md-9">
-                        <span th:replace="fragments/message :: payload(${message})" />
+                        <span th:replace="~{fragments/message :: payload(${message})}" />
                     </div>
                 </td>
             </tr>

diff --git a/synapse-edison/src/main/resources/templates/journal.html b/synapse-edison/src/main/resources/templates/journal.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
 
-<head th:replace="fragments/head  :: head" />
+<head th:replace="~{fragments/head  :: head}" />
 
 <body>
 
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/css/panel-actions.css}" />
     <link rel="stylesheet" type="text/css" th:href="@{/css/help.css}" />
 
-    <div th:replace="fragments/navigation  :: navigation" />
+    <div th:replace="~{fragments/navigation  :: navigation}" />
 
     <div class="container-fluid">
         <div class="row">
@@ -41,14 +41,14 @@ <h3>Journal</h3>
                                     <span th:text="${repositoryName}"></span>.</p>
                             </div>
                         </div>
-                        <span th:replace="fragments/message :: list(${messages})" />
+                        <span th:replace="~{fragments/message :: list(${messages})}" />
                     </div>
                 </div>
             </div>
         </div>
     </div> <!-- /container -->
 
-    <span th:replace="fragments/footer :: footer" />
+    <span th:replace="~{fragments/footer :: footer}" />
 
     <script type="text/javascript" th:src="@{/js/init-fullscreen.js}"></script>
     <script type="text/javascript" th:src="@{/js/help.js}"></script>

diff --git a/synapse-edison/src/main/resources/templates/multi-channel-trace.html b/synapse-edison/src/main/resources/templates/multi-channel-trace.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
 
-<head th:replace="fragments/head  :: head" />
+<head th:replace="~{fragments/head  :: head}" />
 
 <body>
 
     <link rel="stylesheet" type="text/css" th:href="@{/css/panel-actions.css}" />
 
-    <div th:replace="fragments/navigation  :: navigation" />
+    <div th:replace="~{fragments/navigation  :: navigation}" />
 
     <div class="container">
         <div class="row">
@@ -57,7 +57,7 @@ <h3 class="panel-title" th:text="${title}">Message Trace</h3>
         </div>
     </div> <!-- /container -->
 
-    <span th:replace="fragments/footer :: footer" />
+    <span th:replace="~{fragments/footer :: footer}" />
     <script type="text/javascript" th:src="@{/js/init-fullscreen.js}"></script>
 
 </body>

diff --git a/synapse-edison/src/main/resources/templates/single-channel-trace.html b/synapse-edison/src/main/resources/templates/single-channel-trace.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
 
-<head th:replace="fragments/head  :: head" />
+<head th:replace="~{fragments/head  :: head}" />
 
 <body>
 
@@ -11,7 +11,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/css/help.css}" />
 
 
-    <div th:replace="fragments/navigation  :: navigation" />
+    <div th:replace="~{fragments/navigation  :: navigation}" />
 
     <div class="container-fluid">
         <div class="row">
@@ -42,14 +42,14 @@ <h3>Message Trace</h3>
                                     channel <span th:text="${channelName}"></span>.</p>
                             </div>
                         </div>
-                        <span th:replace="fragments/message :: list(${messages})" />
+                        <span th:replace="~{fragments/message :: list(${messages})}" />
                     </div>
                 </div>
             </div>
         </div>
     </div> <!-- /container -->
 
-    <span th:replace="fragments/footer :: footer" />
+    <span th:replace="~{fragments/footer :: footer}" />
     <script type="text/javascript" th:src="@{/js/init-fullscreen.js}"></script>
     <script type="text/javascript" th:src="@{/js/help.js}"></script>
 

diff --git a/synapse-edison/src/main/resources/templates/staterepository.html b/synapse-edison/src/main/resources/templates/staterepository.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
 
-<head th:replace="fragments/head  :: head" />
+<head th:replace="~{fragments/head  :: head}" />
 
 <body>
 
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" th:href="@{/css/panel-actions.css}" />
     <link rel="stylesheet" type="text/css" th:href="@{/css/help.css}" />
 
-    <div th:replace="fragments/navigation  :: navigation" />
+    <div th:replace="~{fragments/navigation  :: navigation}" />
 
 
     <div class="container-fluid">
@@ -19,7 +19,7 @@
         <div class="row">
             <!-- Open Panel -->
             <div class="col-md-12">
-                <div th:include="fragments/entities :: open-entity"></div>
+                <div th:include="~{fragments/entities :: open-entity}"></div>
             </div>
         </div>
 
@@ -54,13 +54,13 @@ <h3>State Repository</h3>
                             </div>
                         </div>
 
-                        <div th:include="fragments/pager :: pager(${pager})"></div>
+                        <div th:include="~{fragments/pager :: pager(${pager})}"></div>
 
-                        <div th:include="fragments/entities :: entitiesList(${entities})"></div>
+                        <div th:include="~{fragments/entities :: entitiesList(${entities})}"></div>
 
                         <a th:if="${singleEntity}" class="btn btn-default btn-xs" th:href="@{'/' + ${basePath} + '/staterepositories/' + ${repositoryName}}">Show All Entities</a>
 
-                        <div th:include="fragments/pager :: pager(${pager})"></div>
+                        <div th:include="~{fragments/pager :: pager(${pager})}"></div>
 
                     </div>
                 </div>
@@ -69,7 +69,7 @@ <h3>State Repository</h3>
 
     </div> <!-- /container -->
 
-    <span th:replace="fragments/footer :: footer" />
+    <span th:replace="~{fragments/footer :: footer}" />
 
     <script type="text/javascript" th:src="@{/js/init-fullscreen.js}"></script>
     <script type="text/javascript" th:src="@{/js/help.js}"></script>