Replace RequestResponseFactory by Sling Request builders

CHANGELOG.md

@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 <!-- Keep this up to date! After a release, change the tag name to the latest release -->- 
 
 ## Unreleased ([details][unreleased changes details])
+
+### Added
+
 - #3426 - Content Sync: view history of completed jobs
 
 ### Changed
@@ -25,9 +28,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 - #3357 - Added debugging and null checking to ReferencesModel to prevent NPE
 - #3398 - CreateRedirectConfigurationServlet throws PersistenceException when ancestor node types are different than expected
 - #3275 - CCVAR: Fixed Same Attribute not updating correctly.
+- #3402 - EnsureOakIndexManagerImpl does not pick up changes in EnsureOakIndex configurations.
 
 ### Changed
 
+- #3403 - Replace deprecated com.day.cq.contentsync.handler.util.RequestResponseFactory by SlingHttpServletRequestBuilder 
 - #3376 - Redirect Manager: refactor code to not require service user
 - #3408 - Reduce usage of Apache Commons Lang 2
 - #3401 - Move SyslogAppender into separate bundle for onprem only. SyslogAppender does not work in Cloud Service.
@@ -39,7 +44,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 - #3355 - Fixed system notifications dismissal, and upgraded to CoralUI 3.
 
-
 ### Added
 
 - #3333 - Use lodash embedded by ACS AEM Commons

bundle/bnd.bnd

@@ -19,6 +19,7 @@ Import-Package: \
  !io.jsonwebtoken.*,\
  !org.bouncycastle.jce.*,\
  !org.checkerframework.checker.nullness.qual,\
+ com.day.cq.wcm.api;version="[1.30,2)",\
  *
 # support processing of legacy Felix SCR annotations through the felix.scr.bnd plugin, look at https://github.com/apache/felix/blob/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java#L60
 # paths require special handling: https://bnd.bndtools.org/chapters/820-instructions.html#file

bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/RefreshFolderThumbnailsFactory.java

@@ -17,16 +17,14 @@
  */
 package com.adobe.acs.commons.mcp.impl.processes;
 
+import org.apache.sling.engine.SlingRequestProcessor;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
 import com.adobe.acs.commons.mcp.ProcessDefinitionFactory;
 import com.adobe.acs.commons.util.RequireAem;
-import com.day.cq.contentsync.handler.util.RequestResponseFactory;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.sling.engine.SlingRequestProcessor;
 
-@Component
-@Service(ProcessDefinitionFactory.class)
+@Component(service = ProcessDefinitionFactory.class)
 public class RefreshFolderThumbnailsFactory extends ProcessDefinitionFactory<RefreshFolderTumbnails> {
 
  // Disable this feature on AEM as a Cloud Service
@@ -35,18 +33,14 @@ public class RefreshFolderThumbnailsFactory extends ProcessDefinitionFactory<Ref
 
  @Reference
  private SlingRequestProcessor slingProcessor;
-
- @Reference
- RequestResponseFactory reqRspFactory;
-
+
  @Override
  public String getName() {
  return "Refresh asset folder thumbnails";
  }
 
  @Override
  protected RefreshFolderTumbnails createProcessDefinitionInstance() {
- return new RefreshFolderTumbnails(reqRspFactory, slingProcessor);
+ return new RefreshFolderTumbnails(slingProcessor);
  }
-
 }

bundle/src/main/java/com/adobe/acs/commons/mcp/impl/processes/RefreshFolderTumbnails.java

@@ -17,40 +17,40 @@
  */
 package com.adobe.acs.commons.mcp.impl.processes;
 
-import com.adobe.acs.commons.fam.ActionManager;
-import com.adobe.acs.commons.fam.actions.ActionBatch;
-import com.adobe.acs.commons.functions.CheckedFunction;
-import com.adobe.acs.commons.mcp.ProcessDefinition;
-import com.adobe.acs.commons.mcp.ProcessInstance;
-import com.adobe.acs.commons.mcp.form.CheckboxComponent;
-import com.adobe.acs.commons.mcp.form.FormField;
-import com.adobe.acs.commons.mcp.form.PathfieldComponent;
-import com.adobe.acs.commons.mcp.form.RadioComponent;
-import com.adobe.acs.commons.mcp.model.GenericBlobReport;
-import com.adobe.acs.commons.util.visitors.TreeFilteringResourceVisitor;
-import com.day.cq.commons.jcr.JcrConstants;
-import com.day.cq.contentsync.handler.util.RequestResponseFactory;
-import com.day.cq.dam.api.DamConstants;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
 import javax.jcr.RepositoryException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.output.NullOutputStream;
+
+import org.apache.sling.api.request.builder.Builders;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.engine.SlingRequestProcessor;
 
+import com.adobe.acs.commons.fam.ActionManager;
+import com.adobe.acs.commons.fam.actions.ActionBatch;
+import com.adobe.acs.commons.functions.CheckedFunction;
+import com.adobe.acs.commons.mcp.ProcessDefinition;
+import com.adobe.acs.commons.mcp.ProcessInstance;
+import com.adobe.acs.commons.mcp.form.CheckboxComponent;
+import com.adobe.acs.commons.mcp.form.FormField;
+import com.adobe.acs.commons.mcp.form.PathfieldComponent;
+import com.adobe.acs.commons.mcp.form.RadioComponent;
+import com.adobe.acs.commons.mcp.model.GenericBlobReport;
+import com.adobe.acs.commons.util.visitors.TreeFilteringResourceVisitor;
+import com.day.cq.commons.jcr.JcrConstants;
+import com.day.cq.dam.api.DamConstants;
+
 /**
  * Replace folder thumbnails under a user-definable set of circumstances As a business user, I would like an easy way to
  * scan and repair missing thumbnails, or just regenerate all thumbnails under a given tree of the DAM.
@@ -83,16 +83,8 @@ public boolean shouldReplace(Resource r) throws Exception {
 
  public static final String FOLDER_THUMBNAIL = "/jcr:content/folderThumbnail";
 
- private static Map<String, Object> THUMBNAIL_PARAMS = new HashMap<>();
-
- static {
- THUMBNAIL_PARAMS.put("width", "200");
- THUMBNAIL_PARAMS.put("height", "120");
- }
-
  private static final int PLACEHOLDER_SIZE = 1024;
 
- private RequestResponseFactory requestFactory;
  private SlingRequestProcessor slingProcessor;
 
  @FormField(name = "Starting Path",
@@ -113,8 +105,7 @@ public boolean shouldReplace(Resource r) throws Exception {
 
  private transient List<String> foldersToReplace = Collections.synchronizedList(new ArrayList<>());
 
- public RefreshFolderTumbnails(RequestResponseFactory reqRspFactory, SlingRequestProcessor slingProcessor) {
- this.requestFactory = reqRspFactory;
+ public RefreshFolderTumbnails(SlingRequestProcessor slingProcessor) {
  this.slingProcessor = slingProcessor;
  }
 
@@ -197,12 +188,20 @@ private void rebuildThumbnails(ActionManager manager) {
  }
 
  private void rebuildThumbnail(ResourceResolver rr, String folderPath) throws ServletException, IOException {
- HttpServletRequest req = requestFactory.createRequest("GET", folderPath + ".folderthumbnail.jpg", THUMBNAIL_PARAMS);
- try (NullOutputStream out = new NullOutputStream()) {
- HttpServletResponse res = requestFactory.createResponse(out);
- slingProcessor.processRequest(req, res, rr);
- res.flushBuffer();
+ Resource resource = rr.getResource(folderPath);
+ if (resource == null) {
+ throw new IllegalArgumentException("Resource not found at " + folderPath);
  }
+ HttpServletRequest req = Builders.newRequestBuilder(resource)
+ .withRequestMethod("GET")
+ .withSelectors("folderthumbnail")
+ .withExtension("jpg")
+ .withParameter("width", "200")
+ .withParameter("height", "120")
+ .build();
+ HttpServletResponse res = Builders.newResponseBuilder().build();
+ slingProcessor.processRequest(req, res, rr);
+ res.flushBuffer();
  record(folderPath, "Rebuild", "Thumbnail was rebuilt");
  }
 

bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java

@@ -26,6 +26,7 @@
 import com.adobe.cq.dam.cfm.VariationTemplate;
 import com.adobe.cq.dam.cfm.VersionDef;
 import com.adobe.cq.dam.cfm.VersionedContent;
+import com.day.cq.tagging.Tag;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -176,5 +177,27 @@ public void removeVariation(String name) throws ContentFragmentException {
  public Calendar getLastModifiedDeep() throws ContentFragmentException {
  return Calendar.getInstance();
  }
-
+
+ @Override
+ public @Nullable Calendar getLastModifiedDate() {
+ return Calendar.getInstance();
+ }
+
+ @Override
+ public @NotNull Tag[] getTags() throws ContentFragmentException {
+ return new Tag[0];
+ }
+
+ @Override
+ public @NotNull Tag[] getVariationTags(@NotNull String arg0) throws ContentFragmentException {
+ return new Tag[0];
+ }
+
+ @Override
+ public void setTags(@NotNull Tag[] arg0) throws ContentFragmentException {
+ }
+
+ @Override
+ public void setVariationTags(@NotNull Tag[] arg0, @NotNull String arg1) throws ContentFragmentException {
+ }
 }

bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockFragmentData.java

@@ -76,4 +76,9 @@ public String getContentType() {
  public void setContentType(@Nullable String contentType) {
 
  }
+
+ @Override
+ public @Nullable Calendar getLastModified() {
+ return null;
+ }
 }

pom.xml

@@ -84,7 +84,7 @@
  </sonar.issue.ignore.multicriteria.e1.resourceKey>
 
  <!-- the minimum AEM 6.5 version being supported -->
- <aem.classic.api.version>6.5.10.0002</aem.classic.api.version>
+ <aem.classic.api.version>6.5.21.0000</aem.classic.api.version>
  <!-- the minimum AEMaaCS version being supported -->
  <aem.sdk.api.version>2023.11.14227.20231108T162349Z-231100</aem.sdk.api.version>