Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-06-10 14:27:50 -0400
committerRoberto E. Escobar2014-08-28 19:58:34 -0400
commit56ed1da4a2ae6d59e163e7b4ae1fd05df0ec5775 (patch)
tree3d3647cdbd778e3689d081a429a06691b77eea95 /plugins/org.eclipse.osee.x.server.integration.tests
parent21a3c5b7427ef9991dc88c1e8b498bc8d59f84e7 (diff)
downloadorg.eclipse.osee-56ed1da4a2ae6d59e163e7b4ae1fd05df0ec5775.tar.gz
org.eclipse.osee-56ed1da4a2ae6d59e163e7b4ae1fd05df0ec5775.tar.xz
org.eclipse.osee-56ed1da4a2ae6d59e163e7b4ae1fd05df0ec5775.zip
bug[ats_ATS64246]: Fix JAX-RS Client server address config
Use OSGI style properties to configure JAX-RS clients Setup JAX-RS Client as a static factory library instead of OSGI service. Change-Id: Icd6798214da9264670a46f134638bd0b41963fb8
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java
index 41f2b0102c..13ee1d854e 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/IntegrationUtil.java
@@ -10,13 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.x.server.integration.tests.performance;
+import java.util.HashMap;
+import java.util.Map;
import org.databene.contiperf.junit.ContiPerfRule;
import org.databene.contiperf.report.CSVLatencyReportModule;
import org.databene.contiperf.report.CSVSummaryReportModule;
import org.databene.contiperf.report.HtmlReportModule;
import org.eclipse.osee.account.rest.client.AccountClient;
import org.eclipse.osee.account.rest.client.AccountClientStandaloneSetup;
-import org.eclipse.osee.jaxrs.client.OseeClientConfig;
+import org.eclipse.osee.jaxrs.client.JaxRsClientConstants;
import org.eclipse.osee.orcs.rest.client.OseeClient;
import org.eclipse.osee.orcs.rest.client.OseeClientStandaloneSetup;
import org.junit.rules.MethodRule;
@@ -35,18 +37,19 @@ public final class IntegrationUtil {
}
public static OseeClient createClient() {
- OseeClientConfig config = createClientConfig();
+ Map<String, Object> config = createClientConfig();
return OseeClientStandaloneSetup.createClient(config);
}
- private static OseeClientConfig createClientConfig() {
+ private static Map<String, Object> createClientConfig() {
+ Map<String, Object> config = new HashMap<String, Object>();
String serverAddress = System.getProperty(OSEE_APPLICATION_SERVER, DEFAULT_OSEE_APPLICATION_SERVER);
- OseeClientConfig config = new OseeClientConfig(serverAddress);
+ config.put(JaxRsClientConstants.JAXRS_CLIENT_SERVER_ADDRESS, serverAddress);
return config;
}
public static AccountClient createAccountClient() {
- OseeClientConfig config = createClientConfig();
+ Map<String, Object> config = createClientConfig();
return AccountClientStandaloneSetup.createClient(config);
}

Back to the top