[jbpm-commits] JBoss JBPM SVN: r2414 - jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence.

Author: thomas.diesler(a)jboss.com Date: 2008-09-28 17:26:02 -0400 (Sun, 28 Sep 2008) New Revision: 2414 Modified: jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Flow.java jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java Log: wip Modified: jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Flow.java =================================================================== --- jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Flow.java 2008-09-28 20:58:03 UTC (rev 2413) +++ jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Flow.java 2008-09-28 21:26:02 UTC (rev 2414) @@ -18,6 +18,10 @@ public Integer id; @Basic private String targetName; + @Basic + private int sourceIndex; + @Basic + private int targetIndex; @ManyToOne(cascade = CascadeType.ALL) private Node source; @ManyToOne(cascade = CascadeType.ALL) @@ -32,10 +36,32 @@ this.source = source; this.target = target; this.targetName = target.getName(); + this.sourceIndex = source.getOutFlows().size(); + this.targetIndex = target.getInFlows().size(); source.getOutFlows().add(this); target.getInFlows().add(this); } + public int getSourceIndex() + { + return sourceIndex; + } + + public void setSourceIndex(int sourceIndex) + { + this.sourceIndex = sourceIndex; + } + + public int getTargetIndex() + { + return targetIndex; + } + + public void setTargetIndex(int targetIndex) + { + this.targetIndex = targetIndex; + } + public String getTargetName() { return targetName; Modified: jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java =================================================================== --- jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java 2008-09-28 20:58:03 UTC (rev 2413) +++ jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java 2008-09-28 21:26:02 UTC (rev 2414) @@ -12,9 +12,11 @@ import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.Transient; +import org.hibernate.annotations.IndexColumn; + @Entity public class Node { @@ -23,12 +25,13 @@ public Integer id; @Basic private String name; - @Transient - // @ManyToOne + @ManyToOne private Process process; @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "target") + @IndexColumn(name = "targetIndex") private List<Flow> inFlows = new ArrayList<Flow>(); @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "source") + @IndexColumn(name = "sourceIndex") private List<Flow> outFlows = new ArrayList<Flow>(); public Node() @@ -40,24 +43,24 @@ this.name = name; } - public String getName() + public Process getProcess() { - return name; + return process; } - public void setName(String name) + public void setProcess(Process process) { - this.name = name; + this.process = process; } - public Process getProcess() + public String getName() { - return process; + return name; } - public void setProcess(Process process) + public void setName(String name) { - this.process = process; + this.name = name; } public List<Flow> getInFlows() Modified: jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java =================================================================== --- jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java 2008-09-28 20:58:03 UTC (rev 2413) +++ jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java 2008-09-28 21:26:02 UTC (rev 2414) @@ -60,14 +60,13 @@ new Flow(na, nb); new Flow(nb, nc); - printNode(na); + System.out.println(proc); Session session = getSessionFactory().openSession(); Transaction tx = session.beginTransaction(); try { session.save(proc); - session.save(na); tx.commit(); } @@ -76,31 +75,22 @@ session.close(); } - Node loadA = loadNode(na.id); + Process loadProc = loadProcess(proc.id); System.out.println(); - printNode(loadA); + System.out.println(loadProc); - deleteNode(na); + deleteProcess(proc); } - private void printNode(Node node) + public Process loadProcess(Integer id) { - System.out.println(node); - for (Flow out : node.getOutFlows()) - { - printNode(out.getTarget()); - } - } - - public Node loadNode(Integer id) - { - Node node = null; + Process proc = null; Session session = getSessionFactory().openSession(); try { - node = (Node)session.load(Node.class, id); - Hibernate.initialize(node); + proc = (Process)session.load(Process.class, id); + Hibernate.initialize(proc); } catch (ObjectNotFoundException ex) { @@ -110,16 +100,16 @@ { session.close(); } - return node; + return proc; } - public void deleteNode(Node node) + public void deleteProcess(Process proc) { Session session = getSessionFactory().openSession(); Transaction tx = session.beginTransaction(); try { - session.delete(node); + session.delete(proc); tx.commit(); } finally Modified: jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java =================================================================== --- jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java 2008-09-28 20:58:03 UTC (rev 2413) +++ jbpm4/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java 2008-09-28 21:26:02 UTC (rev 2414) @@ -7,10 +7,12 @@ import java.util.List; import javax.persistence.Basic; +import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Transient; +import javax.persistence.OneToMany; @Entity public class Process @@ -20,8 +22,7 @@ public Integer id; @Basic private String name; - @Transient - // @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER) + @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "process") private List<Node> nodes = new ArrayList<Node>(); public Process()