name changes

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -1,14 +1,12 @@
 package stirling.software.SPDF.config;
 
-import java.util.Arrays;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
-import stirling.software.SPDF.utils.PropertyConfigs;
+
 import stirling.software.SPDF.model.ApplicationProperties;
 @Configuration
 public class AppConfig {
@@ -24,7 +22,7 @@ public class AppConfig {
 
     @Bean(name = "appName")
     public String appName() {
-        String homeTitle =  applicationProperties.getUi().getHomeName();
+        String homeTitle =  applicationProperties.getUi().getAppName();
         return (homeTitle != null) ? homeTitle : "Stirling PDF";
     }
 
@@ -42,7 +40,7 @@ public class AppConfig {
 
     @Bean(name = "navBarText")
     public String navBarText() {
-        String defaultNavBar = applicationProperties.getUi().getNavbarName() != null ? applicationProperties.getUi().getNavbarName() : applicationProperties.getUi().getHomeName();
+        String defaultNavBar = applicationProperties.getUi().getAppNameNavbar() != null ? applicationProperties.getUi().getAppNameNavbar() : applicationProperties.getUi().getAppName();
         return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
     }
 	

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -174,8 +174,8 @@ public class ApplicationProperties {
 	public static class System {
 		private String defaultLocale;
 		private Boolean googlevisibility;
-		private String rootPath;
+		private String rootURIPath;
-		private String customstaticFilePath;
+		private String customStaticFilePath;
 		private Integer maxFileSize;
 
 		public String getDefaultLocale() {
@@ -194,20 +194,20 @@ public class ApplicationProperties {
 			this.googlevisibility = googlevisibility;
 		}
 
-		public String getRootPath() {
+		public String getRootURIPath() {
-			return rootPath;
+			return rootURIPath;
 		}
 
-		public void setRootPath(String rootPath) {
+		public void setRootURIPath(String rootURIPath) {
-			this.rootPath = rootPath;
+			this.rootURIPath = rootURIPath;
 		}
 
-		public String getCustomstaticFilePath() {
+		public String getCustomStaticFilePath() {
-			return customstaticFilePath;
+			return customStaticFilePath;
 		}
 
-		public void setCustomstaticFilePath(String customstaticFilePath) {
+		public void setCustomStaticFilePath(String customStaticFilePath) {
-			this.customstaticFilePath = customstaticFilePath;
+			this.customStaticFilePath = customStaticFilePath;
 		}
 
 		public Integer getMaxFileSize() {
@@ -220,8 +220,8 @@ public class ApplicationProperties {
 
 		@Override
 		public String toString() {
-			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility + ", rootPath="
+			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility + ", rootURIPath="
-					+ rootPath + ", customstaticFilePath=" + customstaticFilePath + ", maxFileSize=" + maxFileSize
+					+ rootURIPath + ", customStaticFilePath=" + customStaticFilePath + ", maxFileSize=" + maxFileSize
 					+ "]";
 		}
 
@@ -229,16 +229,16 @@ public class ApplicationProperties {
 	}
 
 	public static class Ui {
-		private String homeName;
+	    private String appName;
 	    private String homeDescription;
-		private String navbarName;
+	    private String appNameNavbar;
 
-		public String getHomeName() {
+	    public String getAppName() {
-			return homeName;
+	        return appName;
 	    }
 
-		public void setHomeName(String homeName) {
+	    public void setAppName(String appName) {
-			this.homeName = homeName;
+	        this.appName = appName;
 	    }
 
 	    public String getHomeDescription() {
@@ -249,23 +249,21 @@ public class ApplicationProperties {
 	        this.homeDescription = homeDescription;
 	    }
 
-		public String getNavbarName() {
+	    public String getAppNameNavbar() {
-			return navbarName;
+	        return appNameNavbar;
 	    }
 
-		public void setNavbarName(String navbarName) {
+	    public void setAppNameNavbar(String appNameNavbar) {
-			this.navbarName = navbarName;
+	        this.appNameNavbar = appNameNavbar;
 	    }
 
 	    @Override
 	    public String toString() {
-			return "Ui [homeName=" + homeName + ", homeDescription=" + homeDescription + ", navbarName=" + navbarName
+	        return "UserInterface [appName=" + appName + ", homeDescription=" + homeDescription + ", appNameNavbar=" + appNameNavbar + "]";
-					+ "]";
+	    }
 	}
 
 
-	}
-
 	public static class Endpoints {
 		private List<String> toRemove;
 		private List<String> groupsToRemove;

src/main/resources/application.properties

@@ -22,15 +22,15 @@ server.error.include-message=always
 
 
 server.servlet.session.tracking-modes=cookie
-server.servlet.context-path=${APP_ROOT_PATH:/}
+server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
 
 spring.thymeleaf.encoding=UTF-8 
 
-server.connection-timeout=${CONNECTION_TIMEOUT:5m}
+server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m}
-spring.mvc.async.request-timeout=${ASYNC_CONNECTION_TIMEOUT:300000}
+spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000}
 
 spring.resources.static-locations=file:customFiles/static/
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/

src/main/resources/settings.yml.template

@@ -1,3 +1,7 @@
+# Welcome to settings file
+# Remove comment marker # if on start of line to enable the configuration
+# If you want to override with environment parameter follow parameter naming SECURITY_INITIALLOGIN_USERNAME
+
 security:
   enableLogin: false # set to 'true' to enable login
   initialLogin:
@@ -8,14 +12,16 @@ security:
 system:
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
   googlevisibility: false # 'true' to allow Google visibility, 'false' to disallow
-  rootPath: / # Set the application's root URI (e.g. /pdf-app)
+  rootURIPath: / # Set the application's root URI (e.g. /pdf-app)
-  customstaticFilePath: '/customFiles/static/' # Directory path for custom static files
+  customStaticFilePath: '/customFiles/static/' # Directory path for custom static files
   maxFileSize: 2000 # Set the maximum file size in MB
+  connectionTimeoutMinutes: 5m
+  connectionTimeoutMilliSeconds: 300000
   
-ui:
+#ui:
-  homeName:  # Application's visible name
+#  appName: exampleAppName # Application's visible name
-  homeDescription:  # Short description or tagline.
+#  homeDescription: I am a description # Short description or tagline shown on homepage.
-  navbarName:  # Name displayed on the navigation bar
+#  appNameNavbar: navbarName # Name displayed on the navigation bar
 
 endpoints:
   toRemove: [] # List endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
@@ -23,4 +29,3 @@ endpoints:
 
 metrics:
   enabled: true # 'true' to enable metric API endpoints, 'false' to disable
-

src/main/resources/templates/fragments/errorBanner.html

@@ -24,9 +24,7 @@
     <p th:text="${message} + ' for path: ' + ${path}"></p>
     <button type="button" class="btn btn-danger" th:if="${trace}" onclick="toggletrace()">Show Stack Trace</button>
     <button type="button" class="btn btn-secondary" th:if="${trace}" onclick="copytrace()">Copy Stack Trace</button>
-    <button type="button" class="close" data-bs-dismiss="alert" aria-label="Close" onclick="dismissError()">
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" onclick="dismissError()"></button>
-      <span aria-hidden="true">&times;</span>
-    </button>
     <!-- Stack trace section -->
     <div id="trace" th:if="${trace}" style="max-height: 0; overflow: hidden;">
       <div style="background-color: #f8d7da; border: 1px solid #f5c6cb; border-radius: 3px; padding: 10px; margin-top: 5px;">