#19385 #18990 refactoring a simpler way to do the key value for the p…

…age re… * #18990 refactoring a simplier way to do the key value for the page render * #18990 adding a fix
dotCMS · Oct 7, 2020 · 9aa8891 · 9aa8891
1 parent a60bbee
commit 9aa8891
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...ain/java/com/dotmarketing/portlets/contentlet/transform/DotContentletTransformerImpl.java b/...ain/java/com/dotmarketing/portlets/contentlet/transform/DotContentletTransformerImpl.java
@@ -38,7 +38,7 @@ class DotContentletTransformerImpl implements DotContentletTransformer {
 
     static final Set<TransformOptions> defaultOptions = EnumSet.of(
 
-            COMMON_PROPS, CONSTANTS, VERSION_INFO, BINARIES, CATEGORIES_NAME, TAGS , KEY_VALUE_VIEW
+            COMMON_PROPS, CONSTANTS, VERSION_INFO, BINARIES, CATEGORIES_NAME, TAGS
 
     );
 

diff --git a/...S/src/main/java/com/dotmarketing/portlets/contentlet/transform/DotTransformerBuilder.java b/...S/src/main/java/com/dotmarketing/portlets/contentlet/transform/DotTransformerBuilder.java
@@ -125,6 +125,17 @@ public DotTransformerBuilder keyValueToMapTransformer(){
         return this;
     }
 
+    /**
+     * Url Content Map to Map Transformer
+     * @return
+     */
+    public DotTransformerBuilder urlContentMapTransformer(){
+        optionsHolder.clear();
+        optionsHolder.addAll(DotContentletTransformerImpl.defaultOptions);
+        optionsHolder.add(KEY_VALUE_VIEW);
+        return this;
+    }
+
     /**
      * Fine tuned to be used for FileAssets on BrowserAPI
      * @return

diff --git a/...java/com/dotmarketing/portlets/htmlpageasset/business/render/page/PageViewSerializer.java b/...java/com/dotmarketing/portlets/htmlpageasset/business/render/page/PageViewSerializer.java
@@ -71,7 +71,7 @@ protected Map<String, Object> getObjectMap(final PageView pageView) {
 
     protected void createObjectMapUrlContent(final Contentlet urlContent, final Map<String, Object> pageViewMap) {
 
-        final DotContentletTransformer transformer   = new DotTransformerBuilder().defaultOptions().content(urlContent).build();
+        final DotContentletTransformer transformer   = new DotTransformerBuilder().urlContentMapTransformer().content(urlContent).build();
         final Map<String, Object>   urlContentletMap = transformer.toMaps().stream().findFirst().orElse(Collections.EMPTY_MAP);
 
         pageViewMap.put("urlContentMap", urlContentletMap);