[jboss-svn-commits] JBL Code SVN: r22786 - in labs/jbossrules/trunk/drools-process/drools-process-task/src: main/java/org/drools/task/event and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 15 19:23:35 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-09-15 19:23:34 -0400 (Mon, 15 Sep 2008)
New Revision: 22786
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClaimedEvent.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClosedEvent.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskEventSupport.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaClient.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/MockUserInfo.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/MockEventMessagingTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java
Log:
JBRULES-1745 WS-Human-Task
-Changed OrganizationalEntity id from long to String
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -15,58 +15,26 @@
import javax.persistence.Table;
@Entity
-public class Group extends OrganizationalEntity implements Externalizable {
- private String displayName;
-
- public Group() {
- super();
- }
-
- public Group(String displayName) {
- super();
- this.displayName = displayName;
- }
+public class Group extends OrganizationalEntity
+ implements
+ Externalizable {
- public String getDisplayName() {
- return displayName;
+ public Group() {
+ super();
}
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
+ public Group(String id) {
+ super( id );
}
-
+
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal( out );
- out.writeUTF( displayName );
-
- }
-
+
+ }
+
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
super.readExternal( in );
- displayName = in.readUTF();
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((displayName == null) ? 0 : displayName.hashCode());
- return result;
}
- @Override
- public boolean equals(Object obj) {
- if ( this == obj ) return true;
- if ( obj == null ) return false;
- if ( !(obj instanceof Group) ) return false;
- Group other = (Group) obj;
- if ( displayName == null ) {
- if ( other.displayName != null ) return false;
- } else if ( !displayName.equals( other.displayName ) ) return false;
- return true;
- }
-
-
-
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -14,26 +14,53 @@
public abstract class OrganizationalEntity implements Externalizable {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
+ private String id;
+ public OrganizationalEntity() {
+ }
+
+
+ public OrganizationalEntity(String id ) {
+ this.id = id;
+ }
+
public void writeExternal(ObjectOutput out) throws IOException {
- out.writeLong( id );
+ out.writeUTF( id );
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- id = in.readLong();
+ id = in.readUTF();
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(long id) {
+ public void setId(String id) {
this.id = id;
}
-
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ return result;
+ }
+
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( obj == null ) return false;
+ if ( !(obj instanceof OrganizationalEntity) ) return false;
+ OrganizationalEntity other = (OrganizationalEntity) obj;
+ if ( id == null ) {
+ if ( other.id != null ) return false;
+ } else if ( !id.equals( other.id ) ) return false;
+ return true;
+ }
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -15,64 +15,25 @@
@Entity
public class User extends OrganizationalEntity implements Externalizable{
- private String displayName;
public User() {
super();
}
- public User(String displayName) {
- super();
- this.displayName = displayName;
+ public User(String id) {
+ super(id);
}
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal( out );
- if (displayName != null) {
- out.writeBoolean( true );
- out.writeUTF( displayName );
- } else {
- out.writeBoolean( false );
- }
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- super.readExternal( in );
- if ( in.readBoolean() ) {
- displayName = in.readUTF();
- }
- }
-
- public String getDisplayName() {
- return displayName;
- }
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
+ super.readExternal( in );
+ }
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((displayName == null) ? 0 : displayName.hashCode());
- return result;
- }
- @Override
- public boolean equals(Object obj) {
- if ( this == obj ) return true;
- if ( obj == null ) return false;
- if ( !(obj instanceof User) ) return false;
- User other = (User) obj;
- if ( displayName == null ) {
- if ( other.displayName != null ) return false;
- } else if ( !displayName.equals( other.displayName ) ) return false;
- return true;
- }
-
-
-
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClaimedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClaimedEvent.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClaimedEvent.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -6,28 +6,28 @@
import java.io.ObjectOutput;
public class TaskClaimedEvent extends TaskEvent implements Externalizable {
- private long userId;
+ private String userId;
public TaskClaimedEvent() {
super();
}
- public TaskClaimedEvent(long taskId, long userId) {
+ public TaskClaimedEvent(long taskId, String userId) {
super( taskId );
this.userId = userId;
}
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal( out );
- out.writeLong( userId );
+ out.writeUTF( userId );
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal( in );
- userId = in.readLong();
+ userId = in.readUTF();
}
- public long getUserId() {
+ public String getUserId() {
return userId;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClosedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClosedEvent.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskClosedEvent.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -6,23 +6,23 @@
import java.io.ObjectOutput;
public class TaskClosedEvent extends TaskEvent implements Externalizable {
- private long userId;
+ private String userId;
- public TaskClosedEvent(long taskId, long userId) {
+ public TaskClosedEvent(long taskId, String userId) {
super( taskId );
this.userId = userId;
}
public void writeExternal(ObjectOutput out) throws IOException {
- out.writeLong( userId );
+ out.writeUTF( userId );
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- userId = in.readLong();
+ userId = in.readUTF();
}
- public long getUserId() {
+ public String getUserId() {
return userId;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskEventSupport.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/event/TaskEventSupport.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -72,7 +72,7 @@
return this.listeners.isEmpty();
}
- public void fireTaskClaimed(final long taskId, final long userId) {
+ public void fireTaskClaimed(final long taskId, final String userId) {
if ( this.listeners.isEmpty() ) {
return;
}
@@ -84,7 +84,7 @@
}
}
- public void fireTaskClosed(final long taskId, final long userId) {
+ public void fireTaskClosed(final long taskId, final String userId) {
if ( this.listeners.isEmpty() ) {
return;
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaClient.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaClient.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaClient.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -16,6 +16,9 @@
protected final String name;
protected AtomicInteger counter;
+ protected SocketConnector connector;
+ protected SocketAddress address;
+
public BaseMinaClient(String name, BaseMinaHandler handler) {
if (name == null) {
throw new IllegalArgumentException("Name can not be null");
@@ -24,14 +27,18 @@
this.handler = handler;
counter = new AtomicInteger();
}
+ public boolean connect(SocketConnector connector, SocketAddress address) {
+ this.connector = connector;
+ this.address = address;
+ connector.setHandler( this.handler );
+ return connect();
+ }
- public boolean connect(SocketConnector connector, SocketAddress address) {
+ public boolean connect() {
if (session != null && session.isConnected()) {
throw new IllegalStateException(
"Already connected. Disconnect first.");
- }
-
- connector.setHandler( this.handler );
+ }
try {
// SocketConnectorConfig config = new SocketConnectorConfig();
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/MinaTaskClient.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -35,12 +35,12 @@
import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
public class MinaTaskClient extends BaseMinaClient {
-
+
public MinaTaskClient(String name,
TaskClientHandler handler) {
super( name,
handler );
- }
+ }
public void addTask(Task task,
AddTaskResponseHandler responseHandler) {
@@ -162,7 +162,7 @@
}
public void claim(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -174,7 +174,7 @@
}
public void start(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -186,7 +186,7 @@
}
public void stop(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -198,7 +198,7 @@
}
public void release(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -210,7 +210,7 @@
}
public void suspend(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -222,7 +222,7 @@
}
public void resume(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -234,7 +234,7 @@
}
public void skip(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -246,7 +246,7 @@
}
public void complete(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -258,7 +258,7 @@
}
public void fail(long taskId,
- long userId) {
+ String userId) {
List args = new ArrayList( 1 );
args.add( taskId );
args.add( userId );
@@ -269,7 +269,7 @@
session.write( cmd );
}
- public void getTasksOwned(long userId,
+ public void getTasksOwned(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -283,7 +283,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsBusinessAdministrator(long userId,
+ public void getTasksAssignedAsBusinessAdministrator(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -297,7 +297,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsExcludedOwner(long userId,
+ public void getTasksAssignedAsExcludedOwner(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -311,7 +311,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsPotentialOwner(long userId,
+ public void getTasksAssignedAsPotentialOwner(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -325,7 +325,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsRecipient(long userId,
+ public void getTasksAssignedAsRecipient(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -339,7 +339,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsTaskInitiator(long userId,
+ public void getTasksAssignedAsTaskInitiator(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -353,7 +353,7 @@
session.write( cmd );
}
- public void getTasksAssignedAsTaskStakeholder(long userId,
+ public void getTasksAssignedAsTaskStakeholder(String userId,
String language,
TaskSummaryResponseHandler responseHandler) {
List args = new ArrayList( 2 );
@@ -378,7 +378,7 @@
CommandName.RegisterForEventRequest,
args );
handler.addResponseHandler( cmd.getId(),
- responseHandler );
+ responseHandler );
session.write( cmd );
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskServerHandler.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -41,55 +41,55 @@
switch ( cmd.getName() ) {
case ClaimRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.claim( taskId, userId );
break;
}
case StartRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.start( taskId, userId );
break;
}
case StopRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.stop( taskId, userId );
break;
}
case ReleaseRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.release( taskId, userId );
break;
}
case SuspendRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.suspend( taskId, userId );
break;
}
case ResumeRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.resume( taskId, userId );
break;
}
case SkipRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.skip( taskId, userId );
break;
}
case CompleteRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.complete( taskId, userId );
break;
}
case FailRequest : {
long taskId = ( Long ) cmd.getArguments().get( 0 );
- long userId = ( Long ) cmd.getArguments().get( 1 );
+ String userId = ( String ) cmd.getArguments().get( 1 );
service.fail( taskId, userId );
break;
}
@@ -180,7 +180,7 @@
break;
}
case QueryTasksOwned : {
- List<TaskSummary> results = service.getTasksOwned( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksOwned( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -191,7 +191,7 @@
break;
}
case QueryTasksAssignedAsBusinessAdministrator : {
- List<TaskSummary> results = service.getTasksAssignedAsBusinessAdministrator( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsBusinessAdministrator( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -202,7 +202,7 @@
break;
}
case QueryTasksAssignedAsPotentialOwner : {
- List<TaskSummary> results = service.getTasksAssignedAsPotentialOwner( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsPotentialOwner( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -213,7 +213,7 @@
break;
}
case QueryTasksAssignedAsTaskInitiator : {
- List<TaskSummary> results = service.getTasksAssignedAsTaskInitiator( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsTaskInitiator( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -224,7 +224,7 @@
break;
}
case QueryTasksAssignedAsExcludedOwner : {
- List<TaskSummary> results = service.getTasksAssignedAsExcludedOwner( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsExcludedOwner( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -235,7 +235,7 @@
break;
}
case QueryTasksAssignedAsRecipient : {
- List<TaskSummary> results = service.getTasksAssignedAsRecipient( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsRecipient( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
@@ -246,7 +246,7 @@
break;
}
case QueryTasksAssignedAsTaskStakeholder : {
- List<TaskSummary> results = service.getTasksAssignedAsTaskStakeholder( (Long) cmd.getArguments().get( 0 ),
+ List<TaskSummary> results = service.getTasksAssignedAsTaskStakeholder( (String) cmd.getArguments().get( 0 ),
(String) cmd.getArguments().get( 1 ) );
List args = new ArrayList( 1 );
args.add( results );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -246,7 +246,7 @@
}
public void claim(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -283,7 +283,7 @@
}
public void start(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -307,7 +307,7 @@
}
} else if ( taskData.getStatus() == Status.Reserved ) {
// if Reserved must be actual owner
- if ( taskData.getActualOwner().getId() == user.getId() ) {
+ if ( taskData.getActualOwner().getId().equals( user.getId() ) ) {
em.getTransaction().begin();
taskData.setStatus( Status.InProgress );
em.getTransaction().commit();
@@ -321,7 +321,7 @@
}
public void stop(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -331,7 +331,7 @@
TaskData taskData = task.getTaskData();
PeopleAssignments people = task.getPeopleAssignments();
- if ( taskData.getStatus() == Status.InProgress && (taskData.getActualOwner().getId() == user.getId() || isAllowed( user,
+ if ( taskData.getStatus() == Status.InProgress && (taskData.getActualOwner().getId().equals( user.getId() ) || isAllowed( user,
new List[]{people.getBusinessAdministrators()} )) ) {
// Status must be InProgress and actual owner, switch to Reserved
em.getTransaction().begin();
@@ -344,7 +344,7 @@
}
public void release(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -355,7 +355,7 @@
// task must be reserved or in progress and owned by user
PeopleAssignments people = task.getPeopleAssignments();
- if ( (taskData.getStatus() == Status.Reserved || taskData.getStatus() == Status.InProgress) && (taskData.getActualOwner().getId() == user.getId() || isAllowed( user,
+ if ( (taskData.getStatus() == Status.Reserved || taskData.getStatus() == Status.InProgress) && (taskData.getActualOwner().getId().equals( user.getId() ) || isAllowed( user,
new List[]{people.getBusinessAdministrators()} )) ) {
em.getTransaction().begin();
taskData.setStatus( Status.Ready );
@@ -367,7 +367,7 @@
}
public void suspend(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -386,7 +386,7 @@
}
if ( (taskData.getStatus() == Status.Ready || taskData.getStatus() == Status.Reserved || taskData.getStatus() == Status.InProgress)
- && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId() == user.getId()) || isAllowed( user,
+ && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId().equals( user.getId()) ) || isAllowed( user,
allowed )) ) {
em.getTransaction().begin();
taskData.setStatus( Status.Suspended );
@@ -397,7 +397,7 @@
}
public void resume(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -415,7 +415,7 @@
allowed = new List[]{people.getBusinessAdministrators()};
}
- if ( (taskData.getStatus() == Status.Suspended) && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId() == user.getId()) || isAllowed( user,
+ if ( (taskData.getStatus() == Status.Suspended) && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId().equals( user.getId()) ) || isAllowed( user,
allowed )) ) {
em.getTransaction().begin();
taskData.setStatus( taskData.getPreviousStatus() );
@@ -426,7 +426,7 @@
}
public void skip(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -444,7 +444,7 @@
allowed = new List[]{people.getBusinessAdministrators()};
}
- if ( task.getTaskData().isSkipable() && (taskData.getStatus() != Status.Completed && taskData.getStatus() != Status.Failed) && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId() == user.getId()) || isAllowed( user,
+ if ( task.getTaskData().isSkipable() && (taskData.getStatus() != Status.Completed && taskData.getStatus() != Status.Failed) && ((taskData.getActualOwner() != null && taskData.getActualOwner().getId().equals( user.getId()) ) || isAllowed( user,
allowed )) ) {
em.getTransaction().begin();
taskData.setStatus( Status.Obselete );
@@ -455,7 +455,7 @@
}
public void complete(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -464,7 +464,7 @@
TaskData taskData = task.getTaskData();
- if ( taskData.getStatus() == Status.InProgress && taskData.getActualOwner().getId() == user.getId() ) {
+ if ( taskData.getStatus() == Status.InProgress && taskData.getActualOwner().getId().equals( user.getId() ) ) {
// Status must be InProgress and actual owner, switch to Reserved
em.getTransaction().begin();
taskData.setStatus( Status.Completed );
@@ -476,7 +476,7 @@
}
public void fail(long taskId,
- long userId) {
+ String userId) {
Task task = em.find( Task.class,
taskId );
@@ -485,7 +485,7 @@
TaskData taskData = task.getTaskData();
- if ( taskData.getStatus() == Status.InProgress && taskData.getActualOwner().getId() == user.getId() ) {
+ if ( taskData.getStatus() == Status.InProgress && taskData.getActualOwner().getId().equals( user.getId() ) ) {
// Status must be InProgress and actual owner, switch to Reserved
em.getTransaction().begin();
taskData.setStatus( Status.Failed );
@@ -623,7 +623,7 @@
return (List<DeadlineSummary>) unescalatedDeadlines.getResultList();
}
- public List<TaskSummary> getTasksOwned(long userId,
+ public List<TaskSummary> getTasksOwned(String userId,
String language) {
tasksOwned.setParameter( "userId",
userId );
@@ -633,7 +633,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsBusinessAdministrator(long userId,
+ public List<TaskSummary> getTasksAssignedAsBusinessAdministrator(String userId,
String language) {
tasksAssignedAsBusinessAdministrator.setParameter( "userId",
userId );
@@ -643,7 +643,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsExcludedOwner(long userId,
+ public List<TaskSummary> getTasksAssignedAsExcludedOwner(String userId,
String language) {
tasksAssignedAsExcludedOwner.setParameter( "userId",
userId );
@@ -653,7 +653,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsPotentialOwner(long userId,
+ public List<TaskSummary> getTasksAssignedAsPotentialOwner(String userId,
String language) {
tasksAssignedAsPotentialOwner.setParameter( "userId",
userId );
@@ -663,7 +663,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsRecipient(long userId,
+ public List<TaskSummary> getTasksAssignedAsRecipient(String userId,
String language) {
tasksAssignedAsRecipient.setParameter( "userId",
userId );
@@ -673,7 +673,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsTaskInitiator(long userId,
+ public List<TaskSummary> getTasksAssignedAsTaskInitiator(String userId,
String language) {
tasksAssignedAsTaskInitiator.setParameter( "userId",
userId );
@@ -683,7 +683,7 @@
return list;
}
- public List<TaskSummary> getTasksAssignedAsTaskStakeholder(long userId,
+ public List<TaskSummary> getTasksAssignedAsTaskStakeholder(String userId,
String language) {
tasksAssignedAsTaskStakeholder.setParameter( "userId",
userId );
@@ -727,7 +727,7 @@
List<OrganizationalEntity> entities) {
// for now just do a contains, I'll figure out group membership later.
for ( OrganizationalEntity entity : entities ) {
- if ( entity.getId() == user.getId() ) {
+ if ( entity.getId().equals( user.getId() ) ) {
return true;
}
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/MockUserInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/MockUserInfo.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/MockUserInfo.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -13,6 +13,8 @@
private Map<OrganizationalEntity, String> languages = new HashMap<OrganizationalEntity, String>();
+ private Map<OrganizationalEntity, String> displayNames = new HashMap<OrganizationalEntity, String>();
+
public Map<Group, List<OrganizationalEntity>> getGroups() {
return groups;
}
@@ -32,7 +34,17 @@
public String getEmailForEntity(OrganizationalEntity entity) {
return emails.get( entity );
}
+
+
+ public Map<OrganizationalEntity, String> getDisplayNames() {
+ return displayNames;
+ }
+
+ public void setDisplayNames(Map<OrganizationalEntity, String> displayNames) {
+ this.displayNames = displayNames;
+ }
+
public Map<OrganizationalEntity, String> getLanguages() {
return languages;
}
@@ -50,11 +62,8 @@
}
public String getDisplayName(OrganizationalEntity entity) {
- if (entity instanceof User) {
- return ((User)entity).getDisplayName();
- } else {
- return ((Group)entity).getDisplayName();
- }
+ String displayName = displayNames.get( entity );
+ return ( displayName != null ) ? displayName : entity.getId();
}
public String getLanguageForEntity(OrganizationalEntity entity) {
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/MockEventMessagingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/MockEventMessagingTest.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/MockEventMessagingTest.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -48,7 +48,7 @@
assertEquals( 1, transport.list.size() );
assertEquals( taskId, ((TaskClaimedEvent) ((Payload) transport.list.get(0)).get()).getTaskId() );
- assertEquals( users.get( "darth" ).getId(), (Long) ((TaskClaimedEvent) ((Payload) transport.list.get(0)).get()).getUserId() );
+ assertEquals( users.get( "darth" ).getId(), ((TaskClaimedEvent) ((Payload) transport.list.get(0)).get()).getUserId() );
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java 2008-09-15 22:05:18 UTC (rev 22785)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceLifeCycleTest.java 2008-09-15 23:23:34 UTC (rev 22786)
@@ -144,7 +144,7 @@
assertEquals( users.get( "darth" ), task2.getTaskData().getActualOwner() );
}
- public void testStartFromReadyStateWithPotentialOwner() {
+ public void testStartFromReadyStateWithPotentialOwner() throws Exception {
Map vars = new HashedMap();
vars.put( "users", users );
vars.put( "groups", groups );
@@ -210,7 +210,7 @@
assertNull( task2.getTaskData().getActualOwner() );
}
- public void testStartFromReserved() {
+ public void testStartFromReserved() throws Exception {
Map vars = new HashedMap();
vars.put( "users", users );
vars.put( "groups", groups );
More information about the jboss-svn-commits
mailing list