refactor[ats_ATS46139]: Finish removing BranchCache from server

Change-Id: I6192b7f0dbdd9b85f37742e77336f9e1d317a53c

4 files changed, 28 insertions, 12 deletions

diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
index 3d049b297b1..34edc93b6c0 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
@@ -15,7 +15,6 @@ import java.util.concurrent.Callable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
@@ -25,8 +24,10 @@ import org.eclipse.osee.orcs.ApplicationContext;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.OrcsBranch;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.data.BranchReadable;
 import org.eclipse.osee.orcs.search.BranchQuery;
 import org.eclipse.osee.orcs.search.QueryFactory;
+import org.eclipse.osee.orcs.search.TransactionQuery;
 
 /**
  * @author Roberto E. Escobar
@@ -110,10 +111,14 @@ public abstract class AbstractBranchCallable<REQ_TYPE, RESP_TYPE> extends Cancel
       return branchOps;
    }
 
-   protected IOseeBranch getBranchFromUuid(long uuid) {
+   protected QueryFactory getQueryFactory() {
+      return orcsApi.getQueryFactory(getContext());
+   }
+
+   protected BranchReadable getBranchFromUuid(long uuid) {
       BranchQuery branchQuery = orcsApi.getQueryFactory(getContext()).branchQuery();
       branchQuery.andUuids(uuid);
-      return branchQuery.getResultsAsId().getExactlyOne();
+      return branchQuery.getResults().getExactlyOne();
    }
 
    protected ApplicationContext getContext() {
@@ -129,4 +134,10 @@ public abstract class AbstractBranchCallable<REQ_TYPE, RESP_TYPE> extends Cancel
       return artifact;
    }
 
+   protected Long getBranchUuidFromTxId(int tx) {
+      TransactionQuery txQuery = getQueryFactory().transactionQuery();
+      Long branchId = txQuery.andTxId(tx).getResults().getExactlyOne().getBranchId();
+      return branchId;
+   }
+
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
index 3a1e5410a91..f5a896c614a 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
@@ -17,12 +17,12 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.message.BranchCommitRequest;
 import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.orcs.ApplicationContext;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArchiveOperation;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.data.TransactionReadable;
 
 /**
  * @author Roberto E. Escobar
@@ -41,11 +41,11 @@ public class CommitBranchCallable extends AbstractBranchCallable<BranchCommitReq
 
       ArtifactReadable committer = getArtifactById(request.getUserArtId());
 
-      Callable<TransactionRecord> callable = getBranchOps().commitBranch(committer, source, destination);
-      TransactionRecord transactionRecord = callAndCheckForCancel(callable);
+      Callable<TransactionReadable> callable = getBranchOps().commitBranch(committer, source, destination);
+      TransactionReadable transactionRecord = callAndCheckForCancel(callable);
 
       BranchCommitResponse responseData = new BranchCommitResponse();
-      responseData.setTransaction(transactionRecord);
+      responseData.setTransactionId(transactionRecord.getGuid());
 
       if (request.isArchiveAllowed()) {
          Callable<Void> archiveCallable = getBranchOps().archiveUnarchiveBranch(source, ArchiveOperation.ARCHIVE);
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
index dbe8fcf7036..3c5b2db30fc 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
@@ -14,8 +14,6 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.ITransaction;
-import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.message.ChangeReportRequest;
 import org.eclipse.osee.framework.core.message.ChangeReportResponse;
@@ -23,6 +21,8 @@ import org.eclipse.osee.framework.core.model.change.ChangeItem;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.orcs.ApplicationContext;
 import org.eclipse.osee.orcs.OrcsApi;
+import org.eclipse.osee.orcs.data.TransactionReadable;
+import org.eclipse.osee.orcs.search.QueryFactory;
 
 /**
  * @author Roberto E. Escobar
@@ -36,8 +36,11 @@ public class CompareBranchCallable extends AbstractBranchCallable<ChangeReportRe
 
    @Override
    protected ChangeReportResponse executeCall(ChangeReportRequest request) throws Exception {
-      ITransaction sourceTx = TokenFactory.createTransaction(request.getSourceTx());
-      ITransaction destinationTx = TokenFactory.createTransaction(request.getDestinationTx());
+      QueryFactory queryFactory = getQueryFactory();
+      TransactionReadable sourceTx =
+         queryFactory.transactionQuery().andTxId(request.getSourceTx()).getResults().getExactlyOne();
+      TransactionReadable destinationTx =
+         queryFactory.transactionQuery().andTxId(request.getDestinationTx()).getResults().getExactlyOne();
 
       Callable<List<ChangeItem>> callable = getBranchOps().compareBranch(sourceTx, destinationTx);
       List<ChangeItem> items = callAndCheckForCancel(callable);
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
index 4e3c3ccf5dc..103b3369f99 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
@@ -17,11 +17,11 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.message.BranchCreationRequest;
 import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.model.BranchReadable;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.orcs.ApplicationContext;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.data.BranchReadable;
 import org.eclipse.osee.orcs.data.CreateBranchData;
 
 /**
@@ -55,6 +55,8 @@ public class CreateBranchCallable extends AbstractBranchCallable<BranchCreationR
       createData.setAssociatedArtifact(associatedWith);
 
       createData.setMergeDestinationBranchId(request.getMergeDestinationBranchId());
+      Long parentBranch = getBranchUuidFromTxId(request.getSourceTransactionId());
+      createData.setParentBranchUuid(parentBranch);
       createData.setMergeAddressingQueryId(request.getMergeAddressingQueryId());
       createData.setTxCopyBranchType(request.txIsCopied());
       Callable<BranchReadable> callable;