Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2021-01-11 22:33:05 +0000
committerRyan D. Brooks2021-01-16 05:56:15 +0000
commit851e7477b4ccb4e982a9913346317a6d73a6eacb (patch)
tree8a18b998c6bee29e6464e7678b240fe385e11d64
parentcef369513fe1bb1249de97c3fa7b4c9d01f8b6f3 (diff)
downloadorg.eclipse.osee-851e7477b4ccb4e982a9913346317a6d73a6eacb.tar.gz
org.eclipse.osee-851e7477b4ccb4e982a9913346317a6d73a6eacb.tar.xz
org.eclipse.osee-851e7477b4ccb4e982a9913346317a6d73a6eacb.zip
refactor[TW18593]: Remove OseeClient dependency from ClientCachingService
-rw-r--r--plugins/org.eclipse.osee.ats.ide.integration.tests/AtsIde_Integration_TestSuite.launch3
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java17
4 files changed, 1 insertions, 23 deletions
diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/AtsIde_Integration_TestSuite.launch b/plugins/org.eclipse.osee.ats.ide.integration.tests/AtsIde_Integration_TestSuite.launch
index de5448b2e97..3b47baf2d1b 100644
--- a/plugins/org.eclipse.osee.ats.ide.integration.tests/AtsIde_Integration_TestSuite.launch
+++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/AtsIde_Integration_TestSuite.launch
@@ -5,7 +5,6 @@
<setEntry value="org.eclipse.osee.client.integration.tests:0.26.0.qualifier:default:true"/>
<setEntry value="org.eclipse.osee.client.test.framework:0.26.0.qualifier:default:true"/>
<setEntry value="org.hamcrest.core:1.3.0.v20180420-1519:default:true"/>
-<setEntry value="rest.assured:3.0.2.qualifier:default:true"/>
</setAttribute>
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="false"/>
@@ -35,7 +34,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.ats.ide.integration.AtsIdeIntegrationTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.ats.ide.integration.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-Dosee.log.default=WARNING&#13;&#10;-Dequinox.ds.debug=true &#13;&#10;-Dosee.application.server=http://localhost:8089&#13;&#10;-DeventDebug=log&#13;&#10;-DeventSystem=new&#13;&#10;-Dosee.is.in.db.init=true&#13;&#10;-Dlogback.configurationFile=${project_loc:org.eclipse.osee.server.p2}\logback-dev.xml&#13;&#10;-Duser.name=3333"/>
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
index 6ada5a61dcc..7699683fba0 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeCachingService.java
@@ -13,7 +13,6 @@
package org.eclipse.osee.framework.core.services;
-import java.util.Collection;
import org.eclipse.osee.framework.core.OrcsTokenService;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
@@ -24,8 +23,6 @@ public interface IOseeCachingService {
BranchCache getBranchCache();
- Collection<?> getCaches();
-
void clearAll();
OrcsTokenService getTokenService();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml b/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
index 039fe0338f7..39e956a32f3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core/OSGI-INF/osee.client.caching.service.xml
@@ -5,6 +5,5 @@
<provide interface="org.eclipse.osee.framework.core.services.IOseeCachingService"/>
</service>
<reference bind="setJdbcService" cardinality="1..1" interface="org.eclipse.osee.jdbc.JdbcService" name="JdbcService" policy="static"/>
- <reference bind="setOseeClient" cardinality="1..1" interface="org.eclipse.osee.orcs.rest.client.OseeClient" name="OseeClient" policy="static"/>
<reference bind="setOrcsTokenService" cardinality="1..1" interface="org.eclipse.osee.framework.core.OrcsTokenService" name="OrcsTokenService" policy="static"/>
</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
index 4ca43c96c7e..b3c6a654085 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/ClientCachingServiceProxy.java
@@ -13,9 +13,7 @@
package org.eclipse.osee.framework.skynet.core.internal;
-import com.google.common.io.ByteSource;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.OrcsTokenService;
import org.eclipse.osee.framework.core.model.cache.BranchCache;
@@ -24,19 +22,13 @@ import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.skynet.core.internal.accessors.DatabaseBranchAccessor;
import org.eclipse.osee.jdbc.JdbcClient;
import org.eclipse.osee.jdbc.JdbcService;
-import org.eclipse.osee.orcs.rest.client.OseeClient;
/**
* @author Roberto E. Escobar
*/
public class ClientCachingServiceProxy implements IOseeCachingService {
- public static interface TypesLoader {
- void loadTypes(IOseeCachingService service, ByteSource supplier);
- }
-
private JdbcService jdbcService;
- private OseeClient oseeClient;
private OrcsTokenService tokenService;
private BranchCache branchCache;
@@ -46,10 +38,6 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
this.jdbcService = jdbcService;
}
- public void setOseeClient(OseeClient oseeClient) {
- this.oseeClient = oseeClient;
- }
-
public void setOrcsTokenService(OrcsTokenService tokenService) {
this.tokenService = tokenService;
}
@@ -72,11 +60,6 @@ public class ClientCachingServiceProxy implements IOseeCachingService {
}
@Override
- public Collection<?> getCaches() {
- return caches;
- }
-
- @Override
public OrcsTokenService getTokenService() {
return tokenService;
}

Back to the top