feature[ats_ATS64164]: CPA: Fix null in new action creation

Change-Id: I0e67dc338f928798e2d45483bb6d10f24e3e527d

4 files changed, 18 insertions, 4 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java
index a370c50ca47..4ffd6f7c3cb 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/state/StateManager.java
@@ -44,6 +44,7 @@ import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.framework.logging.OseeLog;
 
@@ -541,6 +542,7 @@ public class StateManager implements IAtsStateManager {
 
    @Override
    public WorkState createStateData(String name, List<? extends IAtsUser> assignees) {
+      Conditions.checkNotNullOrContainNull(assignees, "assignees");
       return new WorkStateImpl(name, assignees);
    }
 
@@ -551,6 +553,7 @@ public class StateManager implements IAtsStateManager {
 
    @Override
    public WorkState createStateData(String name, List<? extends IAtsUser> assignees, double hoursSpent, int percentComplete) {
+      Conditions.checkNotNullOrContainNull(assignees, "assignees");
       return new WorkStateImpl(name, assignees, hoursSpent, percentComplete);
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java
index eb9266e9227..0d3de12af28 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java
@@ -14,6 +14,7 @@ import java.util.LinkedList;
 import java.util.List;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.workflow.WorkState;
+import org.eclipse.osee.framework.jdk.core.util.Conditions;
 
 /**
  * @author Donald G. Dunne
@@ -71,9 +72,10 @@ public class WorkStateImpl implements WorkState {
    }
 
    @Override
-   public void addAssignee(IAtsUser steve) {
-      if (!assignees.contains(steve)) {
-         assignees.add(steve);
+   public void addAssignee(IAtsUser user) {
+      Conditions.checkNotNull(user, "user");
+      if (!assignees.contains(user)) {
+         assignees.add(user);
       }
    }
 
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsConfigObject.java
index 962de5fd4de..05443466279 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsConfigObject.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/workitem/AtsConfigObject.java
@@ -109,7 +109,9 @@ public abstract class AtsConfigObject extends org.eclipse.osee.ats.core.model.im
       Set<IAtsUser> results = new HashSet<IAtsUser>();
       try {
          for (ArtifactReadable userArt : artifact.getRelated(relation)) {
-            IAtsUser lead = getAtsServer().getUserService().getUserById(userArt.getGuid());
+            IAtsUser lead =
+               getAtsServer().getUserService().getUserById(
+                  (String) userArt.getSoleAttributeValue(CoreAttributeTypes.UserId));
             results.add(lead);
          }
       } catch (OseeCoreException ex) {
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
index 0361a954b67..42860dd1581 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Conditions.java
@@ -160,4 +160,11 @@ public final class Conditions {
          checkNotNull(object, objectName);
       }
    }
+
+   public static void checkNotNullOrContainNull(Collection<? extends Object> collection, String objectName) throws OseeCoreException {
+      checkNotNull(collection, objectName);
+      for (Object object : collection) {
+         checkNotNull(object, objectName);
+      }
+   }
 }