ASSETS-33747 named smartcrop in image core v3 component

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v3/ImageImpl.java

@@ -16,13 +16,24 @@
 package com.adobe.cq.wcm.core.components.internal.models.v3;
 
 import java.awt.*;
+import java.io.IOException;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 import javax.annotation.PostConstruct;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.osgi.services.HttpClientBuilderFactory;
+import org.apache.http.util.EntityUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
@@ -32,6 +43,8 @@
 import org.apache.sling.models.annotations.injectorspecific.OSGiService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,6 +80,10 @@ public class ImageImpl extends com.adobe.cq.wcm.core.components.internal.models.
     @OSGiService
     @Optional
     private NextGenDynamicMediaConfig nextGenDynamicMediaConfig;
+
+    @OSGiService
+    @Optional
+    private HttpClientBuilderFactory clientBuilderFactory;
 
     private boolean imageLinkHidden = false;
 
@@ -77,6 +94,9 @@ public class ImageImpl extends com.adobe.cq.wcm.core.components.internal.models.
     private Dimension dimension;
 
     private boolean ngdmImage = false;
+    private CloseableHttpClient client;
+    private static final String PATH_PLACEHOLDER_ASSET_ID = "{asset-id}";
+    private String metadataDeliveryEndpoint;
 
     @PostConstruct
     protected void initModel() {
@@ -135,6 +155,37 @@ public String getSrcset() {
                 // in case of dm image and auto smartcrop the srcset needs to generated client side
                 if (dmImage && StringUtils.equals(smartCropRendition, SMART_CROP_AUTO)) {
                     srcSet = EMPTY_PIXEL;
+                } else if (ngdmImage && StringUtils.equals(smartCropRendition, SMART_CROP_AUTO) && client != null) {
+                    String endPointUrl = "https://" + nextGenDynamicMediaConfig.getRepositoryId() + metadataDeliveryEndpoint;
+                    HttpGet get = new HttpGet(endPointUrl);
+                    get.setHeader("X-Adobe-Accept-Experimental", "1");
+                    try {
+                        HttpResponse response = client.execute(get);
+                        StatusLine statusLine = response.getStatusLine();
+                        int statusCode = statusLine.getStatusCode();
+                        if (statusCode == HttpStatus.SC_OK) {
+                            HttpEntity e = response.getEntity();
+                            String entity = EntityUtils.toString(e);
+                            JSONObject metadata = new JSONObject(entity);
+                            JSONObject repositoryMetadata = metadata.getJSONObject("repositoryMetadata");
+                            JSONObject smartCrops = repositoryMetadata.getJSONObject("smartcrops");
+                            Iterator<String> smartCropsNames = smartCrops.keys();
+                            String[] ngdmSrcsetArray = new String[smartCrops.length()];
+                            int i = 0;
+                            while (smartCropsNames.hasNext()) {
+                                String namedSmartCrop = smartCropsNames.next();
+                                if (srcUritemplate.contains("=" + URI_WIDTH_PLACEHOLDER)) {
+                                    ngdmSrcsetArray[i] =
+                                        srcUritemplate.replace("width={.width}", String.format("smartcrop=%s", namedSmartCrop)) + " " + ((JSONObject)smartCrops.get(namedSmartCrop)).get("width") + "w";
+                                    i++;
+                                } 
+                            }
+                            srcSet = StringUtils.join(ngdmSrcsetArray, ',');
+
+                        }
+                    } catch (IOException | JSONException e) {
+                        LOGGER.warn("Couldn't generate srcset for remote asset");
+                    }
                 } else {
                     for (int i = 0; i < widthsArray.length; i++) {
                         if (srcUritemplate.contains("=" + URI_WIDTH_PLACEHOLDER)) {
@@ -271,18 +322,26 @@ private void initNextGenerationDynamicMedia() {
         initResource();
         properties = resource.getValueMap();
         String fileReference = properties.get("fileReference", String.class);
-        String smartCrop = properties.get("smartCrop", String.class);
+        String smartCrop = properties.get("smartCropRendition", String.class);
         if (isNgdmImageReference(fileReference)) {
             int width = currentStyle.get(PN_DESIGN_RESIZE_WIDTH, DEFAULT_NGDM_ASSET_WIDTH);
             NextGenDMImageURIBuilder builder = new NextGenDMImageURIBuilder(nextGenDynamicMediaConfig, fileReference)
                 .withPreferWebp(true)
                 .withWidth(width);
-            if(StringUtils.isNotEmpty(smartCrop)) {
+            if(StringUtils.isNotEmpty(smartCrop) && !StringUtils.equals(smartCrop, SMART_CROP_AUTO)) {
                 builder.withSmartCrop(smartCrop);
             }
             src = builder.build();
             ngdmImage = true;
             hasContent = true;
+            if (clientBuilderFactory != null) {
+                client = clientBuilderFactory.newBuilder().build();
+            }
+            metadataDeliveryEndpoint = nextGenDynamicMediaConfig.getAssetMetadataPath();
+            Scanner scanner = new Scanner(fileReference);
+            scanner.useDelimiter("/");
+            String assetId = scanner.next();
+            metadataDeliveryEndpoint = metadataDeliveryEndpoint.replace(PATH_PLACEHOLDER_ASSET_ID, assetId);
         }
     }
 

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v3/NextGenDMImageURIBuilder.java

@@ -36,7 +36,7 @@ public class NextGenDMImageURIBuilder {
 
     private NextGenDynamicMediaConfig config;
     private String fileReference;
-    private String smartCropAspectRatio;
+    private String smartCropName;
     private int width = DEFAULT_NGDM_ASSET_WIDTH;
 
     private int height;
@@ -48,11 +48,11 @@ public NextGenDMImageURIBuilder(NextGenDynamicMediaConfig config, String fileRef
     }
 
     /**
-     * Smart Crop aspect ratio string.
-     * @param smartCropAspectRatio - a string in "width:height" format;
+     * Smart Crop name.
+     * @param smartCropName - a string denoting the name of the smartcrop;
      */
-    public NextGenDMImageURIBuilder withSmartCrop(String smartCropAspectRatio) {
-        this.smartCropAspectRatio = smartCropAspectRatio;
+    public NextGenDMImageURIBuilder withSmartCrop(String smartCropName) {
+        this.smartCropName = smartCropName;
         return this;
     }
 
@@ -113,12 +113,8 @@ public String build() {
             if(this.preferWebp) {
                 params.put("preferwebp", "true");
             }
-            if (StringUtils.isNotEmpty(this.smartCropAspectRatio)) {
-                if (isValidSmartCrop(this.smartCropAspectRatio)) {
-                    params.put("crop", String.format("%s,smart", this.smartCropAspectRatio));
-                } else {
-                    LOGGER.info("Invalid smartCrop value at {}", this.smartCropAspectRatio);
-                }
+            if (StringUtils.isNotEmpty(this.smartCropName)) {
+                params.put("smartcrop", this.smartCropName);
             }
             if(params.size() > 0) {
                 uriBuilder.append("?");
@@ -133,18 +129,4 @@ public String build() {
         LOGGER.info("Invalid fileReference or NGDMConfig. fileReference = {}", this.fileReference);
         return null;
     }
-
-    private boolean isValidSmartCrop(String smartCropStr) {
-        String[] crops = smartCropStr.split(":");
-        if (crops.length == 2) {
-            try {
-                Integer.parseInt(crops[0]);
-                Integer.parseInt(crops[1]);
-                return true;
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-        return false;
-    }
 }

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v3/NextGenDMThumbnailImpl.java

@@ -70,7 +70,7 @@ private void initModel() {
         Resource component = request.getResourceResolver().getResource(componentPath);
         ValueMap properties  = component.getValueMap();
         String fileReference = properties.get("fileReference", String.class);
-        String smartCrop = properties.get("smartCrop", String.class);
+        String smartCrop = properties.get("smartCropRendition", String.class);
         ValueMap configs = resource.getValueMap();
         int width = configs.get("width", 480);
         int height = configs.get("height", 480);

bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/models/v2/TeaserImplTest.java

@@ -53,6 +53,7 @@ protected void setUp() {
         MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
         config.setEnabled(true);
         config.setRepositoryId("testrepo");
+        config.setAssetMetadataPath("/adobe/assets/{asset-id}/metadata");
         context.registerInjectActivateService(config);
     }
 

bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/models/v3/ImageImplTest.java

@@ -671,6 +671,7 @@ void testNgdmImage() {
         MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
         config.setEnabled(true);
         config.setRepositoryId("testrepo");
+        config.setAssetMetadataPath("/adobe/assets/{asset-id}/metadata");
         context.registerInjectActivateService(config);
 
         Image image = getImageUnderTest(NGDM_IMAGE1_PATH);
@@ -683,6 +684,7 @@ void testNgdmImageWithResizeWidth() {
         MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
         config.setEnabled(true);
         config.setRepositoryId("testrepo");
+        config.setAssetMetadataPath("/adobe/assets/{asset-id}/metadata");
         context.registerInjectActivateService(config);
         context.contentPolicyMapping(resourceType, PN_DESIGN_RESIZE_WIDTH, 800);
 

bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/models/v3/NextGenDMThumbnailImplTest.java

@@ -83,7 +83,7 @@ public void testThumbnailSrc() {
         assertTrue(nextGenDMThumbnail.getSrc().contains(BASE_URI));
         assertTrue(nextGenDMThumbnail.getSrc().contains("width=260"));
         assertTrue(nextGenDMThumbnail.getSrc().contains("height=260"));
-        assertTrue(nextGenDMThumbnail.getSrc().contains("crop=2:3,smart"));
+        assertTrue(nextGenDMThumbnail.getSrc().contains("smartcrop=Medium"));
     }
 
     @Test

bundles/core/src/test/java/com/adobe/cq/wcm/core/components/internal/models/v3/NextgenDMImageURIBuilderTest.java

@@ -85,17 +85,9 @@ public void testUriWithCustomPreferWebp() {
 
     @Test
     public void testUriWithSmartCrop() {
-        uriBuilder.withSmartCrop("2:3");
+        uriBuilder.withSmartCrop("Medium");
         String uri = uriBuilder.build();
-        assertTrue(uri.contains("crop=2:3,smart"));
-    }
-
-
-    @Test
-    public void testUriWithInvalidSmartCrop() {
-        uriBuilder.withSmartCrop("x:y");
-        String uri = uriBuilder.build();
-        assertEquals(baseUri, uri);
+        assertTrue(uri.contains("smartcrop=Medium"));
     }
 
     @Test

bundles/core/src/test/resources/image/v3/exporter-ngdm_test_page_image1.json

@@ -1,8 +1,9 @@
 {
   "id": "image-042059c802",
-  "src": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true&crop=2:3,smart",
+  "src": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true&smartcrop=Medium",
   "lazyEnabled": true,
   "sizes": "",
+  "smartCropRendition": "Medium",
   "dataLayer": {
       "image-042059c802": {
       "@type": "core/wcm/components/image/v3/image"

bundles/core/src/test/resources/image/v3/exporter-ngdm_test_page_image1_ngm_disabled.json

@@ -1,6 +1,7 @@
 {
   "id": "image-042059c802",
   "lazyEnabled": true,
+  "smartCropRendition": "Medium",
   "dataLayer": {
       "image-042059c802": {
       "@type": "core/wcm/components/image/v3/image"

bundles/core/src/test/resources/image/v3/exporter-ngdm_test_page_image1_resize_width.json

@@ -1,7 +1,8 @@
 {
   "id": "image-042059c802",
-  "src": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=800&preferwebp=true&crop=2:3,smart",
+  "src": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=800&preferwebp=true&smartcrop=Medium",
   "lazyEnabled": true,
+  "smartCropRendition": "Medium",
   "sizes": "",
   "dataLayer": {
       "image-042059c802": {

bundles/core/src/test/resources/image/v3/test-content.json

@@ -957,7 +957,7 @@
                   "jcr:createdBy": "admin",
                   "sling:resourceType": "core/wcm/components/image/v3/image",
                   "fileReference": "/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png",
-                  "smartCrop": "2:3"
+                  "smartCropRendition": "Medium"
               }
           }
       }

content/src/content/jcr_root/apps/core/wcm/components/image/v3/image/_cq_design_dialog/.content.xml

@@ -51,9 +51,6 @@
                                         text="Enable DM features"
                                         uncheckedValue="false"
                                         value="{Boolean}true">
-                                        <granite:rendercondition jcr:primaryType="nt:unstructured"
-                                                      sling:resourceType="granite/ui/components/coral/foundation/renderconditions/feature"
-                                                      feature="com.adobe.dam.asset.scene7.feature.flag"/>
                                     </enableDmFeatures>
                                     <enableAssetDelivery
                                         jcr:primaryType="nt:unstructured"