refactor: Extract IdeClientEndpoint API

Change-Id: I1b44c6c9474250b7e81ed94afbe021b7c10db766
Signed-off-by: Angel Avila <angel.avila2@boeing.com>

2 files changed, 8 insertions, 39 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClient.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClient.java
index 76450c43b54..fadb8fb2b45 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClient.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/OseeClient.java
@@ -11,11 +11,11 @@
 package org.eclipse.osee.orcs.rest.client;
 
 import java.io.Writer;
-import java.util.Collection;
 import java.util.Properties;
 import javax.ws.rs.core.MediaType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.orcs.rest.model.BranchEndpoint;
+import org.eclipse.osee.orcs.rest.model.IdeClientEndpoint;
 import org.eclipse.osee.orcs.rest.model.IndexerEndpoint;
 import org.eclipse.osee.orcs.rest.model.TransactionEndpoint;
 import org.eclipse.osee.orcs.rest.model.TypesEndpoint;
@@ -27,14 +27,8 @@ public interface OseeClient {
 
    QueryBuilder createQueryBuilder(IOseeBranch branch);
 
-   boolean isClientVersionSupportedByApplicationServer();
-
-   boolean isApplicationServerAlive();
-
    void executeScript(String script, Properties properties, boolean debug, MediaType media, Writer writer);
 
-   Collection<String> getIdeClientSupportedVersions();
-
    BranchEndpoint getBranchEndpoint();
 
    TransactionEndpoint getTransactionEndpoint();
@@ -43,4 +37,5 @@ public interface OseeClient {
 
    IndexerEndpoint getIndexerEndpoint();
 
+   IdeClientEndpoint getIdeClientEndpoint();
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java
index db9b2f2a273..526b8db4c4d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java
@@ -14,8 +14,6 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -24,7 +22,6 @@ import javax.ws.rs.core.Form;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriBuilder;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.OseeCodeVersion;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Conditions;
 import org.eclipse.osee.jaxrs.client.JaxRsClient;
@@ -38,7 +35,7 @@ import org.eclipse.osee.orcs.rest.client.internal.search.QueryBuilderImpl;
 import org.eclipse.osee.orcs.rest.client.internal.search.QueryExecutor;
 import org.eclipse.osee.orcs.rest.client.internal.search.QueryOptions;
 import org.eclipse.osee.orcs.rest.model.BranchEndpoint;
-import org.eclipse.osee.orcs.rest.model.IdeVersion;
+import org.eclipse.osee.orcs.rest.model.IdeClientEndpoint;
 import org.eclipse.osee.orcs.rest.model.IndexerEndpoint;
 import org.eclipse.osee.orcs.rest.model.TransactionEndpoint;
 import org.eclipse.osee.orcs.rest.model.TypesEndpoint;
@@ -94,34 +91,6 @@ public class OseeClientImpl implements OseeClient, QueryExecutor {
    }
 
    @Override
-   public Collection<String> getIdeClientSupportedVersions() {
-      IdeVersion clientResult = null;
-      try {
-         clientResult = newTarget("ide/versions").request(MediaType.APPLICATION_JSON).get(IdeVersion.class);
-      } catch (Exception ex) {
-         throw JaxRsExceptions.asOseeException(ex);
-      }
-      return clientResult != null ? clientResult.getVersions() : Collections.<String> emptySet();
-   }
-
-   @Override
-   public boolean isClientVersionSupportedByApplicationServer() {
-      return getIdeClientSupportedVersions().contains(OseeCodeVersion.getVersion());
-   }
-
-   @Override
-   public boolean isApplicationServerAlive() {
-      boolean alive = false;
-      try {
-         getIdeClientSupportedVersions();
-         alive = true;
-      } catch (Exception ex) {
-         alive = false;
-      }
-      return alive;
-   }
-
-   @Override
    public int getCount(IOseeBranch branch, List<Predicate> predicates, QueryOptions options) throws OseeCoreException {
       SearchResponse result = performSearch(RequestType.COUNT, branch, predicates, options);
       return result.getTotal();
@@ -197,4 +166,9 @@ public class OseeClientImpl implements OseeClient, QueryExecutor {
    public IndexerEndpoint getIndexerEndpoint() {
       return client.targetProxy(baseUri, IndexerEndpoint.class);
    }
+
+   @Override
+   public IdeClientEndpoint getIdeClientEndpoint() {
+      return client.targetProxy(baseUri, IdeClientEndpoint.class);
+   }
 }