#3167 Renovator MCP: ensure old source path is removed (#3218)

Adobe-Consulting-Services · Nov 22, 2023 · 2615e1a · 2615e1a
1 parent edc9e3a
commit 2615e1a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Added
 
+- #3162 - Renovator MCP: ensure old source path is removed
 - #3205 - HttpClientFactory: Expose a method to customize the underlying HttpClient
 - #3209 - WARN org.apache.sling.models.impl.ModelAdapterFactory - Cannot provide default for java.util.List<java.lang.String>
 - #3197 - Encrypt user credentials in ACS Content Sync   

diff --git a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/renovator/MovingNode.java b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/renovator/MovingNode.java
@@ -185,6 +185,9 @@ public void findReferences(ResourceResolver rr, String referenceSearchRoot, int
                 .filter(p -> isActivated(rr, p.getPagePath()))
                 .map(ReferenceSearch.Info::getPagePath)
                 .collect(Collectors.toCollection(() -> publishedReferences));
+        if(isActivated(rr, sourcePath)){
+            publishedReferences.add(destinationPath);
+        }
     }
 
     /**

diff --git a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/renovator/MovingPage.java b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/renovator/MovingPage.java
@@ -120,7 +120,7 @@ private void moveOrClonePage(ResourceResolver rr, PageManager manager, String co
             manager.move(source,
                     getDestinationPath(),
                     getPreviousSibling(),
-                    true,
+                    false,
                     true,
                     listToStringArray(getAllReferences()),
                     listToStringArray(getPublishedReferences()));