gCubeSystem
/
smart-executor-client
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaning client 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor-client@111905 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-02-11 15:17:45 +00:00
parent 2522ca59c2
commit 17d4d47ac3
5 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/gcube/vremanagement/executor/client/Constants.java
View File

@ -1,7 +1,5 @@
package org.gcube.vremanagement.executor.client;
import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;
import org.gcube.common.calls.jaxws.GcubeService;
@ -10,16 +8,10 @@ import org.gcube.vremanagement.executor.api.Executor;
public class Constants {
/* Must be the same of generated WEB-INF/gcube-app.xml */
public static final String SERVICE_CLASS = "VREManagement";
public static final String SERVICE_NAME = "smart-executor";
public static final String GCUBE_SERVICE_CLASS = "VREManagement";
public static final String GCUBE_SERVICE_NAME = "smart-executor";
public static final String NAMESPACE = "http://gcube-system.org/namespaces/vremanagement/smart-executor";
public static final String SERVICE_NAMESPACE = "http://gcube-system.org/namespaces/data/speciesproductsdiscovery/service";
public static final int DEFAULT_TIMEOUT= (int) TimeUnit.SECONDS.toMillis(10);
public static final QName EXECUTOR_QNAME = new QName(Executor.TNS, Executor.SERVICE_NAME);
public static final QName EXECUTOR_QNAME = new QName(Executor.TARGET_NAMESPACE, Executor.URL_PATTERN);
public static final GcubeService<Executor> executor = GcubeService.service().withName(EXECUTOR_QNAME).andInterface(Executor.class);

7
src/main/java/org/gcube/vremanagement/executor/client/plugins/AbstractPlugin.java
View File

@ -1,6 +1,7 @@
package org.gcube.vremanagement.executor.client.plugins;
import org.gcube.common.clients.Plugin;
import org.gcube.vremanagement.executor.api.Executor;
import org.gcube.vremanagement.executor.client.Constants;
/**
@ -19,17 +20,17 @@ public abstract class AbstractPlugin<S,P> implements Plugin<S,P> {
@Override
public String serviceClass() {
return Constants.SERVICE_CLASS;
return Constants.GCUBE_SERVICE_CLASS;
}
@Override
public String serviceName() {
return Constants.SERVICE_NAME;
return Constants.GCUBE_SERVICE_NAME;
}
@Override
public String namespace() {
return Constants.NAMESPACE;
return Executor.TARGET_NAMESPACE;
}
@Override

2
src/main/java/org/gcube/vremanagement/executor/client/plugins/ExecutorPlugin.java
View File

@ -28,7 +28,7 @@ public class ExecutorPlugin extends AbstractPlugin<Executor, ExecutorProxy> {
}
public ExecutorPlugin(){
super(Executor.SERVICE_NAME);
super(Executor.URL_PATTERN);
}
@Override

11
src/main/java/org/gcube/vremanagement/executor/client/proxies/ExecutorProxy.java
View File

@ -3,9 +3,6 @@
*/
package org.gcube.vremanagement.executor.client.proxies;
import javax.xml.namespace.QName;
import org.gcube.common.calls.jaxws.GcubeService;
import org.gcube.vremanagement.executor.api.Executor;
/**
@ -14,12 +11,4 @@ import org.gcube.vremanagement.executor.api.Executor;
*/
public interface ExecutorProxy extends Executor {
/* Must be the same of generated WEB-INF/gcube-app.xml */
public static final String SERVICE_CLASS = "VREManagement";
public static final String SERVICE_NAME = "smart-executor";
public static final String NAMESPACE = "http://gcube-system.org/namespaces/common/vremanagement/smart-executor";
public static final QName EXECUTOR_QNAME = new QName(Executor.TNS, Executor.SERVICE_NAME);
public static final GcubeService<Executor> executor = GcubeService.service().withName(EXECUTOR_QNAME).andInterface(Executor.class);
}

6
src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java
View File

@ -40,8 +40,7 @@ public class DefaultExecutorTest {
try {
proxy.launch(launchParameter);
} catch (Exception e) {
e.printStackTrace();
Assert.assertEquals(PluginNotFoundException.class, e.getClass());
Assert.assertEquals(PluginNotFoundException.class, e.getCause().getClass());
}
}
@ -52,8 +51,7 @@ public class DefaultExecutorTest {
try {
proxy.getState(executionIdentifier);
} catch (Exception e) {
e.printStackTrace();
Assert.assertEquals(PluginInstanceNotFoundException.class, e.getClass());
Assert.assertEquals(PluginInstanceNotFoundException.class, e.getCause().getClass());
}
}