scope ignored

Author: ishaileshmishra

.gitignore

@@ -20,6 +20,8 @@ local.properties
 .settings/
 .loadpath
 .recommenders
+.dccache/
+.dccache
 
 # External tool builders
 .externalToolBuilders/

.talismanrc

@@ -14,4 +14,6 @@ fileignoreconfig:
 - filename: src/main/java/com/contentstack/utils/presets/Preset.java
   checksum: cf778f3066be0a0943430b97f1d0c326bd10c0db48bf9cfb1bc242bf1acee24f
 - filename: src/main/java/com/contentstack/utils/Utils.java
-  checksum: f9fc6b4e94e645b4befe527abff4a77d5585ff68f07b48ff7bb2c69ea1832b50
+  checksum: f9fc6b4e94e645b4befe527abff4a77d5585ff68f07b48ff7bb2c69ea1832b50
+- filename: .dccache
+  checksum: 4d70dde92dca6fa5a550ad1cc47c41cb8c43d35abb3b5f72f472b9f49fdc56e4

src/main/java/com/contentstack/utils/Utils.java

@@ -3,6 +3,7 @@
 import com.contentstack.utils.callbacks.Content;
 import com.contentstack.utils.callbacks.Metadata;
 import com.contentstack.utils.callbacks.OptionsCallback;
+import com.contentstack.utils.presets.Constant;
 import com.contentstack.utils.render.DefaultOption;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -32,15 +33,14 @@ public static void render(JSONObject entryObj, String[] keyPath, OptionsCallback
             return null;
         };
 
-        if (entryObj != null && entryObj.has("_embedded_items")) {
-            // when keyPath is provided by user
+        if (entryObj != null && entryObj.has(Constant.EMBEDDED_ITEMS)) {
             if (keyPath != null) {
                 for (String path : keyPath) {
                     findContent(entryObj, path, callback);
                 }
             } else {
-                // if keyPath is not given, extract all available keyPath from _embedded_items
-                JSONObject embedKeys = entryObj.getJSONObject("_embedded_items");
+                // Case when KeyPath is not given by user, Extract all available keyPath from _embedded_items
+                JSONObject embedKeys = entryObj.getJSONObject(Constant.EMBEDDED_ITEMS);
                 ArrayList<String> pathKeys = new ArrayList<>(embedKeys.keySet());
                 for (String path : pathKeys) {
                     findContent(entryObj, path, callback);
@@ -116,9 +116,9 @@ public static String renderContent(String rteStringify, JSONObject embedObject,
         Document html = Jsoup.parse(rteStringify);
         getEmbeddedObjects(html, metadata -> {
             Optional<JSONObject> filteredContent = Optional.empty();
-            boolean available = embedObject.has("_embedded_items");
+            boolean available = embedObject.has(Constant.EMBEDDED_ITEMS);
             if (available) {
-                JSONObject jsonArray = embedObject.optJSONObject("_embedded_items");
+                JSONObject jsonArray = embedObject.optJSONObject(Constant.EMBEDDED_ITEMS);
                 filteredContent = findEmbeddedItems(jsonArray, metadata);
             }
             if (filteredContent.isPresent()) {
@@ -163,7 +163,7 @@ private static Optional<JSONObject> findEmbeddedItems(JSONObject jsonObject,
         for (String key : allKeys) {
             JSONArray jsonArray = jsonObject.optJSONArray(key);
             Optional<JSONObject> filteredContent = StreamSupport.stream(jsonArray.spliterator(), false)
-                    .map(val -> (JSONObject) val)
+                    .map(JSONObject.class::cast)
                     .filter(val -> val.optString("uid").equalsIgnoreCase(metadata.getItemUid())).findFirst();
             if (filteredContent.isPresent()) {
                 return filteredContent;
@@ -185,7 +185,7 @@ private static String getStringOption(OptionsCallback option, com.contentstack.u
     private static void getEmbeddedObjects(Document html, Metadata metadataCallback) {
         Elements embeddedEntries = html.body().getElementsByClass("embedded-entry");
         Elements embeddedAssets = html.body().getElementsByClass("embedded-asset");
-        embeddedEntries.forEach((entry) -> {
+        embeddedEntries.forEach(entry -> {
             String text = entry.text();
             String type = entry.attr("type");
             String uid = entry.attr("data-sys-entry-uid");
@@ -197,7 +197,7 @@ private static void getEmbeddedObjects(Document html, Metadata metadataCallback)
             metadataCallback.embeddedObject(metadata);
         });
 
-        embeddedAssets.forEach((asset) -> {
+        embeddedAssets.forEach(asset -> {
             String text = asset.text();
             String type = asset.attr("type");
             String uid = asset.attr("data-sys-asset-uid");

src/main/java/com/contentstack/utils/presets/Constant.java

@@ -10,8 +10,9 @@
 
 public class Constant {
 
+
     private Constant() throws IllegalAccessException {
-        throw new IllegalAccessException("Not allowed");
+        throw new IllegalAccessException("Private=Constructor not allowed");
     }
 
     static final String URL = "url";
@@ -28,6 +29,7 @@ private Constant() throws IllegalAccessException {
     static final String TRANSFORM = "transform";
     static final String FLIP_MODE = "flip-mode";
     static final String IMAGE_TYPE = "image-type";
+    public static final String EMBEDDED_ITEMS = "_embedded_items";
 
     protected static void throwException(JSONObject jsonAsset, @NotNull String localisedMessage) {
         if (jsonAsset.isEmpty()) {
@@ -53,13 +55,7 @@ protected static List<JSONObject> extractMetadata(
         List<JSONObject> localPresetList = Collections.emptyList();
         for (Object element : extensionArray) {
             JSONObject presetObj = (JSONObject) element;
-            if (presetObj.containsKey("is_global")) {
-                boolean isGlobal = (boolean) presetObj.get("is_global");
-                if (!isGlobal)
-                    localPresetList = returnPresetObject(presetObj, presetName, random);
-                if (localPresetList.isEmpty())
-                    localPresetList = returnPresetObject(presetObj, presetName, random);
-            }
+            localPresetList = returnPresetObject(presetObj, presetName, random);
         }
         return localPresetList;
     }
@@ -73,9 +69,10 @@ protected static List<JSONObject> returnPresetObject(
     }
 
     protected static List<JSONObject> getByPresetName(
-            JSONArray presetArray, String presetName, String random) {
+            JSONArray presetArray,
+            String presetName, String random) {
         List<JSONObject> listPreset = new ArrayList<>();
-        for(Object element: presetArray){
+        for (Object element : presetArray) {
             JSONObject presetObj = (JSONObject) element;
             if (presetObj.containsKey(random)) {
                 String localPresetName = (String) presetObj.get(random);

src/main/java/com/contentstack/utils/presets/InvalidUrlException.java

@@ -0,0 +1,7 @@
+package com.contentstack.utils.presets;
+
+public class InvalidUrlException extends RuntimeException {
+    public InvalidUrlException(String str) {
+        super(str);
+    }
+}

src/main/java/com/contentstack/utils/presets/Preset.java

@@ -17,7 +17,7 @@ public class Preset {
     public String resolvePresetByPresetName(
             @NotNull JSONObject asset,
             @NotNull String extensionUid,
-            @NotNull String presetName) {
+            @NotNull String presetName) throws InvalidUrlException {
 
         final JSONArray localExtensionUid = returnExtensionId(asset, extensionUid);
         if (presetName.isEmpty()) {
@@ -27,9 +27,10 @@ public String resolvePresetByPresetName(
         String assetUrl = (String) asset.get(URL);
         try {
             assetUrl = findPresetOptions(presetOptionKEYS, assetUrl);
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (MalformedURLException | URISyntaxException e) {
+            throw new InvalidUrlException(e.getLocalizedMessage());
         }
+
         return assetUrl;
     }
 

src/test/java/com/contentstack/utils/preset/PresetTest.java

@@ -83,15 +83,15 @@ public void testResolveEmptyPresetName() {
     }
 
     @Test
-    public void testResolvePresetByPresetName() {
+    public void testResolvePresetByPresetName() throws Exception {
         String url = preset.resolvePresetByPresetName(assetFile, "theExtensionUid", "Local Preset");
         Assert.assertEquals(
                 "http://localhost:8000/v3/assets/crop_area.jpeg?height=412&width=500&format=jpeg&quality=10",
                 url);
     }
 
     @Test
-    public void testResolvePresetByPresetNameWithUrlQuestionMark() {
+    public void testResolvePresetByPresetNameWithUrlQuestionMark() throws Exception {
         JSONObject assetWithQuestionMarkJson = readJson("management/asset_with_question_mark.json");
         String url = preset.resolvePresetByPresetName(assetWithQuestionMarkJson, "theExtensionUid", "Local Preset");
         Assert.assertEquals(