bug[ats_ATS242073]: Fix path, id for orcs rest queries

Change-Id: Ia9988b6f4723ecdeaf6771c2bae109a2986688bc

5 files changed, 22 insertions, 22 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
index f91fabde7db..0b8519a9225 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactResource.java
@@ -35,9 +35,9 @@ public class ArtifactResource {
    Request request;
 
    Long branchUuid;
-   String artifactUuid;
+   Long artifactUuid;
 
-   public ArtifactResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid) {
+   public ArtifactResource(UriInfo uriInfo, Request request, Long branchUuid, Long artifactUuid) {
       this.uriInfo = uriInfo;
       this.request = request;
       this.branchUuid = branchUuid;
@@ -54,7 +54,7 @@ public class ArtifactResource {
    public String getAsHtml() throws OseeCoreException {
       IOseeBranch branch = TokenFactory.createBranch(branchUuid, "");
       QueryFactory factory = OrcsApplication.getOrcsApi().getQueryFactory();
-      ResultSet<ArtifactReadable> arts = factory.fromBranch(branch).andGuid(artifactUuid).getResults();
+      ResultSet<ArtifactReadable> arts = factory.fromBranch(branch).andUuid(artifactUuid).getResults();
       HtmlWriter writer = new HtmlWriter(uriInfo);
       return writer.toHtml(arts);
    }
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
index 5c03ad021fb..5cd155b2d6c 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
@@ -55,7 +55,7 @@ public class ArtifactsResource {
    }
 
    @Path("{uuid}")
-   public ArtifactResource getArtifact(@PathParam("uuid") String artifactUuid) {
+   public ArtifactResource getArtifact(@PathParam("uuid") Long artifactUuid) {
       return new ArtifactResource(uriInfo, request, branchUuid, artifactUuid);
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
index c2a02a6de92..ed0a33ab7c4 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributeResource.java
@@ -38,15 +38,15 @@ public class AttributeResource {
    private final Request request;
 
    private final Long branchUuid;
-   private final String artifactUuid;
+   private final Long artifactUuid;
    private final int attrId;
    private final int transactionId;
 
-   public AttributeResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid, int attributeId) {
+   public AttributeResource(UriInfo uriInfo, Request request, Long branchUuid, Long artifactUuid, int attributeId) {
       this(uriInfo, request, branchUuid, artifactUuid, attributeId, -1);
    }
 
-   public AttributeResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid, int attributeId, int transactionId) {
+   public AttributeResource(UriInfo uriInfo, Request request, Long branchUuid, Long artifactUuid, int attributeId, int transactionId) {
       this.uriInfo = uriInfo;
       this.request = request;
       this.branchUuid = branchUuid;
@@ -60,7 +60,7 @@ public class AttributeResource {
    public String getAsText() throws OseeCoreException {
       IOseeBranch branch = TokenFactory.createBranch(branchUuid, "");
       QueryFactory factory = OrcsApplication.getOrcsApi().getQueryFactory();
-      QueryBuilder queryBuilder = factory.fromBranch(branch).andGuid(artifactUuid);
+      QueryBuilder queryBuilder = factory.fromBranch(branch).andUuid(artifactUuid);
       if (transactionId > 0) {
          queryBuilder.fromTransaction(transactionId);
       }
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
index bb3b125e5df..82a4e96a47f 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/AttributesResource.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.orcs.search.QueryFactory;
 @Path("attribute")
 public class AttributesResource {
 
-   // Allows to insert contextual objects into the class, 
+   // Allows insertion of contextual objects into the class,
    // e.g. ServletContext, Request, Response, UriInfo
    @Context
    private final UriInfo uriInfo;
@@ -38,9 +38,9 @@ public class AttributesResource {
    private final Request request;
 
    private final Long branchUuid;
-   private final String artifactUuid;
+   private final Long artifactUuid;
 
-   public AttributesResource(UriInfo uriInfo, Request request, Long branchUuid, String artifactUuid) {
+   public AttributesResource(UriInfo uriInfo, Request request, Long branchUuid, Long artifactUuid) {
       this.uriInfo = uriInfo;
       this.request = request;
       this.branchUuid = branchUuid;
@@ -62,7 +62,7 @@ public class AttributesResource {
    public String getAllAttributes() throws OseeCoreException {
       IOseeBranch branch = TokenFactory.createBranch(branchUuid, "");
       QueryFactory factory = OrcsApplication.getOrcsApi().getQueryFactory();
-      ArtifactReadable artifact = factory.fromBranch(branch).andGuid(artifactUuid).getResults().getExactlyOne();
+      ArtifactReadable artifact = factory.fromBranch(branch).andUuid(artifactUuid).getResults().getExactlyOne();
 
       HtmlWriter writer = new HtmlWriter(uriInfo);
       return writer.toHtml(artifact.getAttributes());
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 34cadcc6981..b66030b4801 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
@@ -69,14 +69,14 @@ public class HtmlWriter {
 
       int attrId = attribute.getLocalId();
       URI uri = uriInfo.getAbsolutePathBuilder().path("{attributeId}").build(attrId);
-      data.put("AttributeId", asLink(uri.toASCIIString(), String.valueOf(attrId)));
+      data.put("AttributeId", asLink(uri.getPath(), String.valueOf(attrId)));
       return data;
    }
 
    private Map<String, Object> toData(ArtifactReadable artifact) throws OseeCoreException {
       Map<String, Object> data = new LinkedHashMap<>();
       data.put("Name", artifact.getName());
-      data.put("Uuid", artifact.getGuid());
+      data.put("Artifact Id", artifact.getUuid());
       data.put("Tx Id", artifact.getTransaction());
       IOseeBranch branch = artifact.getBranch();
 
@@ -86,13 +86,13 @@ public class HtmlWriter {
       } else {
          uri = uriInfo.getAbsolutePathBuilder().path("../../../{uuid}").build(branch.getUuid());
       }
-      data.put("Branch", asLink(uri.toASCIIString(), branch.getName()));
+      data.put("Branch", asLink(uri.getPath(), branch.getName()));
 
       Collection<? extends IAttributeType> types = artifact.getExistingAttributeTypes();
       for (IAttributeType type : types) {
          for (AttributeReadable<?> attr : artifact.getAttributes(type)) {
             URI attrUri = uriInfo.getAbsolutePathBuilder().path("/attribute/{attributeId}").build(attr.getLocalId());
-            String label = asLink(attrUri.toASCIIString(), type.getName());
+            String label = asLink(attrUri.getPath(), type.getName());
             String value = attr.getDisplayableString();
             data.put(label, value == null ? "<NULL>" : value);
          }
@@ -102,12 +102,12 @@ public class HtmlWriter {
       for (ArtifactReadable art : artifact.getChildren()) {
          URI uri1;
          if (isAtEndOfPath(uriInfo.getPath(), "artifact")) {
-            uri1 = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(art.getGuid());
+            uri1 = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(art.getUuid());
          } else {
-            uri1 = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(art.getGuid());
+            uri1 = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(art.getUuid());
          }
          String value = art.getName();
-         data.put("Child " + ++count, asLink(uri1.toASCIIString(), value == null ? "<NULL>" : value));
+         data.put("Child " + ++count, asLink(uri1.getPath(), value == null ? "<NULL>" : value));
       }
       return data;
    }
@@ -130,7 +130,7 @@ public class HtmlWriter {
             } else {
                uri = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(parent.getGuid());
             }
-            data.put("Parent", asLink(uri.toASCIIString(), parent.getName()));
+            data.put("Parent", asLink(uri.getPath(), parent.getName()));
          } catch (OseeCoreException ex) {
             data.put("Parent", "Root");
          }
@@ -141,7 +141,7 @@ public class HtmlWriter {
          } else {
             uri = uriInfo.getAbsolutePathBuilder().path("../{uuid}/artifact").build(branch.getUuid());
          }
-         data.put("Artifacts", asLink(uri.toASCIIString(), "Hierarchy"));
+         data.put("Artifacts", asLink(uri.getPath(), "Hierarchy"));
       }
       return data;
    }
@@ -165,7 +165,7 @@ public class HtmlWriter {
       } else {
          uri = uriInfo.getAbsolutePathBuilder().path("../{uuid}").build(branch.getUuid());
       }
-      data.put("Branch", asLink(uri.toASCIIString(), branch.getName()));
+      data.put("Branch", asLink(uri.getPath(), branch.getName()));
       return data;
    }