Author: lwaterman
Date: Wed Dec 13 00:08:29 2006
New Revision: 486541
URL: http://svn.apache.org/viewvc?view=rev&rev=486541
Log:
Several fixes to get unit tests working
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java?view=diff&rev=486541&r1=486540&r2=486541
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
Wed Dec 13 00:08:29 2006
@@ -80,10 +80,10 @@
BpelEventFilter efilter) {
// TODO Auto-generated method stub
//return null;
- //throw new UnsupportedOperationException();
- System.out.println(ifilter.toString());
- System.out.println(efilter.toString());
- return null;
+ throw new UnsupportedOperationException();
+ //System.out.println(ifilter.toString());
+ //System.out.println(efilter.toString());
+ //return null;
}
public List<Date> bpelEventTimelineQuery(InstanceFilter ifilter,
@@ -127,7 +127,7 @@
public ProcessInstanceDAO getInstance(Long iid) {
// TODO: may need a map or DB lookup here for performance
for (ProcessInstanceDAOImpl inst : _instances) {
- if (inst.getInstanceId() == iid ) return inst;
+ if (inst.getInstanceId().equals(iid) ) return inst;
}
return null;
}
@@ -150,7 +150,7 @@
public ScopeDAO getScope(Long siidl) {
// TODO: May need a map or DB lookup here for performance
for ( ScopeDAOImpl s : _scopes ) {
- if ( s.getScopeInstanceId() == siidl ) return s;
+ if ( s.getScopeInstanceId().equals(siidl) ) return s;
}
return null;
}
@@ -159,9 +159,9 @@
ProcessInstanceDAO instance) {
// TODO Auto-generated method stub
//throw new UnsupportedOperationException();
- System.out.println(event.toString());
- System.out.println(process.toString());
- System.out.println(instance.toString());
+ //System.out.println(event.toString());
+ //System.out.println(process.toString());
+ //System.out.println(instance.toString());
}
public Collection<ProcessInstanceDAO> instanceQuery(InstanceFilter
criteria) {
@@ -195,6 +195,7 @@
if ( _em != null ) {
_em.remove(p);
+ _em.flush();
}
}
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java?view=diff&rev=486541&r1=486540&r2=486541
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
Wed Dec 13 00:08:29 2006
@@ -45,7 +45,10 @@
@Table(name="ODE_CORRELATOR")
public class CorrelatorDAOImpl implements CorrelatorDAO {
- @Id @Column(name="CORRELATOR_KEY") private String _correlatorKey;
+ @Id @Column(name="CORRELATOR_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _correlatorId;
+ @Basic @Column(name="CORRELATOR_KEY") private String _correlatorKey;
@OneToMany(fetch=FetchType.LAZY,cascade={CascadeType.ALL})
private Collection<MessageRouteDAOImpl> _routes = new
ArrayList<MessageRouteDAOImpl>();
@OneToMany(fetch=FetchType.LAZY,cascade={CascadeType.ALL})
@@ -97,11 +100,16 @@
}
public void removeRoutes(String routeGroupId, ProcessInstanceDAO
target) {
+ // remove route across all correlators of the process
+ ((ProcessInstanceDAOImpl)target).removeRoutes(routeGroupId);
+ }
+
+ void removeLocalRoutes(String routeGroupId, ProcessInstanceDAO target) {
for (Iterator itr=_routes.iterator(); itr.hasNext(); ) {
MessageRouteDAOImpl mr =
(MessageRouteDAOImpl)itr.next();
if ( mr.getGroupId().equals(routeGroupId) &&
mr.getTargetInstance().equals(target))
itr.remove();
- }
+ }
}
}
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java?view=diff&rev=486541&r1=486540&r2=486541
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
Wed Dec 13 00:08:29 2006
@@ -56,7 +56,7 @@
_explanation = explanation;
_lineNo = faultLineNo;
_activityId = activityId;
- _data = DOMUtils.domToString(faultMessage);
+ _data = (faultMessage ==
null)?null:DOMUtils.domToString(faultMessage);
}
public int getActivityId() {
@@ -67,7 +67,7 @@
Element ret = null;
try {
- ret = DOMUtils.stringToDOM(_data);
+ ret = (_data == null)?null:DOMUtils.stringToDOM(_data);
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java?view=diff&rev=486541&r1=486540&r2=486541
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
Wed Dec 13 00:08:29 2006
@@ -119,7 +119,7 @@
public ProcessInstanceDAO getInstance(Long iid) {
for (ProcessInstanceDAO pi : _instances) {
- if ( pi.getInstanceId() == iid ) return pi;
+ if ( pi.getInstanceId().equals(iid) ) return pi;
}
return null;
}
@@ -148,7 +148,7 @@
public void removeRoutes(String routeId, ProcessInstanceDAO target) {
for (CorrelatorDAO c : _correlators) {
- c.removeRoutes(routeId, target);
+ ((CorrelatorDAOImpl)c).removeLocalRoutes(routeId, target);
}
}
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java?view=diff&rev=486541&r1=486540&r2=486541
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
Wed Dec 13 00:08:29 2006
@@ -231,7 +231,7 @@
public ScopeDAO getScope(Long scopeInstanceId) {
for (ScopeDAO sElement : _scopes) {
- if ( sElement.getScopeInstanceId() == scopeInstanceId)
return sElement;
+ if (
sElement.getScopeInstanceId().equals(scopeInstanceId)) return sElement;
}
return null;
}
@@ -296,6 +296,10 @@
_previousState = _state;
_state = state;
+ }
+
+ void removeRoutes(String routeGroupId) {
+ _process.removeRoutes(routeGroupId, this);
}
}
