refinement: CPA: Create AtsServer.getQuery()

Change-Id: I7a7e8fe46b988491299b2ca3938e056a0672f301

11 files changed, 36 insertions, 66 deletions

diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
index 1f825a9d79c..8922535fa12 100644
--- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF
@@ -69,5 +69,4 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime
 Export-Package: org.eclipse.osee.ats.impl,
  org.eclipse.osee.ats.impl.action,
- org.eclipse.osee.ats.impl.resource,
- org.eclipse.osee.ats.impl.util
+ org.eclipse.osee.ats.impl.resource
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java
index 8e7b53c1684..f08da6335c1 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/IAtsServer.java
@@ -37,6 +37,7 @@ import org.eclipse.osee.ats.impl.internal.workitem.IArtifactProvider;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.search.QueryBuilder;
 
 /**
  * @author Donald G Dunne
@@ -84,6 +85,8 @@ public interface IAtsServer extends IAtsConfigItemFactoryProvider, IAtsConfigPro
 
    ArtifactReadable getActionById(String id);
 
+   QueryBuilder getQuery();
+
    String getConfigValue(String key);
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
index d97befced5c..17704aa37b4 100644
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
+++ b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/internal/AtsServerImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsStateFactory;
 import org.eclipse.osee.ats.core.config.IAtsConfig;
 import org.eclipse.osee.ats.core.util.AtsCoreFactory;
 import org.eclipse.osee.ats.core.util.AtsSequenceProvider;
+import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionAdminImpl;
 import org.eclipse.osee.ats.impl.IAtsServer;
 import org.eclipse.osee.ats.impl.action.IAtsActionFactory;
@@ -61,6 +62,7 @@ import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.eclipse.osee.logger.Log;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
+import org.eclipse.osee.orcs.search.QueryBuilder;
 
 /**
  * @author Donald G Dunne
@@ -305,6 +307,11 @@ public class AtsServerImpl implements IAtsServer {
    }
 
    @Override
+   public QueryBuilder getQuery() {
+      return getOrcsApi().getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch());
+   }
+   
+   @Override
    public String getConfigValue(String key) {
       String result = null;
       @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/util/AtsUtilServer.java b/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/util/AtsUtilServer.java
deleted file mode 100644
index 3ff3305906c..00000000000
--- a/plugins/org.eclipse.osee.ats.impl/src/org/eclipse/osee/ats/impl/util/AtsUtilServer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.ats.impl.util;
-
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.search.QueryBuilder;
-
-/**
- * @author Donald G. Dunne
- */
-public class AtsUtilServer {
-
-   public static QueryBuilder getQuery(OrcsApi orcsApi) {
-      return orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch());
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
index db6bc1063de..fa8900c87ac 100644
--- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -35,7 +35,6 @@ Import-Package: com.google.gson;version="2.1.0",
  org.eclipse.osee.ats.impl,
  org.eclipse.osee.ats.impl.action,
  org.eclipse.osee.ats.impl.resource,
- org.eclipse.osee.ats.impl.util,
  org.eclipse.osee.framework.core.data,
  org.eclipse.osee.framework.core.enums,
  org.eclipse.osee.framework.core.exception,
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
index fbf78e9edb5..6eab81c6d72 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java
@@ -70,13 +70,13 @@ public class AtsApplication extends Application {
       singletons.add(new BuildTraceReportResource(logger, registry, orcsApi));
       singletons.add(new ActionResource(atsServer, orcsApi, registry));
       singletons.add(new ConvertResource(atsServer, registry));
-      singletons.add(new TeamResource(orcsApi));
-      singletons.add(new VersionResource(orcsApi));
+      singletons.add(new TeamResource(atsServer));
+      singletons.add(new VersionResource(atsServer));
       singletons.add(new ConfigResource(atsServer, orcsApi, logger, registry));
       singletons.add(new CpaResource(orcsApi, atsServer, cpaRegistry));
       singletons.add(new UserResource(atsServer.getUserService()));
 
-      singletons.add(new AtsUiResource(registry, orcsApi));
+      singletons.add(new AtsUiResource(registry, atsServer));
       System.out.println("ATS - Application started - " + System.getProperty("OseeApplicationServer"));
    }
 
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java
index 15401af6d8e..6a46af7daa3 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/cpa/CpaResource.java
@@ -47,7 +47,6 @@ import org.eclipse.osee.ats.core.workflow.state.TeamState;
 import org.eclipse.osee.ats.core.workflow.transition.TransitionFactory;
 import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper;
 import org.eclipse.osee.ats.impl.IAtsServer;
-import org.eclipse.osee.ats.impl.util.AtsUtilServer;
 import org.eclipse.osee.framework.core.enums.Operator;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
@@ -56,7 +55,6 @@ import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.jdk.core.util.DateUtil;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.jaxrs.OseeWebApplicationException;
-import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.search.QueryBuilder;
 
@@ -102,8 +100,8 @@ public final class CpaResource {
    public List<IAtsCpaDecision> getDecisionByProgram(@PathParam("uuid") String uuid, @QueryParam("open") Boolean open) throws Exception {
       List<IAtsCpaDecision> decisions = new ArrayList<IAtsCpaDecision>();
       QueryBuilder queryBuilder =
-         AtsUtilServer.getQuery(orcsApi).andTypeEquals(AtsArtifactTypes.TeamWorkflow).and(
-            AtsAttributeTypes.ProgramUuid, Operator.EQUAL, uuid);
+         atsServer.getQuery().andTypeEquals(AtsArtifactTypes.TeamWorkflow).and(AtsAttributeTypes.ProgramUuid,
+            Operator.EQUAL, uuid);
       if (open != null) {
          queryBuilder.and(AtsAttributeTypes.CurrentStateType, Operator.EQUAL,
             (open ? StateType.Working.name() : StateType.Completed.name()));
@@ -183,7 +181,7 @@ public final class CpaResource {
    @Path("decision")
    public Response putDecision(final DecisionUpdate update) throws Exception {
       ResultSet<ArtifactReadable> results =
-         AtsUtilServer.getQuery(orcsApi).and(AtsAttributeTypes.AtsId, Operator.EQUAL, update.getUuids()).getResults();
+         atsServer.getQuery().and(AtsAttributeTypes.AtsId, Operator.EQUAL, update.getUuids()).getResults();
       IAtsChangeSet changes =
          atsServer.getStoreFactory().createAtsChangeSet("Update CPA Decision", AtsCoreUsers.SYSTEM_USER);
       for (ArtifactReadable art : results) {
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/ActionResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/ActionResource.java
index 6c75d7fb35f..434aeb16e83 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/ActionResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/ActionResource.java
@@ -141,8 +141,7 @@ public final class ActionResource {
          List<IAtsActionableItem> aias = new ArrayList<IAtsActionableItem>();
 
          ArtifactReadable aiArt =
-            orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andTypeEquals(
-               AtsArtifactTypes.ActionableItem).andNameEquals(actionableItemName).getResults().getExactlyOne();
+            atsServer.getQuery().andTypeEquals(AtsArtifactTypes.ActionableItem).andNameEquals(actionableItemName).getResults().getExactlyOne();
          IAtsActionableItem aia = (IAtsActionableItem) atsServer.getConfig().getSoleByGuid(aiArt.getGuid());
          aias.add(aia);
 
@@ -179,8 +178,7 @@ public final class ActionResource {
       if (!Strings.isValid(results)) {
          for (IAttributeType attrType : Arrays.asList(AtsAttributeTypes.AtsId, AtsAttributeTypes.LegacyPcrId)) {
             ResultSet<ArtifactReadable> legacyQueryResults =
-               orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).and(attrType,
-                  org.eclipse.osee.framework.core.enums.Operator.EQUAL, searchId).getResults();
+               atsServer.getQuery().and(attrType, org.eclipse.osee.framework.core.enums.Operator.EQUAL, searchId).getResults();
             if (legacyQueryResults.size() == 1) {
                results =
                   atsServer.getWorkItemPage().getHtml(legacyQueryResults.getExactlyOne(), "Action - " + searchId,
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/AtsUiResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/AtsUiResource.java
index 930add091fc..1d304ae6aa6 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/AtsUiResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/AtsUiResource.java
@@ -19,13 +19,12 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.impl.IAtsServer;
 import org.eclipse.osee.ats.impl.resource.AtsResourceTokens;
 import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry;
 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.AHTML;
-import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.template.engine.AppendableRule;
 import org.eclipse.osee.template.engine.IdentifiableOptionsRule;
@@ -39,11 +38,11 @@ import org.eclipse.osee.template.engine.PageFactory;
 public final class AtsUiResource {
 
    private final IResourceRegistry registry;
-   private final OrcsApi orcsApi;
+   private final IAtsServer atsServer;
 
-   public AtsUiResource(IResourceRegistry registry, OrcsApi orcsApi) {
+   public AtsUiResource(IResourceRegistry registry, IAtsServer atsServer) {
       this.registry = registry;
-      this.orcsApi = orcsApi;
+      this.atsServer = atsServer;
    }
 
    /**
@@ -83,8 +82,7 @@ public final class AtsUiResource {
    };
 
    private ResultSet<ArtifactReadable> getAis() throws OseeCoreException {
-      return orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andIsOfType(
-         AtsArtifactTypes.ActionableItem).getResults();
+      return atsServer.getQuery().andIsOfType(AtsArtifactTypes.ActionableItem).getResults();
    }
 
    /**
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/TeamResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/TeamResource.java
index 4d246ffa570..142891f51f3 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/TeamResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/TeamResource.java
@@ -17,9 +17,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.impl.IAtsServer;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.utility.RestUtil;
 import org.json.JSONArray;
@@ -31,18 +30,17 @@ import org.json.JSONObject;
 @Path("team")
 public final class TeamResource {
 
-   private final OrcsApi orcsApi;
+   private final IAtsServer atsServer;
 
-   public TeamResource(OrcsApi orcsApi) {
-      this.orcsApi = orcsApi;
+   public TeamResource(IAtsServer atsServer) {
+      this.atsServer = atsServer;
    }
 
    @GET
    @Produces(MediaType.APPLICATION_JSON)
    public String get() throws Exception {
       ResultSet<ArtifactReadable> artifacts =
-         orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andTypeEquals(
-            AtsArtifactTypes.TeamDefinition).getResults();
+         atsServer.getQuery().andTypeEquals(AtsArtifactTypes.TeamDefinition).getResults();
       JSONArray jsonArray = RestUtil.getDefaultJSonArray(artifacts);
       return RestUtil.jsonToPretty(jsonArray, true);
    }
@@ -51,8 +49,7 @@ public final class TeamResource {
    @Path("{uuid}")
    @Produces(MediaType.APPLICATION_JSON)
    public String getTeam(@PathParam("uuid") int uuid) throws Exception {
-      ArtifactReadable teamArt =
-         orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andLocalId(Integer.valueOf(uuid)).getResults().getExactlyOne();
+      ArtifactReadable teamArt = atsServer.getQuery().andLocalId(Integer.valueOf(uuid)).getResults().getExactlyOne();
       JSONObject team = RestUtil.getDefaultJSon(teamArt);
       team.put("versions",
          RestUtil.getDefaultJSonArray(teamArt.getRelated(AtsRelationTypes.TeamDefinitionToVersion_Version)));
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/VersionResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/VersionResource.java
index 705ee620b85..6cab47a090c 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/VersionResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/resources/VersionResource.java
@@ -17,9 +17,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
+import org.eclipse.osee.ats.impl.IAtsServer;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.utility.RestUtil;
 import org.json.JSONArray;
@@ -31,17 +30,16 @@ import org.json.JSONObject;
 @Path("version")
 public final class VersionResource {
 
-   private final OrcsApi orcsApi;
+   private final IAtsServer atsServer;
 
-   public VersionResource(OrcsApi orcsApi) {
-      this.orcsApi = orcsApi;
+   public VersionResource(IAtsServer atsServer) {
+      this.atsServer = atsServer;
    }
 
    @GET
    @Produces(MediaType.APPLICATION_JSON)
    public String get() throws Exception {
-      ResultSet<ArtifactReadable> artifacts =
-         orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andTypeEquals(AtsArtifactTypes.Version).getResults();
+      ResultSet<ArtifactReadable> artifacts = atsServer.getQuery().andTypeEquals(AtsArtifactTypes.Version).getResults();
       JSONArray jsonArray = RestUtil.getDefaultJSonArray(artifacts);
       return RestUtil.jsonToPretty(jsonArray, true);
    }
@@ -50,8 +48,7 @@ public final class VersionResource {
    @Path("{uuid}")
    @Produces(MediaType.APPLICATION_JSON)
    public String getVersion(@PathParam("uuid") int uuid) throws Exception {
-      ArtifactReadable verArt =
-         orcsApi.getQueryFactory(null).fromBranch(AtsUtilCore.getAtsBranch()).andLocalId(Integer.valueOf(uuid)).getResults().getExactlyOne();
+      ArtifactReadable verArt = atsServer.getQuery().andLocalId(Integer.valueOf(uuid)).getResults().getExactlyOne();
       JSONObject version = RestUtil.getDefaultJSon(verArt);
       version.put("workflows",
          RestUtil.getDefaultJSonArray(verArt.getRelated(AtsRelationTypes.TeamWorkflowTargetedForVersion_Workflow)));