feature[ats_KNC0J]: Remove BranchCache calls from osee.orcs.rest

Change-Id: I68e7cf406719b9149ed7db6f8b812e91c22a2d51

5 files changed, 61 insertions, 48 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
index b405f7b526a..a5255ac710b 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchResource.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.rest.internal;
 
-import java.util.Collections;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -18,10 +17,10 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.search.BranchQuery;
 
 /**
  * @author Roberto E. Escobar
@@ -51,12 +50,16 @@ public class BranchResource {
       return new TxsResource(uriInfo, request, branchUuid);
    }
 
+   /**
+    * @return Html representation of branche(s) that match UUID. Although it's not expected, no exception thrown if
+    * multiple branches found.
+    */
    @GET
    @Produces(MediaType.TEXT_HTML)
    public String getAsHtml() throws OseeCoreException {
-      IOseeBranch token = TokenFactory.createBranch(branchUuid, "");
-      Branch branch = OrcsApplication.getOrcsApi().getBranchCache().get(token);
+      BranchQuery query = OrcsApplication.getOrcsApi().getQueryFactory(null).branchQuery();
+      ResultSet<BranchReadable> results = query.andUuids(branchUuid).getResults();
       HtmlWriter writer = new HtmlWriter(uriInfo);
-      return writer.toHtml(Collections.singleton(branch));
+      return writer.toHtml(results);
    }
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
index a692b916643..5696dd50552 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchesResource.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.rest.internal;
 
-import java.util.Collection;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -19,11 +18,11 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
 import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.cache.BranchFilter;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.search.BranchQuery;
 
 /**
  * @author Roberto E. Escobar
@@ -46,10 +45,11 @@ public class BranchesResource {
    @GET
    @Produces(MediaType.TEXT_HTML)
    public String getAsHtml() throws OseeCoreException {
-      Collection<Branch> branches =
-         OrcsApplication.getOrcsApi().getBranchCache().getBranches(
-            new BranchFilter(BranchArchivedState.UNARCHIVED, BranchType.BASELINE, BranchType.WORKING));//getAll();
+      BranchQuery query = OrcsApplication.getOrcsApi().getQueryFactory(null).branchQuery();
+      ResultSet<BranchReadable> results =
+         query.andIsOfType(BranchType.BASELINE, BranchType.WORKING).getResults();
+
       HtmlWriter writer = new HtmlWriter(uriInfo);
-      return writer.toHtml(branches);
+      return writer.toHtml(results);
    }
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
index fdcfe78f2cc..be6c56d86e0 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
@@ -18,11 +18,11 @@ import java.util.Map.Entry;
 import javax.ws.rs.core.UriInfo;
 import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.data.AttributeReadable;
+import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.data.TransactionReadable;
 
 /**
  * @author Roberto E. Escobar
@@ -39,8 +39,8 @@ public class HtmlWriter {
       StringBuilder builder = new StringBuilder();
       builder.append("<html><body>");
       for (Object object : objects) {
-         if (object instanceof Branch) {
-            Branch branch = (Branch) object;
+         if (object instanceof BranchReadable) {
+            BranchReadable branch = (BranchReadable) object;
             addTable(builder, toData(branch));
          } else if (object instanceof ArtifactReadable) {
             ArtifactReadable artifact = (ArtifactReadable) object;
@@ -48,8 +48,8 @@ public class HtmlWriter {
          } else if (object instanceof AttributeReadable) {
             AttributeReadable<?> attribute = (AttributeReadable<?>) object;
             addTable(builder, toData(attribute));
-         } else if (object instanceof TransactionRecord) {
-            TransactionRecord tx = (TransactionRecord) object;
+         } else if (object instanceof TransactionReadable) {
+            TransactionReadable tx = (TransactionReadable) object;
             addTable(builder, toData(tx));
          } else {
             Map<String, Object> unhandled = new LinkedHashMap<String, Object>();
@@ -112,19 +112,19 @@ public class HtmlWriter {
       return data;
    }
 
-   public Map<String, Object> toData(Branch branch) throws OseeCoreException {
+   private Map<String, Object> toData(BranchReadable branch) throws OseeCoreException {
       Map<String, Object> data = new LinkedHashMap<String, Object>();
       data.put("Name", branch.getName());
       data.put("Uuid", branch.getGuid());
-      data.put("Local Id", branch.getId());
+      data.put("Local Id", branch.getLocalId());
       data.put("State", branch.getBranchState());
       data.put("Type", branch.getBranchType());
       data.put("Archived", branch.getArchiveState());
-      data.put("Short Name", branch.getShortName());
-      data.put("Storage", branch.getStorageState());
       if (branch.hasParentBranch()) {
          try {
-            IOseeBranch parent = branch.getParentBranch();
+            IOseeBranch parent =
+               OrcsApplication.getOrcsApi().getBranchOps(null).getBranchFromId(branch.getParentBranch());
+
             URI uri;
             if (isAtEndOfPath(uriInfo.getPath(), "branch")) {
                uri = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(parent.getGuid());
@@ -147,21 +147,22 @@ public class HtmlWriter {
       return data;
    }
 
-   public Map<String, Object> toData(TransactionRecord txRecord) throws OseeCoreException {
+   public Map<String, Object> toData(TransactionReadable txRecord) throws OseeCoreException {
       Map<String, Object> data = new LinkedHashMap<String, Object>();
-      data.put("TxId", txRecord.getId());
+      data.put("TxId", txRecord.getLocalId());
       data.put("TxType", txRecord.getTxType());
-      data.put("Date", txRecord.getTimeStamp());
+      data.put("Date", txRecord.getDate());
       data.put("Comment", txRecord.getComment());
-      data.put("Author", txRecord.getAuthor());
-      IOseeBranch parent = txRecord.getBranch();
+      data.put("Author", txRecord.getAuthorId());
+      IOseeBranch branch = OrcsApplication.getOrcsApi().getBranchOps(null).getBranchFromId(txRecord.getBranchId());
+
       URI uri;
       if (isAtEndOfPath(uriInfo.getPath(), "branch")) {
-         uri = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(parent.getGuid());
+         uri = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(branch.getGuid());
       } else {
-         uri = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(parent.getGuid());
+         uri = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(branch.getGuid());
       }
-      data.put("Branch", asLink(uri.toASCIIString(), parent.getName()));
+      data.put("Branch", asLink(uri.toASCIIString(), branch.getName()));
       return data;
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
index 83cafa2e228..17b6d8c9bec 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxResource.java
@@ -16,9 +16,10 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.model.cache.TransactionCache;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.orcs.data.TransactionReadable;
+import org.eclipse.osee.orcs.search.QueryFactory;
+import org.eclipse.osee.orcs.search.TransactionQuery;
 
 /**
  * @author Roberto E. Escobar
@@ -44,10 +45,11 @@ public class TxResource {
 
    @Produces(MediaType.TEXT_HTML)
    public String getAsHtml() throws OseeCoreException {
-      TransactionCache txCache = OrcsApplication.getOrcsApi().getTxsCache();
-      TransactionRecord txRecord = txCache.getOrLoad(txId);
+      QueryFactory queryFactory = OrcsApplication.getOrcsApi().getQueryFactory(null);
+      TransactionQuery query2 = queryFactory.transactionQuery();
+      TransactionReadable baseTransaction = query2.andTxId(txId).getResults().getExactlyOne();
       HtmlWriter writer = new HtmlWriter(uriInfo);
-      return writer.toHtml(Collections.singleton(txRecord));
+      return writer.toHtml(Collections.singleton(baseTransaction));
    }
 
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
index c13d232ad32..33c28144707 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/TxsResource.java
@@ -19,11 +19,13 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.osee.framework.core.enums.TransactionVersion;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.core.model.cache.TransactionCache;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.orcs.data.BranchReadable;
+import org.eclipse.osee.orcs.data.TransactionReadable;
+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
@@ -52,13 +54,18 @@ public class TxsResource {
    @Produces(MediaType.TEXT_HTML)
    public String getAsHtml() throws OseeCoreException {
 
-      TransactionCache txCache = OrcsApplication.getOrcsApi().getTxsCache();
-      Branch branch = OrcsApplication.getOrcsApi().getBranchCache().getByGuid(branchUuid);
+      QueryFactory queryFactory = OrcsApplication.getOrcsApi().getQueryFactory(null);
+      BranchQuery query = queryFactory.branchQuery();
+      ResultSet<BranchReadable> results = query.andUuids(branchUuid).getResults();
+      BranchReadable branch = results.getExactlyOne();
 
-      TransactionRecord txBase = txCache.getTransaction(branch, TransactionVersion.BASE);
-      TransactionRecord txHead = txCache.getTransaction(branch, TransactionVersion.HEAD);
+      TransactionQuery query1 = queryFactory.transactionQuery();
+      TransactionReadable headTransaction = query1.andIsHead(branch).getResults().getExactlyOne();
+
+      TransactionQuery query2 = queryFactory.transactionQuery();
+      TransactionReadable baseTransaction = query2.andTxId(branch.getBaseTransaction()).getResults().getExactlyOne();
 
       HtmlWriter writer = new HtmlWriter(uriInfo);
-      return writer.toHtml(Arrays.asList(txBase, txHead));
+      return writer.toHtml(Arrays.asList(baseTransaction, headTransaction));
    }
 }