refactor: Improve efficency of DispoApiImpl and OrcsApiImpl

Change-Id: I266c4999cfb4801514ddd14b8566823b1aaf5b21

3 files changed, 8 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
index 3c634ccc8da..7e8300578dd 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
@@ -197,9 +197,8 @@ public class DispoApiImpl implements DispoApi {
       return wasUpdated;
    }
 
-   private boolean editDispoItems(DispoProgram program, String itemId, List<DispoItem> dispoItems) {
+   private boolean editDispoItems(DispoProgram program, List<DispoItem> dispoItems) {
       boolean wasUpdated = false;
-      DispoItem dispoItemToEdit = getQuery().findDispoItemById(program, itemId);
 
       for (DispoItem dispoItem : dispoItems) {
          try {
@@ -210,7 +209,7 @@ public class DispoApiImpl implements DispoApi {
       }
 
       ArtifactReadable author = getQuery().findUser();
-      getWriter().updateDispoItems(author, program, dispoItemToEdit.getGuid(), dispoItems);
+      getWriter().updateDispoItems(author, program, dispoItems);
       wasUpdated = true;
       return wasUpdated;
    }
@@ -393,7 +392,7 @@ public class DispoApiImpl implements DispoApi {
                createDispoItems(program, setToEdit.getGuid(), itemsToCreate);
             }
             if (itemsToEdit.size() > 0) {
-               editDispoItems(program, setToEdit.getGuid(), itemsToEdit);
+               editDispoItems(program, itemsToEdit);
             }
 
          } catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
index 2504ecf30d9..a5044487565 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
@@ -30,9 +30,9 @@ public interface DispoWriter {
 
    void createDispoItems(ArtifactReadable author, DispoProgram program, DispoSet parentSet, List<DispoItem> data, String assignee);
 
-   void updateDispoItems(ArtifactReadable author, DispoProgram program, String itemToEditId, List<DispoItem> itemsToUpdate);
-
    boolean deleteDispoItem(ArtifactReadable author, DispoProgram program, String itemId);
 
    void updateDispoItem(ArtifactReadable author, DispoProgram program, String dispoItemId, DispoItem data);
+
+   void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data);
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
index ad8aa488ccb..d0434fce7b2 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
@@ -336,11 +336,11 @@ public class OrcsStorageImpl implements Storage {
    }
 
    @Override
-   public void updateDispoItems(ArtifactReadable author, DispoProgram program, String dispoItemId, List<DispoItem> data) {
+   public void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data) {
       TransactionBuilder tx = getTxFactory().createTransaction(program.getUuid(), author, "Edit Multiple Dispo Items");
 
       for (DispoItem newItem : data) {
-         ArtifactId dispoItemArt = findDispoArtifact(program, dispoItemId, DispoConstants.DispoItem);
+         ArtifactId dispoItemArt = findDispoArtifact(program, newItem.getGuid(), DispoConstants.DispoItem);
          updateSingleItem(author, program, dispoItemArt, newItem, tx);
       }
 
@@ -359,7 +359,7 @@ public class OrcsStorageImpl implements Storage {
    private IOseeBranch convertToDispoBranch(String configContents, IOseeBranch baselineBranch) {
       IOseeBranch toReturn = null;
 
-      Pattern regex = Pattern.compile(baselineBranch.getUuid() + "\\s*:\\s*.*");
+      Pattern regex = Pattern.compile("(\\n|^+)" + baselineBranch.getUuid() + "\\s*:\\s*.*");
       Matcher matcher = regex.matcher(configContents);
 
       Long uuid = null;