Skip to content

allow decorator chaining in "SiteMeshAutoConfiguration" #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow decorator chaining in "SiteMeshAutoConfiguration" #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
@AutoConfiguration
@ConfigurationProperties(prefix = "sitemesh.decorator")
public class SiteMeshAutoConfiguration {
private List<HashMap<String, String>> mappings;
public void setMappings(List<HashMap<String, String>> mappings) {
private List<HashMap<String, List<String>>> mappings;
public void setMappings(List<HashMap<String, List<String>>> mappings) {
this.mappings = mappings;
}

Expand All @@ -61,7 +61,7 @@ public void setMappings(List<HashMap<String, String>> mappings) {
private int filterOrder;

public static Filter makeFilter(String attribute, String defaultPath, String metaTagName, String prefix,
List<HashMap<String, String>> mappings, List<String> exclusions, List<String> bundles, boolean includeErrorPages, boolean alwaysApply) {
List<HashMap<String, List<String>>> mappings, List<String> exclusions, List<String> bundles, boolean includeErrorPages, boolean alwaysApply) {
SiteMeshFilterBuilder builder = new SiteMeshFilterBuilder();
MetaTagBasedDecoratorSelector decoratorSelector = attribute != null?
new RequestAttributeDecoratorSelector().setDecoratorAttribute(attribute) :
Expand All @@ -71,8 +71,10 @@ public static Filter makeFilter(String attribute, String defaultPath, String met
}
builder.setCustomDecoratorSelector(decoratorSelector.setMetaTagName(metaTagName).setPrefix(prefix));
if (mappings != null) {
for (Map<String, String> decorator : mappings) {
builder.addDecoratorPath(decorator.get("path"), decorator.get("decorator"));
for (Map<String, List<String>> decorator : mappings) {
for(String path: decorator.get("path")) {
builder.addDecoratorPaths(path, decorator.get("decorator"));
}
}
}
if (exclusions != null) {
Expand Down