[jboss-svn-commits] JBL Code SVN: r26701 - in labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance: variabletypes and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: salaboy21
Date: 2009-05-22 17:16:19 -0400 (Fri, 22 May 2009)
New Revision: 26701

Modified:
   labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
   labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/JPAPersistedVariable.java
   labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/SerializablePersistedVariable.java
   labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/VariableInstanceInfo.java
Log:
last minor changes, add MapKey mapping, but is not persisting the objects inside the map

Modified: labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java	2009-05-22 16:04:14 UTC (rev 26700)
+++ labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java	2009-05-22 21:16:19 UTC (rev 26701)
@@ -21,12 +21,12 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
+
+import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
 import javax.persistence.PreUpdate;
 import javax.persistence.Transient;
@@ -47,6 +47,8 @@
 import org.drools.runtime.process.ProcessInstance;
 import org.hibernate.annotations.CollectionOfElements;
 
+
+
 @Entity
 public class ProcessInstanceInfo {
 
@@ -76,11 +78,12 @@
     private Environment env;
     private boolean serializeVariables = false;
 
-
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy="processInstanceInfo")
+    @OneToMany(mappedBy="processInstanceInfo", cascade = CascadeType.ALL )
+    @MapKey(name="name")
     private Map<String,VariableInstanceInfo> variables;
 
     ProcessInstanceInfo() {
+        this.variables =  new HashMap<String,VariableInstanceInfo>();
     }
 
     public ProcessInstanceInfo(ProcessInstance processInstance) {
@@ -180,7 +183,7 @@
         // saves the processInstance type first
         stream.writeUTF(processInstanceType);
     }
-
+    
     @PreUpdate
     public void update() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -228,16 +231,12 @@
      //   this.clearVariables();
        
         for (String key : keys) {
-            
-            
-            
-                VariableInstanceInfo variable = persistenceStrategy.persistVariable(key, processVariables.get(key), this.env);
+                 VariableInstanceInfo variable =        
+                         persistenceStrategy.persistVariable(key, processVariables.get(key), this.env);
                 if (variable != null) {
                     variable.setProcessInstanceInfo(this);
-                    this.addVariable(key,variable);
-
+                    this.addVariable(variable.getName(),variable);
                 }
-           
 
         }
         //If we wont find any VariableInstanceInfo that mactches with the persistence strategy,
@@ -262,12 +261,12 @@
     }
 
     public void addVariable(String name, VariableInstanceInfo variable) {
-        this.getVariables().put(name, variable);
+        variables.put(name, variable);
     }
 
-    public void clearVariables() {
-        this.getVariables().clear();
-    }
+//    public void clearVariables() {
+//        this.getVariables().clear();
+//    }
 
     /**
      * @return the serializeVariables

Modified: labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/JPAPersistedVariable.java
===================================================================
--- labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/JPAPersistedVariable.java	2009-05-22 16:04:14 UTC (rev 26700)
+++ labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/JPAPersistedVariable.java	2009-05-22 21:16:19 UTC (rev 26701)
@@ -17,7 +17,6 @@
 
 package org.drools.persistence.processinstance.variabletypes;
 
-import org.drools.persistence.processinstance.*;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
 
@@ -35,6 +34,10 @@
      private String vartype;
      private Long varid;
 
+    public JPAPersistedVariable() {
+    }
+
+     
       /**
      * @return the vartype
      */

Modified: labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/SerializablePersistedVariable.java
===================================================================
--- labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/SerializablePersistedVariable.java	2009-05-22 16:04:14 UTC (rev 26700)
+++ labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/SerializablePersistedVariable.java	2009-05-22 21:16:19 UTC (rev 26701)
@@ -17,7 +17,6 @@
 
 package org.drools.persistence.processinstance.variabletypes;
 
-import org.drools.persistence.processinstance.*;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 
@@ -30,6 +29,10 @@
     @Lob
     private byte[] content;
 
+    public SerializablePersistedVariable() {
+    }
+
+    
     /**
      * @return the content
      */

Modified: labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/VariableInstanceInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/VariableInstanceInfo.java	2009-05-22 16:04:14 UTC (rev 26700)
+++ labs/jbossrules/branches/salaboy_RelationalVariablePersistence/drools-persistence-jpa/src/main/java/org/drools/persistence/processinstance/variabletypes/VariableInstanceInfo.java	2009-05-22 21:16:19 UTC (rev 26701)
@@ -47,12 +47,17 @@
     @Id @GeneratedValue(strategy=GenerationType.AUTO)
     private Long id;
     private String name;
-    @ManyToOne
+    @ManyToOne()
     private ProcessInstanceInfo processInstanceInfo;
 
 
 
     private String persister;
+
+    public VariableInstanceInfo() {
+    }
+
+    
    
     public Long getId() {
         return id;