Fixed dependency

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor-client@122138 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-01-07 16:16:53 +00:00
parent 5a9ae793ee
commit 7f791a30cf
2 changed files with 36 additions and 39 deletions

View File

@ -36,7 +36,7 @@
<dependency>
<groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor-api</artifactId>
<version>[1.1.0-SNAPSHOT, 1.3.0-SNAPSHOT)</version>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>

View File

@ -63,7 +63,7 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
Call<SmartExecutor, Boolean> call = new Call<SmartExecutor, Boolean>() {
@Override
public Boolean call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling launch() function");
logger.debug("Calling unSchedule(String) function");
return endpoint.unSchedule(executionIdentifier);
}
};
@ -71,12 +71,32 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call launch() function");
logger.debug("Failed to call unSchedule(String) function");
throw again(e).asServiceException();
}
}
/** {@inheritDoc} */
@Override
public boolean unSchedule(final String executionIdentifier, final boolean globally) throws ExecutorException {
Call<SmartExecutor, Boolean> call = new Call<SmartExecutor, Boolean>() {
@Override
public Boolean call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling unSchedule(String,boolean) function");
return endpoint.unSchedule(executionIdentifier, globally);
}
};
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call unSchedule(String,boolean) function");
throw again(e).asServiceException();
}
}
/** {@inheritDoc} */
@Override
public PluginState getState(final String executionIdentifier)
@ -85,7 +105,7 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
Call<SmartExecutor, PluginState> call = new Call<SmartExecutor, PluginState>() {
@Override
public PluginState call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling getState() function");
logger.debug("Calling getState(String) function");
return endpoint.getState(executionIdentifier);
}
};
@ -93,13 +113,12 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call getState() function");
logger.debug("Failed to call getState(String) function");
throw again(e).asServiceException();
}
}
/** {@inheritDoc} */
@Override
public PluginState getIterationState(final String executionIdentifier, final int iterationNumber)
@ -108,7 +127,7 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
Call<SmartExecutor, PluginState> call = new Call<SmartExecutor, PluginState>() {
@Override
public PluginState call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling getState() function");
logger.debug("Calling getIterationState(String, int) function");
return endpoint.getIterationState(executionIdentifier, iterationNumber);
}
};
@ -116,53 +135,31 @@ public class DefaultSmartExecutorProxy implements SmartExecutorProxy {
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call getState() function");
logger.debug("Failed to call getIterationState(String, int) function");
throw again(e).asServiceException();
}
}
/* * {@inheritDoc} * /
@Override
public PluginState getState(final PluginDeclaration pluginDeclaration, final String executionIdentifier)
throws PluginInstanceNotFoundException, ExecutorException {
public boolean stop(final String executionIdentifier) throws ExecutorException {
Call<SmartExecutor, PluginState> call = new Call<SmartExecutor, PluginState>() {
Call<SmartExecutor, Boolean> call = new Call<SmartExecutor, Boolean>() {
@Override
public PluginState call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling getState() function");
return endpoint.getState(pluginDeclaration, executionIdentifier);
public Boolean call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling stop(String) function");
return endpoint.stop(executionIdentifier);
}
};
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call getState() function");
logger.debug("Failed to call stop(String) function");
throw again(e).asServiceException();
}
}
/** {@inheritDoc} * /
@Override
public PluginState getIterationState(final PluginDeclaration pluginDeclaration, final String executionIdentifier, final int iterationNumber)
throws PluginInstanceNotFoundException, ExecutorException {
Call<SmartExecutor, PluginState> call = new Call<SmartExecutor, PluginState>() {
@Override
public PluginState call(SmartExecutor endpoint) throws Exception {
logger.debug("Calling getState() function");
return endpoint.getIterationState(pluginDeclaration, executionIdentifier, iterationNumber);
}
};
try {
return proxyDelegate.make(call);
} catch (Exception e) {
logger.debug("Failed to call getState() function");
throw again(e).asServiceException();
}
}
*/
}