AutoConfiguration filter helper

sitemesh · Jul 27, 2024 · 2869d7f · 2869d7f
1 parent bdbe29a
commit 2869d7f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java b/...-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java
@@ -62,9 +62,8 @@ public void setMappings(List<HashMap<String, String>> mappings) {
     @Value("${sitemesh.filter.order:" + (OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER + 29) + "}")
     private int filterOrder;
 
-    @Bean
-    @ConditionalOnMissingBean(name = "siteMeshFilter")
-    ConfigurableSiteMeshFilter siteMeshFilter() {
+    public static ConfigurableSiteMeshFilter makeFilter(String attribute, String defaultPath, String metaTagName, String prefix,
+        List<HashMap<String, String>> mappings, List<String> exclusions, List<String> bundles, boolean includeErrorPages) {
         return new ConfigurableSiteMeshFilter() {
             @Override
             protected void applyCustomConfiguration(SiteMeshFilterBuilder builder) {
@@ -97,6 +96,12 @@ protected void applyCustomConfiguration(SiteMeshFilterBuilder builder) {
         };
     }
 
+    @Bean
+    @ConditionalOnMissingBean(name = "siteMeshFilter")
+    ConfigurableSiteMeshFilter siteMeshFilter() {
+        return makeFilter(attribute, defaultPath, metaTagName, prefix, mappings, exclusions, bundles, includeErrorPages);
+    }
+
     @Bean
     @ConditionalOnMissingBean(name = "sitemesh3")
     public FilterRegistrationBean<ConfigurableSiteMeshFilter> sitemesh3(ConfigurableSiteMeshFilter siteMeshFilter){