Revert "feature[ats_TW1669]: Improve ExportChangeReport for OSEE Web"

This reverts commit 3e88707316b848d449325d18f8e1bb3818427579.

Change-Id: I506e8e7df79692b4530735e07475d7e5c271c132

3 files changed, 4 insertions, 24 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryService.java
index 1c83280d850..bb6f3a40190 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryService.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.ats.api.IAtsWorkItem;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.query.IAtsQueryService;
 import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.jdbc.JdbcService;
 import org.eclipse.osee.jdbc.JdbcStatement;
 
@@ -50,7 +49,7 @@ public abstract class AbstractAtsQueryService implements IAtsQueryService {
    }
 
    @Override
-   public Collection<ArtifactToken> getArtifactsFromQuery(String query, Object... data) {
+   public Collection<ArtifactId> getArtifactsFromQuery(String query, Object... data) {
       JdbcStatement chStmt = jdbcService.getClient().getStatement();
       List<Integer> ids = new LinkedList<Integer>();
       try {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
index 67f6a06f7fc..61114290b72 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
@@ -547,10 +547,10 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
          + "attr.ATTR_TYPE_ID = 1152921504606847877 and attr.VALUE = ?";
 
    @Override
-   public ArtifactToken getArtifactByAtsId(String id) {
-      ArtifactToken artifact = null;
+   public ArtifactId getArtifactByAtsId(String id) {
+      ArtifactId artifact = null;
       try {
-         Collection<ArtifactToken> workItems =
+         Collection<ArtifactId> workItems =
             getQueryService().getArtifactsFromQuery(ATS_ID_QUERY, getAtsBranch().getId(), id);
          if (!workItems.isEmpty()) {
             artifact = workItems.iterator().next();
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
index 7855349eab6..ecb1893632e 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
@@ -37,12 +37,10 @@ import org.eclipse.osee.ats.core.validator.AtsXWidgetValidateManager;
 import org.eclipse.osee.ats.core.workflow.note.ArtifactNote;
 import org.eclipse.osee.ats.core.workflow.note.AtsWorkItemNotes;
 import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
 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.Collections;
 import org.eclipse.osee.framework.jdk.core.util.Conditions;
-import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 
 /**
@@ -190,21 +188,4 @@ public class AtsWorkItemServiceImpl implements IAtsWorkItemService {
       return teamWorkflowProvidersLazy;
    }
 
-   @Override
-   public IAtsWorkItem getWorkItemByAnyId(String actionId) {
-      IAtsWorkItem workItem = null;
-      ArtifactToken artifact = null;
-      if (GUID.isValid(actionId)) {
-         artifact = services.getArtifactByGuid(actionId);
-      } else if (Strings.isNumeric(actionId)) {
-         artifact = services.getArtifact(Long.valueOf(actionId));
-      } else {
-         artifact = services.getArtifactByAtsId(actionId);
-      }
-      if (artifact != null) {
-         workItem = services.getWorkItemFactory().getWorkItem(artifact);
-      }
-      return workItem;
-   }
-
 }