[jbpm-commits] JBoss JBPM SVN: r1983 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Aug 22 07:12:51 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-08-22 07:12:51 -0400 (Fri, 22 Aug 2008)
New Revision: 1983

Modified:
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
   jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
   jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
   jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
   jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
Log:
Refactor Participant

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,10 +21,10 @@
  */
 package org.jboss.bpm.model;
 
+// $Id: $
 
+import javax.management.ObjectName;
 
-//$Id$
-
 /**
  * An Entity, which is used in the definition of attributes for a {@link Participant}
  * 
@@ -36,5 +36,5 @@
   /**
    * Name is an attribute that is text description of the Entity.
    */
-  String getName();
+  ObjectName getName();
 }

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -53,11 +53,6 @@
   Participant getFromRef();
   
   /**
-   * Get the source of the source {@link FlowObject} for this message
-   */
-  FlowObject getFrom();
-  
-  /**
    * This defines the target of the Message.
    */
   Participant getToRef();

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -44,7 +44,7 @@
   /**
    * Get the type of this participant
    */
-  Participant.ParticipantType getParticipantType();
+  ParticipantType getParticipantType();
 
   /**
    * If the ParticipantType = Role, then a Role MUST be identified.

Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,10 +21,10 @@
  */
 package org.jboss.bpm.model;
 
+// $Id: $
 
+import javax.management.ObjectName;
 
-//$Id$
-
 /**
  * A Role, which is used in the definition of attributes for a {@link Participant}
  * 
@@ -36,6 +36,6 @@
   /**
    * Name is an attribute that is text description of the Role.
    */
-  String getName();
+  ObjectName getName();
 
 }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -413,9 +413,9 @@
     if (par != null)
     {
       if (par.getEntityRef() != null)
-        parName = par.getEntityRef().getName();
+        parName = par.getEntityRef().getName().getCanonicalName();
       else if (par.getRoleRef() != null)
-        parName = par.getRoleRef().getName();
+        parName = par.getRoleRef().getName().getCanonicalName();
     }
     return parName;
   }

Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -202,8 +202,14 @@
 
   private void adaptJAXBMessage(MessageBuilder msgBuilder, JAXBMessage jaxbMsg)
   {
-    msgBuilder.addFromRef(getObjectName(jaxbMsg.getFromRef()));
-    msgBuilder.addToRef(getObjectName(jaxbMsg.getToRef()));
+    String fromRef = jaxbMsg.getFromRef();
+    if (fromRef != null)
+      msgBuilder.addFromRef(getObjectName(fromRef));
+    
+    String toRef = jaxbMsg.getToRef();
+    if (toRef != null)
+      msgBuilder.addToRef(getObjectName(toRef));
+    
     for (JAXBProperty jaxbProp : jaxbMsg.getProperties())
     {
       boolean isCorrelation = jaxbProp.isCorrelation() != null ? jaxbProp.isCorrelation() : false;
@@ -211,9 +217,9 @@
     }
   }
 
-  private ObjectName getObjectName(String toStr)
+  private ObjectName getObjectName(String objName)
   {
-    return (toStr != null ? ObjectNameFactory.create(toStr) : null);
+    return ObjectNameFactory.create(objName);
   }
 
   private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxb)

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EntityImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,8 +21,10 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
+import javax.management.ObjectName;
+
 import org.jboss.bpm.model.Entity;
-import org.jboss.bpm.model.Participant;
+import org.jboss.bpm.model.Role;
 
 //$Id$
 
@@ -35,21 +37,29 @@
 @SuppressWarnings("serial")
 public class EntityImpl extends ParticipantImpl implements Entity
 {
-  private String name;
 
-  public EntityImpl(String name)
+  public EntityImpl(ObjectName name)
   {
-    this.name = name;
-    this.entityRef = this;
+    super(name);
   }
 
-  public Participant.ParticipantType getParticipantType()
+  public ParticipantType getParticipantType()
   {
-    return Participant.ParticipantType.Entity;
+    return ParticipantType.Entity;
   }
   
-  public String getName()
+  public ObjectName getName()
   {
     return name;
   }
+
+  public Entity getEntityRef()
+  {
+    return this;
+  }
+
+  public Role getRoleRef()
+  {
+    return null;
+  }
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageBuilderImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -47,13 +47,13 @@
 
   public MessageBuilder addToRef(ObjectName toRef)
   {
-    message.setTargetID(toRef);
+    message.setToRef(new EntityImpl(toRef));
     return this;
   }
   
   public MessageBuilder addFromRef(ObjectName fromRef)
   {
-    message.setSourceID(fromRef);
+    message.setFromRef(new EntityImpl(fromRef));
     return this;
   }
 

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -25,9 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.management.ObjectName;
-
-import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MutablePropertySupport;
 import org.jboss.bpm.model.Participant;
@@ -47,9 +44,8 @@
 public class MessageImpl extends SupportingElementImpl implements Message, MutablePropertySupport
 {
   private String name;
-  private ObjectName sourceID;
-  private FlowObject sourceFO;
-  private ObjectName targetID;
+  private Participant fromRef;
+  private Participant toRef;
   private List<Property> props = new ArrayList<Property>();
 
   public MessageImpl(String name)
@@ -60,11 +56,11 @@
     this.name = name;
   }
 
-  public MessageImpl(String name, ObjectName targetID, FlowObject sourceFO)
+  public MessageImpl(String name, Participant targetID, Participant sourceID)
   {
     this(name);
-    this.targetID = targetID;
-    this.sourceFO = sourceFO;
+    this.toRef = targetID;
+    this.fromRef = sourceID;
   }
 
   public String getName()
@@ -72,26 +68,6 @@
     return name;
   }
 
-  public ObjectName getSourceID()
-  {
-    return sourceID;
-  }
-
-  public void setSourceID(ObjectName sourceID)
-  {
-    this.sourceID = sourceID;
-  }
-
-  public ObjectName getTargetID()
-  {
-    return targetID;
-  }
-
-  public void setTargetID(ObjectName targetID)
-  {
-    this.targetID = targetID;
-  }
-
   public Property getProperty(String name)
   {
     for (Property prop : props)
@@ -136,22 +112,22 @@
 
   public Participant getFromRef()
   {
-    return sourceID != null ? new EntityImpl(sourceID.getCanonicalName()) : null;
+    return fromRef;
   }
 
-  public FlowObject getFrom()
+  public void setFromRef(Participant fromRef)
   {
-    return sourceFO;
+    this.fromRef = fromRef;
   }
-  
-  public void setFrom(FlowObject sourceFO)
+
+  public Participant getToRef()
   {
-    this.sourceFO = sourceFO;
+    return toRef;
   }
 
-  public Participant getToRef()
+  public void setToRef(Participant toRef)
   {
-    return targetID != null ? new EntityImpl(targetID.getCanonicalName()) : null;
+    this.toRef = toRef;
   }
 
   public String toString()

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/MessageSender.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -31,7 +31,6 @@
 import org.jboss.bpm.model.Message;
 import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.MessageBuilderFactory;
-import org.jboss.bpm.model.ObjectNameFactory;
 import org.jboss.bpm.model.Participant;
 import org.jboss.bpm.model.Property;
 import org.jboss.bpm.runtime.ExecutionContext;
@@ -45,12 +44,13 @@
  */
 class MessageSender
 {
-  private FlowObject fromRef;
+  private Participant fromRef;
   private Message messageRef;
   
-  public MessageSender(FlowObject fromRef, Message messageRef)
+  public MessageSender(FlowObject fromFlowObject, Message messageRef)
   {
-    this.fromRef = fromRef;
+    ObjectName procID = fromFlowObject.getProcess().getID();
+    this.fromRef = new EntityImpl(procID);
     this.messageRef = messageRef;
     
     if (messageRef == null)
@@ -74,7 +74,7 @@
       throw new IllegalStateException("Cannot obtain target participant");
 
     Entity entityRef = toRef.getEntityRef();
-    ObjectName targetID = ObjectNameFactory.create(entityRef.getName());
+    ObjectName targetID = entityRef.getName();
     msgBuilder.newMessage(messageRef.getName());
     msgBuilder.addToRef(targetID);
 
@@ -90,7 +90,7 @@
       msgBuilder.addProperty(key, value);
     }
     MessageImpl msg = (MessageImpl)msgBuilder.getMessage();
-    msg.setFrom(fromRef);
+    msg.setFromRef(fromRef);
 
     MessageManager mm = MessageManager.locateMessageManager();
     mm.sendMessage(targetID, msg);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,12 +21,12 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
-import org.jboss.bpm.model.Entity;
-import org.jboss.bpm.model.Participant;
-import org.jboss.bpm.model.Role;
-
 //$Id$
 
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Participant;
+
 /**
  * A Participant, which is used in the definition of attributes for a @{link Pool}, @{link Message}, and @{link
  * WebService}
@@ -37,16 +37,13 @@
 @SuppressWarnings("serial")
 public abstract class ParticipantImpl extends SupportingElementImpl implements Participant
 {
-  protected Entity entityRef;
-  protected Role roleRef;
+  protected ObjectName name;
   
-  public Entity getEntityRef()
+  public ParticipantImpl(ObjectName name)
   {
-    return entityRef;
+    if (name == null)
+      throw new IllegalArgumentException("Cannot create participant with name: null");
+
+    this.name = name;
   }
-  
-  public Role getRoleRef()
-  {
-    return roleRef;
-  }
 }

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -380,10 +380,10 @@
       throw new IllegalStateException("Cannot obtain process message: " + msgName);
 
     MessageImpl msgImpl = (MessageImpl)msgRef;
-    if (msgImpl.getSourceID() == null && procMsg.getSourceID() != null)
-      msgImpl.setSourceID(procMsg.getSourceID());
-    if (msgImpl.getTargetID() == null && procMsg.getTargetID() != null)
-      msgImpl.setTargetID(procMsg.getTargetID());
+    if (msgImpl.getFromRef() == null && procMsg.getFromRef() != null)
+      msgImpl.setFromRef(procMsg.getFromRef());
+    if (msgImpl.getToRef() == null && procMsg.getToRef() != null)
+      msgImpl.setToRef(procMsg.getToRef());
 
     for (Property prop : procMsg.getProperties())
       ((MessageImpl)msgRef).addProperty(prop);

Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/RoleImpl.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -21,11 +21,14 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Entity;
 import org.jboss.bpm.model.Participant;
 import org.jboss.bpm.model.Role;
 
-//$Id$
-
 /**
  * A Role, which is used in the definition of attributes for a @{link Participant}
  * 
@@ -35,12 +38,9 @@
 @SuppressWarnings("serial")
 public class RoleImpl extends ParticipantImpl implements Role
 {
-  private String name;
-
-  public RoleImpl(String name)
+  public RoleImpl(ObjectName name)
   {
-    this.name = name;
-    this.roleRef = this;
+    super(name);
   }
 
   public Participant.ParticipantType getParticipantType()
@@ -48,8 +48,18 @@
     return Participant.ParticipantType.Role;
   }
   
-  public String getName()
+  public ObjectName getName()
   {
     return name;
   }
+
+  public Entity getEntityRef()
+  {
+    return null;
+  }
+
+  public Role getRoleRef()
+  {
+    return this;
+  }
 }

Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java	2008-08-22 10:09:27 UTC (rev 1982)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java	2008-08-22 11:12:51 UTC (rev 1983)
@@ -159,7 +159,7 @@
     public void catchMessage(Message msg)
     {
       log.debug("catchMessage: " + msg);
-      ObjectName procID = msg.getFrom().getProcess().getID();
+      ObjectName procID = msg.getFromRef().getEntityRef().getName();
       MessageManager mm = MessageManager.locateMessageManager();
       if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
         mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());




More information about the jbpm-commits mailing list