#3551 - added logic to check the correct parent node if the redirect … (#3552)

* #3551 - added logic to check the correct parent node if the redirect belongs to a sharded collection.

Author: drj101687

CHANGELOG.md

@@ -10,10 +10,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+- #3536 Granite Include Obscures included Resource Type
 - #3537 Content Sync: preserve mix:referenceable mixin on Assets and Content Fragments
+- #3551 Redirect Manager: correctly determine the redirect rules publication status for sharded and non-sharded redirects.
 - #3555 Content Sync: prevent timeout errors when sync-ing AEM cloud instances with large volumes of data
 - #3560 Redirect Manager: url-encode search terms in Full Text search mode
-- #3536 Granite Include Obscures included Resource Type
 - #3562 Fixed compilation errors in iscurrentusermemberof render condition
 
  ## 6.11.0 - 2025-03-14

bundle/src/main/java/com/adobe/acs/commons/redirects/models/RedirectRule.java

@@ -32,12 +32,12 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Named;
 import java.lang.invoke.MethodHandles;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Arrays;
-import java.util.Objects;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -63,6 +63,7 @@ public class RedirectRule {
     public static final String CASE_INSENSITIVE_PROPERTY_NAME = "caseInsensitive";
     public static final String REDIRECT_RESOURCE_REQUEST_ATTRIBUTE = "redirectResource";
     public static final String PRESERVE_QUERY_STRING = "preserveQueryString";
+    public static final String SHARD_NAME_PREFIX = "shard-";
 
     @ValueMapValue
     private String source;
@@ -333,7 +334,9 @@ public RedirectState getState() {
      * @return whether the redirect is published
      */
     public boolean isPublished() {
-        Calendar lastReplicated = resource.getParent().getValueMap().get("cq:lastReplicated", Calendar.class);
+        Calendar lastReplicated = isSharded()
+                ? Objects.requireNonNull(Objects.requireNonNull(resource.getParent()).getParent()).getValueMap().get("cq:lastReplicated", Calendar.class)
+                : Objects.requireNonNull(resource.getParent()).getValueMap().get("cq:lastReplicated", Calendar.class);
         boolean isPublished = lastReplicated != null;
         boolean modifiedAfterPublication = isPublished
                 && ((modified != null && modified.after(lastReplicated)) || (created != null && created.after(lastReplicated)));
@@ -344,4 +347,11 @@ public String getPreserveQueryString() {
         return preserveQueryString;
     }
 
+    /**
+     * @return whether the resource path contains {@link RedirectRule#SHARD_NAME_PREFIX}
+     */
+    public boolean isSharded() {
+        return resource.getPath().contains(SHARD_NAME_PREFIX);
+    }
+
 }

bundle/src/main/java/com/adobe/acs/commons/redirects/models/package-info.java

@@ -15,5 +15,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@org.osgi.annotation.versioning.Version("6.11.0")
+@org.osgi.annotation.versioning.Version("6.12.0")
 package com.adobe.acs.commons.redirects.models;

bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/ImportRedirectMapServlet.java

@@ -153,7 +153,7 @@ void update(Resource root, Collection<Map<String, Object>> xlsRedirects, Map<Str
             for (Map<String, Object> props : xlsRedirects) {
                 count++;
 
-                String shardName = "shard-" + count / SHARD_SIZE;
+                String shardName = RedirectRule.SHARD_NAME_PREFIX + count / SHARD_SIZE;
                 String sourcePath = (String) props.get(SOURCE_PROPERTY_NAME);
                 Resource shard = root.getChild(shardName);
                 if(shard == null){

bundle/src/test/java/com/adobe/acs/commons/redirects/RedirectResourceBuilder.java

@@ -38,16 +38,22 @@ public class RedirectResourceBuilder {
     private final String configPath;
     private final Map<String, Object> props;
     private String nodeName;
+    private boolean sharded;
 
-    public RedirectResourceBuilder(SlingContext context, String configPath) {
+    public RedirectResourceBuilder(SlingContext context, String configPath, boolean sharded) {
         this.context = context;
         this.configPath = configPath;
         this.props = new HashMap<>();
+        this.sharded = sharded;
         this.props.put("sling:resourceType", REDIRECT_RULE_RESOURCE_TYPE);
     }
 
+    public RedirectResourceBuilder(SlingContext context, String configPath) {
+        this(context, configPath, false);
+    }
+
     public RedirectResourceBuilder(SlingContext context) {
-        this(context, DEFAULT_CONF_PATH);
+        this(context, DEFAULT_CONF_PATH, false);
     }
 
     public RedirectResourceBuilder setSource(String source) {
@@ -144,6 +150,11 @@ public Resource build() throws PersistenceException {
         ContentBuilder cb = context.create();
         Resource configResource = ResourceUtil.getOrCreateResource(
                 context.resourceResolver(), configPath, REDIRECTS_RESOURCE_PATH, null, true);
+        if (sharded) {
+            configResource = ResourceUtil.getOrCreateResource(
+                    context.resourceResolver(), configPath + "/shard-0", (String) null, null, true
+            );
+        }
         if(nodeName == null) {
             nodeName = ResourceUtil.createUniqueChildName(configResource, "rule");
         }

bundle/src/test/java/com/adobe/acs/commons/redirects/models/RedirectRuleTest.java

@@ -207,6 +207,7 @@ public void testIsPublished() throws PersistenceException {
         Calendar dateInPast = GregorianCalendar.from(ZonedDateTime.now().minusDays(1));
         res1.getParent().adaptTo(ModifiableValueMap.class).put("cq:lastReplicated", dateInPast);
         assertTrue(rule1.isPublished());
+        assertFalse(rule1.isSharded());
 
         Resource res2 = new RedirectResourceBuilder(context)
                 .setSource("/content/geometrixx/en/1")
@@ -216,6 +217,7 @@ public void testIsPublished() throws PersistenceException {
                 .build();
         RedirectRule rule2 = res2.adaptTo(RedirectRule.class);
         assertFalse(rule2.isPublished()); // jcr:created after lastReplicated
+        assertFalse(rule1.isSharded());
 
         Resource res3 = new RedirectResourceBuilder(context)
                 .setSource("/content/geometrixx/en/1")
@@ -226,13 +228,57 @@ public void testIsPublished() throws PersistenceException {
                 .build();
         RedirectRule rule3 = res3.adaptTo(RedirectRule.class);
         assertFalse(rule3.isPublished()); // jcr:lastModified after lastReplicated
+        assertFalse(rule1.isSharded());
 
         // update cq:lastReplicated, all child redirects should become active
         res1.getParent().adaptTo(ModifiableValueMap.class).put("cq:lastReplicated", Calendar.getInstance());
         assertTrue(rule1.isPublished());
         assertTrue(rule2.isPublished());
         assertTrue(rule3.isPublished());
     }
+
+    @Test
+    public void testIsPublishedUnderShard() throws PersistenceException {
+        Resource res1 = new RedirectResourceBuilder(context, RedirectResourceBuilder.DEFAULT_CONF_PATH, true)
+                .setSource("/content/geometrixx/en/contact-us")
+                .setTarget("/content/geometrixx/en/contact-them")
+                .setStatusCode(302).build();
+
+        RedirectRule rule1 = res1.adaptTo(RedirectRule.class);
+        assertFalse(rule1.isPublished()); // never published
+
+        Calendar dateInPast = GregorianCalendar.from(ZonedDateTime.now().minusDays(1));
+        res1.getParent().getParent().adaptTo(ModifiableValueMap.class).put("cq:lastReplicated", dateInPast);
+        assertTrue(rule1.isPublished());
+        assertTrue(rule1.isSharded());
+
+        Resource res2 = new RedirectResourceBuilder(context, RedirectResourceBuilder.DEFAULT_CONF_PATH, true)
+                .setSource("/content/geometrixx/en/1")
+                .setTarget("/content/geometrixx/en/2")
+                .setStatusCode(302)
+                .setCreated(GregorianCalendar.from(ZonedDateTime.now().minusMinutes(60)))
+                .build();
+        RedirectRule rule2 = res2.adaptTo(RedirectRule.class);
+        assertFalse(rule2.isPublished()); // jcr:created after lastReplicated
+        assertTrue(rule1.isSharded());
+
+        Resource res3 = new RedirectResourceBuilder(context, RedirectResourceBuilder.DEFAULT_CONF_PATH, true)
+                .setSource("/content/geometrixx/en/1")
+                .setTarget("/content/geometrixx/en/2")
+                .setStatusCode(302)
+                .setCreated(GregorianCalendar.from(ZonedDateTime.now().minusMinutes(120)))
+                .setModified(GregorianCalendar.from(ZonedDateTime.now().minusMinutes(60)))
+                .build();
+        RedirectRule rule3 = res3.adaptTo(RedirectRule.class);
+        assertFalse(rule3.isPublished()); // jcr:lastModified after lastReplicated
+        assertTrue(rule1.isSharded());
+
+        // update cq:lastReplicated, all child redirects should become active
+        res1.getParent().getParent().adaptTo(ModifiableValueMap.class).put("cq:lastReplicated", Calendar.getInstance());
+        assertTrue(rule1.isPublished());
+        assertTrue(rule2.isPublished());
+        assertTrue(rule3.isPublished());
+    }
 
     @Test
     public void testRedirectRuleFromRequestAttribute() {