refactor: Utilize Collection.fromString

Change-Id: I6e68656cb9bdb3b925a1ad217b771eb9a3a6a767

3 files changed, 6 insertions, 21 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java
index 77a466fd414..92e044119f0 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java
@@ -753,7 +753,7 @@ public class BranchEndpointImpl implements BranchEndpoint {
    @Override
    public Response purgeTxs(BranchId branch, String txIds) {
       boolean modified = false;
-      List<Long> txsToDelete = OrcsRestUtil.asLongList(txIds);
+      List<Long> txsToDelete = org.eclipse.osee.framework.jdk.core.util.Collections.fromString(txIds, Long::parseLong);
       if (!txsToDelete.isEmpty()) {
          ResultSet<? extends TransactionId> results = newTxQuery().andBranch(branch).andTxIds(txsToDelete).getResults();
          if (!results.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/IndexerEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/IndexerEndpointImpl.java
index 0bfb87fa7ba..de12709603c 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/IndexerEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/IndexerEndpointImpl.java
@@ -19,7 +19,9 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
+import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.jaxrs.OseeWebApplicationException;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.BranchReadable;
@@ -53,9 +55,9 @@ public class IndexerEndpointImpl implements IndexerEndpoint {
    }
 
    @Override
-   public Response indexBranches(String branchUuids, boolean missingItemsOnly) {
-      List<Long> ids = OrcsRestUtil.asLongList(branchUuids);
-      ResultSet<BranchReadable> results = newBranchQuery().andUuids(ids).getResults();
+   public Response indexBranches(String branchIdsStr, boolean missingItemsOnly) {
+      List<BranchId> branchIds = Collections.fromString(branchIdsStr, BranchId::valueOf);
+      ResultSet<BranchReadable> results = newBranchQuery().andIds(branchIds).getResults();
       Callable<Integer> op = getIndexer().indexBranches(Sets.newLinkedHashSet(results), missingItemsOnly);
       Integer result = executeCallable(op);
       boolean modified = result > 0;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/OrcsRestUtil.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/OrcsRestUtil.java
index a6972fba2de..5a13532e794 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/OrcsRestUtil.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/OrcsRestUtil.java
@@ -11,14 +11,12 @@
 package org.eclipse.osee.orcs.rest.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.orcs.data.BranchReadable;
 import org.eclipse.osee.orcs.data.TransactionReadable;
 import org.eclipse.osee.orcs.rest.model.Branch;
@@ -93,19 +91,4 @@ public final class OrcsRestUtil {
       data.setTxType(tx.getTxType());
       return data;
    }
-
-   public static List<Long> asLongList(String rawValue) {
-      List<Long> toReturn;
-      if (Strings.isValid(rawValue)) {
-         String[] entries = rawValue.split(",");
-         toReturn = new ArrayList<>();
-         for (String entry : entries) {
-            Long value = Long.parseLong(entry.trim());
-            toReturn.add(value);
-         }
-      } else {
-         toReturn = Collections.emptyList();
-      }
-      return toReturn;
-   }
 }