Fix TreeTransformer and ContentletTransformer (#13518)

TreeTransformer: Use conversion utils instead of a class for Oracle. TransformerLocator: create only TreeTransformer ContentletTransformer: Use conversion utils to avoid classCastException in oracle
dotCMS · Jan 29, 2018 · 11742c4 · 11742c4
1 parent f1d02a9
commit 11742c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git a/...ntegration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java b/...ntegration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java
@@ -2047,7 +2047,11 @@ public void testPubExpDatesFromIdentifier() throws Exception {
         c1.setDateProperty(fieldExpDate.getVelocityVarName(), d2);
         c1.setLanguageId(deflang);
         c1=APILocator.getContentletAPI().checkin(c1, user, false);
-        APILocator.getContentletAPI().isInodeIndexed(c1.getInode());
+        boolean isC1Indexed = APILocator.getContentletAPI().isInodeIndexed(c1.getInode());
+
+        Logger.info(this, "IsC1Indexed: " + isC1Indexed);
+        Identifier idenFromCache = APILocator.getIdentifierAPI().loadFromCache(c1.getIdentifier());
+        Logger.info(this, "IdentifierFromCache:" + idenFromCache);
 
         Identifier ident=APILocator.getIdentifierAPI().find(c1);
         assertNotNull(ident.getSysPublishDate());

diff --git a/dotCMS/src/main/java/com/dotcms/util/transform/TransformerLocator.java b/dotCMS/src/main/java/com/dotcms/util/transform/TransformerLocator.java
@@ -161,6 +161,6 @@ public static IdentifierTransformer createIdentifierTransformer(
     public static TreeTransformer createTreeTransformer(
         List<Map<String, Object>> initList) {
 
-        return DbConnectionFactory.isOracle()?new OracleTreeTransformer(initList):new TreeTransformer(initList);
+        return new TreeTransformer(initList);
     }
 }
diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/transform/OracleTreeTransformer.java b/dotCMS/src/main/java/com/dotmarketing/beans/transform/OracleTreeTransformer.java
diff --git a/dotCMS/src/main/java/com/dotmarketing/beans/transform/TreeTransformer.java b/dotCMS/src/main/java/com/dotmarketing/beans/transform/TreeTransformer.java
@@ -1,5 +1,6 @@
 package com.dotmarketing.beans.transform;
 
+import com.dotcms.util.ConversionUtils;
 import com.dotcms.util.transform.DBTransformer;
 import com.dotmarketing.beans.Tree;
 
@@ -35,7 +36,7 @@ Tree toTree (Map<String, Object> map){
         tree.setParent((String)map.getOrDefault("parent", null));
         tree.setChild((String)map.getOrDefault("child", null));
         tree.setRelationType((String)map.getOrDefault("relation_type", null));
-        tree.setTreeOrder((Integer)map.getOrDefault("tree_order", 0));
+        tree.setTreeOrder(ConversionUtils.toInt(map.getOrDefault("tree_order", 0), 0));
 
         return tree;
     }

diff --git a/...S/src/main/java/com/dotmarketing/portlets/contentlet/transform/ContentletTransformer.java b/...S/src/main/java/com/dotmarketing/portlets/contentlet/transform/ContentletTransformer.java
@@ -50,7 +50,7 @@ private static Contentlet transform(final Map<String, Object> map)  {
         disabledWysiwyg.add(map.get("disabled_wysiwyg"));
         contentlet.setDisabledWysiwyg(disabledWysiwyg);
         contentlet.setIdentifier((String) map.get("identifier"));
-        contentlet.setLanguageId((Long) map.get("language_id"));
+        contentlet.setLanguageId(ConversionUtils.toLong(map.get("language_id"), 0L));
 
         String key;
         List<String> ignoredFields = new ArrayList<>();