Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2021-01-14 18:33:17 +0000
committerRyan D. Brooks2021-01-16 05:53:29 +0000
commitcef369513fe1bb1249de97c3fa7b4c9d01f8b6f3 (patch)
tree92f3c97b37f01acb38e95db0dccb9ee8f4d5b262
parentbf2120665b7b037f00d1700ae44c04334678bb78 (diff)
downloadorg.eclipse.osee-cef369513fe1bb1249de97c3fa7b4c9d01f8b6f3.tar.gz
org.eclipse.osee-cef369513fe1bb1249de97c3fa7b4c9d01f8b6f3.tar.xz
org.eclipse.osee-cef369513fe1bb1249de97c3fa7b4c9d01f8b6f3.zip
refactor[TW18593]: Remove unnecessary dependencies on jaxrs.client
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/AtsApiService.java24
-rw-r--r--plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionUtility.java17
-rw-r--r--plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF1
9 files changed, 4 insertions, 46 deletions
diff --git a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
index 06b70c27d11..7935db1acb4 100644
--- a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Import-Package: com.fasterxml.jackson.databind,
com.fasterxml.jackson.core,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.jaxrs.client
+ org.eclipse.osee.framework.jdk.core.util
diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
index 1ad8b2a68f4..e63dcd729a9 100644
--- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF
@@ -32,7 +32,6 @@ Import-Package: com.fasterxml.jackson.annotation,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.xml,
org.eclipse.osee.framework.logging,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.jdbc,
org.eclipse.osee.logger,
org.eclipse.osee.orcs.data,
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/AtsApiService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/AtsApiService.java
index 1fb785948d2..72e16ffe2b9 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/AtsApiService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/AtsApiService.java
@@ -14,18 +14,13 @@
package org.eclipse.osee.ats.core.internal;
import org.eclipse.osee.ats.api.AtsApi;
-import org.eclipse.osee.ats.api.config.AtsConfigEndpointApi;
-import org.eclipse.osee.jaxrs.client.JaxRsClient;
-import org.eclipse.osee.jaxrs.client.JaxRsWebTarget;
/**
* @author Donald G. Dunne
*/
public class AtsApiService {
- private static JaxRsWebTarget target;
private static AtsApi atsApi;
- private static AtsConfigEndpointApi configEp;
public void setAtsApi(AtsApi atsApi) {
AtsApiService.atsApi = atsApi;
@@ -34,23 +29,4 @@ public class AtsApiService {
public static AtsApi get() {
return atsApi;
}
-
- private static JaxRsWebTarget getAtsTarget() {
- if (target == null) {
- String appServer = atsApi.getApplicationServerBase();
- String atsUri = String.format("%s/ats", appServer);
- JaxRsClient jaxRsClient = JaxRsClient.newBuilder().createThreadSafeProxyClients(true).build();
- // target = jaxRsClient.target(atsUri).register(WorkItemJsonReader.class);
- target = jaxRsClient.target(atsUri);
- }
- return target;
- }
-
- public static AtsConfigEndpointApi getConfigEndpoint() {
- if (configEp == null) {
- configEp = getAtsTarget().newProxy(AtsConfigEndpointApi.class);
- }
- return configEp;
- }
-
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF
index 515ab96d270..8cfd6b1cc36 100644
--- a/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.ide.demo/META-INF/MANIFEST.MF
@@ -75,7 +75,6 @@ Import-Package: javax.ws.rs.core,
org.eclipse.osee.framework.ui.skynet.util,
org.eclipse.osee.framework.ui.skynet.widgets.util,
org.eclipse.osee.framework.ui.swt,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.jdbc,
org.eclipse.osee.orcs.rest.client,
org.eclipse.osee.orcs.rest.model,
diff --git a/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF
index 7d9064d827b..1c9896c55b9 100644
--- a/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.ide/META-INF/MANIFEST.MF
@@ -249,7 +249,6 @@ Import-Package: com.fasterxml.jackson.annotation,
org.eclipse.osee.framework.ui.swt,
org.eclipse.osee.framework.ui.ws,
org.eclipse.osee.jaxrs,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.jdbc,
org.eclipse.osee.logger,
org.eclipse.osee.orcs.data,
diff --git a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
index b94d21e7fb3..1e05713a135 100644
--- a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.plugin.core.util,
org.eclipse.osee.framework.server.ide.api,
org.eclipse.osee.framework.server.ide.api.client,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.jdbc,
org.eclipse.osee.orcs.rest.client,
org.eclipse.osee.orcs.rest.model,
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
index 1663fc80840..ca3292d76ca 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/META-INF/MANIFEST.MF
@@ -33,7 +33,6 @@ Import-Package: javax.ws.rs.core,
org.eclipse.osee.framework.core.operation,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.logging,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.orcs.rest.client,
org.junit,
org.junit.rules,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionUtility.java
index f3ff1239d23..35731b196c9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionUtility.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/DbConnectionUtility.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.server.ide.api.client.ClientEndpoint;
import org.eclipse.osee.framework.server.ide.api.model.IdeVersion;
import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
-import org.eclipse.osee.jaxrs.client.JaxRsClient;
+import org.eclipse.osee.framework.ui.skynet.internal.ServiceUtil;
/**
* @author Donald G Dunne
@@ -113,21 +113,10 @@ public class DbConnectionUtility {
private static Collection<String> getIdeClientSupportedVersions() {
IdeVersion clientResult = null;
- ClientEndpoint client = getClientEndpoint();
+ ClientEndpoint client = ServiceUtil.getOseeClient().getClientEndpoint();
if (client != null) {
clientResult = client.getSupportedVersions();
}
return clientResult != null ? clientResult.getVersions() : Collections.<String> emptySet();
}
-
- private static ClientEndpoint getClientEndpoint() {
- if (clientEp == null) {
- String appServer = OseeClientProperties.getOseeApplicationServer();
- String orcsUri = String.format("%s/ide", appServer);
- JaxRsClient jaxRsClient = JaxRsClient.newBuilder().build();
- clientEp = jaxRsClient.target(orcsUri).newProxy(ClientEndpoint.class);
- }
- return clientEp;
- }
-
-}
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF
index 2c364f35afe..e6f6a1fb8f0 100644
--- a/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.jdbc/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Import-Package: com.fasterxml.jackson.core,
org.eclipse.osee.framework.jdk.core.util.time,
org.eclipse.osee.framework.jdk.core.util.xml,
org.eclipse.osee.framework.logging,
- org.eclipse.osee.jaxrs.client,
org.eclipse.osee.logger,
org.hsqldb;resolution:=optional,
org.hsqldb.jdbc;resolution:=optional,

Back to the top