Spring MVC model not forwarded #378

casid · Sep 28, 2024 · a3f5816 · a3f5816
1 parent bdd2fcc
commit a3f5816
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 8 deletions.
diff --git a/...arter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteAutoConfiguration.java b/...arter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteAutoConfiguration.java
@@ -30,7 +30,7 @@ public JteAutoConfiguration(JteProperties jteProperties) {
     @Bean
     @ConditionalOnMissingBean(JteViewResolver.class)
     public JteViewResolver jteViewResolver(TemplateEngine templateEngine) {
-        return new JteViewResolver(templateEngine, jteProperties.getTemplateSuffix());
+        return new JteViewResolver(templateEngine, jteProperties);
     }
 
 

diff --git a/...boot-starter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteProperties.java b/...boot-starter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteProperties.java
@@ -7,6 +7,7 @@ public class JteProperties {
     private Boolean usePrecompiledTemplates = false;
     private String templateLocation = "src/main/jte";
     private String templateSuffix = ".jte";
+    private boolean exposeRequestAttributes = false;
 
     public String getTemplateSuffix() {
         return templateSuffix;
@@ -31,4 +32,12 @@ public Boolean usePreCompiledTemplates() {
     public void setUsePrecompiledTemplates(Boolean usePrecompiledTemplates) {
         this.usePrecompiledTemplates = usePrecompiledTemplates;
     }
+
+	public boolean isExposeRequestAttributes() {
+		return exposeRequestAttributes;
+	}
+
+	public void setExposeRequestAttributes(boolean exposeRequestAttributes) {
+		this.exposeRequestAttributes = exposeRequestAttributes;
+	}
 }
diff --git a/...ot-starter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteViewResolver.java b/...ot-starter-2/src/main/java/gg/jte/springframework/boot/autoconfigure/JteViewResolver.java
@@ -11,12 +11,13 @@ public class JteViewResolver  extends AbstractTemplateViewResolver {
 
     private final TemplateEngine templateEngine;
 
-    public JteViewResolver(TemplateEngine templateEngine, final String templateSuffix) {
+    public JteViewResolver(TemplateEngine templateEngine, JteProperties jteProperties) {
         this.templateEngine = templateEngine;
-        this.setSuffix(templateSuffix);
+        this.setSuffix(jteProperties.getTemplateSuffix());
         this.setViewClass(JteView.class);
         this.setContentType(MediaType.TEXT_HTML_VALUE);
         this.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        this.setExposeRequestAttributes(jteProperties.isExposeRequestAttributes());
     }
 
     @Override

diff --git a/...arter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteAutoConfiguration.java b/...arter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteAutoConfiguration.java
@@ -27,11 +27,9 @@ public JteAutoConfiguration(JteProperties jteProperties) {
     @Bean
     @ConditionalOnMissingBean(JteViewResolver.class)
     public JteViewResolver jteViewResolver(TemplateEngine templateEngine) {
-
-        return new JteViewResolver(templateEngine, jteProperties.getTemplateSuffix());
+        return new JteViewResolver(templateEngine, jteProperties);
     }
 
-
     @Bean
     @ConditionalOnMissingBean(TemplateEngine.class)
     public TemplateEngine jteTemplateEngine() {

diff --git a/...boot-starter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteProperties.java b/...boot-starter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteProperties.java
@@ -8,6 +8,7 @@ public class JteProperties {
     private boolean developmentMode = false;
     private String templateLocation = "src/main/jte";
     private String templateSuffix = ".jte";
+    private boolean exposeRequestAttributes = false;
 
     public String getTemplateSuffix() {
         return templateSuffix;
@@ -40,4 +41,21 @@ public boolean isDevelopmentMode() {
     public void setDevelopmentMode(boolean developmentMode) {
         this.developmentMode = developmentMode;
     }
+
+	public boolean isUsePrecompiledTemplates() {
+		return usePrecompiledTemplates;
+	}
+
+	public void setUsePrecompiledTemplates(boolean usePrecompiledTemplates) {
+		this.usePrecompiledTemplates = usePrecompiledTemplates;
+	}
+
+	public boolean isExposeRequestAttributes() {
+		return exposeRequestAttributes;
+	}
+
+	public void setExposeRequestAttributes(boolean exposeRequestAttributes) {
+		this.exposeRequestAttributes = exposeRequestAttributes;
+	}
+
 }
diff --git a/...ot-starter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteViewResolver.java b/...ot-starter-3/src/main/java/gg/jte/springframework/boot/autoconfigure/JteViewResolver.java
@@ -10,12 +10,13 @@ public class JteViewResolver extends AbstractTemplateViewResolver {
 
     private final TemplateEngine templateEngine;
 
-    public JteViewResolver(TemplateEngine templateEngine, final String templateSuffix) {
+    public JteViewResolver(TemplateEngine templateEngine, JteProperties jteProperties) {
         this.templateEngine = templateEngine;
-        this.setSuffix(templateSuffix);
+        this.setSuffix(jteProperties.getTemplateSuffix());
         this.setViewClass(JteView.class);
         this.setContentType(MediaType.TEXT_HTML_VALUE);
         this.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        this.setExposeRequestAttributes(jteProperties.isExposeRequestAttributes());
     }
 
     @Override

diff --git a/jte-spring-boot-starter-3/src/main/resources/META-INF/spring-configuration-metadata.json b/jte-spring-boot-starter-3/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -30,6 +30,12 @@
       "type": "java.lang.String",
       "description": "You can configure the file suffix of jte templates the compiler resolves",
       "sourceType": "gg.jte.springframework.boot.autoconfigure.JteProperties"
+    },
+    {
+      "name": "gg.jte.exposeRequestAttributes",
+      "type": "java.lang.Boolean",
+      "description": "Set whether all request attributes should be added to the model prior to merging with the template",
+      "sourceType": "gg.jte.springframework.boot.autoconfigure.JteProperties"
     }
   ],
   "hints": []