From cf95c6f1ef2bd1d119c96cedd68f4047437bdca9 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Wed, 22 Jan 2025 18:00:06 +0100 Subject: [PATCH] #3509 'combine' mode is default --- .../adobe/acs/commons/redirects/filter/RedirectFilter.java | 4 ++-- .../acs/commons/redirects/filter/RedirectFilterTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/filter/RedirectFilter.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/filter/RedirectFilter.java index 33dfdacc65..2a660d7446 100755 --- a/bundle/src/main/java/com/adobe/acs/commons/redirects/filter/RedirectFilter.java +++ b/bundle/src/main/java/com/adobe/acs/commons/redirects/filter/RedirectFilter.java @@ -150,7 +150,7 @@ public class RedirectFilter extends AnnotatedStandardMBean @AttributeDefinition(name = "Request Paths", description = "List of paths for which redirection is allowed", type = AttributeType.STRING) String[] paths() default {"/content"}; - @AttributeDefinition(name = "Preserve Query String", description = "Deprecated. Since v6.11 you can manage handling query string in Redirect Properties.", type = AttributeType.BOOLEAN) + @AttributeDefinition(name = "Preserve Query String", description = "Preserve query string in redirects. Since v6.11 you can manage handling query string in Redirect Properties.", type = AttributeType.BOOLEAN) boolean preserveQueryString() default true; @AttributeDefinition(name = "Preserve Extension", description = "Whether to preserve extensions. " @@ -434,7 +434,7 @@ String evaluate(RedirectMatch match, SlingHttpServletRequest slingRequest){ HandleQueryString getPreserveQueryString(RedirectRule rule){ HandleQueryString mode; if(rule.getPreserveQueryString() == null) { - mode = config.preserveQueryString() ? HandleQueryString.REPLACE : HandleQueryString.IGNORE; + mode = config.preserveQueryString() ? HandleQueryString.COMBINE : HandleQueryString.IGNORE; } else { mode = HandleQueryString.valueOf(rule.getPreserveQueryString()); } diff --git a/bundle/src/test/java/com/adobe/acs/commons/redirects/filter/RedirectFilterTest.java b/bundle/src/test/java/com/adobe/acs/commons/redirects/filter/RedirectFilterTest.java index 4036054fc9..23c916522d 100755 --- a/bundle/src/test/java/com/adobe/acs/commons/redirects/filter/RedirectFilterTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/redirects/filter/RedirectFilterTest.java @@ -455,7 +455,7 @@ public void testPreserveQueryStringConfiguration() throws Exception{ assertEquals(true, filter.getConfiguration().preserveQueryString()); // inherited from the OSGi configuration, see the assert above - assertEquals(HandleQueryString.REPLACE, filter.getPreserveQueryString(rules.get("/test1"))); + assertEquals(HandleQueryString.COMBINE, filter.getPreserveQueryString(rules.get("/test1"))); assertEquals(HandleQueryString.IGNORE, filter.getPreserveQueryString(rules.get("/test2"))); assertEquals(HandleQueryString.REPLACE, filter.getPreserveQueryString(rules.get("/test3")));