Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TreeTransformer for Oracle. #13439

Merged
merged 1 commit into from
Jan 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import com.dotmarketing.beans.Identifier;
import com.dotmarketing.beans.Tree;
import com.dotmarketing.beans.transform.IdentifierTransformer;
import com.dotmarketing.beans.transform.OracleTreeTransformer;
import com.dotmarketing.beans.transform.TreeTransformer;
import com.dotmarketing.db.DbConnectionFactory;
import com.dotmarketing.portlets.containers.model.Container;
import com.dotmarketing.portlets.containers.transform.ContainerTransformer;
import com.dotmarketing.portlets.contentlet.model.Contentlet;
Expand Down Expand Up @@ -147,6 +149,6 @@ public static IdentifierTransformer createIdentifierTransformer(
public static TreeTransformer createTreeTransformer(
List<Map<String, Object>> initList) {

return new TreeTransformer(initList);
return DbConnectionFactory.isOracle()?new OracleTreeTransformer(initList):new TreeTransformer(initList);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.dotmarketing.beans.transform;

import com.dotmarketing.beans.Tree;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

public class OracleTreeTransformer extends TreeTransformer {

public OracleTreeTransformer(List<Map<String, Object>> list) {
super(list);
}

@Override
Tree toTree(Map<String, Object> map) {
Tree tree=new Tree();
tree.setParent((String)map.getOrDefault("parent", null));
tree.setChild((String)map.getOrDefault("child", null));
tree.setRelationType((String)map.getOrDefault("relation_type", null));
tree.setTreeOrder(((BigDecimal)map.getOrDefault("tree_order", 0)).intValue());

return tree;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Tree findFirst() {
return this.asList().stream().findFirst().orElse(new Tree());
}

private Tree toTree (Map<String, Object> map){
Tree toTree (Map<String, Object> map){

Tree tree=new Tree();
tree.setParent((String)map.getOrDefault("parent", null));
Expand Down