From 8bf985b124557c60ad9074971c967a0c849b4f30 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 30 Sep 2020 11:23:37 +0200
Subject: [PATCH] Switched to new APIs which removed the PluginDeclaration
 class

---
 .../executor/client/SmartExecutorClient.java           |  4 ++--
 .../executor/client/SmartExecutorClientImpl.java       |  6 +++---
 .../executor/client/SmartExecutorClientTest.java       | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClient.java b/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClient.java
index a1cb06a..190cca2 100644
--- a/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClient.java
+++ b/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClient.java
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.gcube.vremanagement.executor.api.types.LaunchParameter;
-import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
+import org.gcube.vremanagement.executor.plugin.PluginDefinition;
 import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
 import org.gcube.vremanagement.executor.plugin.ScheduledTask;
 
@@ -15,7 +15,7 @@ public interface SmartExecutorClient {
 	
 	public String getAvailablePlugins();
 	
-	public List<PluginDeclaration> getPlugins() throws IOException;
+	public List<PluginDefinition> getPlugins() throws IOException;
 	
 	public String getLaunches();
 	
diff --git a/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClientImpl.java b/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClientImpl.java
index 7a875e1..7b2e1c3 100644
--- a/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClientImpl.java
+++ b/src/main/java/org/gcube/vremanagement/executor/client/SmartExecutorClientImpl.java
@@ -21,7 +21,7 @@ import org.gcube.vremanagement.executor.api.rest.RestConstants;
 import org.gcube.vremanagement.executor.api.types.LaunchParameter;
 import org.gcube.vremanagement.executor.exception.ExecutorException;
 import org.gcube.vremanagement.executor.json.SEMapper;
-import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
+import org.gcube.vremanagement.executor.plugin.PluginDefinition;
 import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
 import org.gcube.vremanagement.executor.plugin.ScheduledTask;
 import org.slf4j.Logger;
@@ -147,9 +147,9 @@ public class SmartExecutorClientImpl implements SmartExecutorClient {
 	}
 	
 	@Override
-	public List<PluginDeclaration> getPlugins() throws IOException {
+	public List<PluginDefinition> getPlugins() throws IOException {
 		String pluginList = getAvailablePlugins();
-		return SEMapper.getInstance().unmarshalList(PluginDeclaration.class,pluginList);
+		return SEMapper.getInstance().unmarshalList(PluginDefinition.class,pluginList);
 	}
 	
 	private String getScheduledTask(String name) {
diff --git a/src/test/java/org/gcube/vremanagement/executor/client/SmartExecutorClientTest.java b/src/test/java/org/gcube/vremanagement/executor/client/SmartExecutorClientTest.java
index c58a87e..037351d 100644
--- a/src/test/java/org/gcube/vremanagement/executor/client/SmartExecutorClientTest.java
+++ b/src/test/java/org/gcube/vremanagement/executor/client/SmartExecutorClientTest.java
@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit;
 import org.gcube.vremanagement.executor.api.types.LaunchParameter;
 import org.gcube.vremanagement.executor.api.types.Scheduling;
 import org.gcube.vremanagement.executor.client.query.Discover;
-import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
+import org.gcube.vremanagement.executor.plugin.PluginDefinition;
 import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
 import org.gcube.vremanagement.executor.plugin.ScheduledTask;
 import org.gcube.vremanagement.helloworld.HelloWorldPlugin;
@@ -68,9 +68,9 @@ public class SmartExecutorClientTest extends ContextTest {
 		String host = smartExecutorClient.getHost();
 		Assert.assertTrue(host.contains("pc-frosini.isti.cnr.it"));
 		
-		List<PluginDeclaration> plugins = smartExecutorClient.getPlugins();
+		List<PluginDefinition> plugins = smartExecutorClient.getPlugins();
 		Assert.assertTrue(plugins.size() == 1);
-		PluginDeclaration pluginDeclaration = plugins.get(0);
+		PluginDefinition pluginDeclaration = plugins.get(0);
 		
 		Assert.assertTrue(pluginDeclaration.getName().compareTo(helloWorldPluginDeclaration.getName()) == 0);
 		Assert.assertTrue(
@@ -118,8 +118,8 @@ public class SmartExecutorClientTest extends ContextTest {
 			logger.debug("Host {}", SmartExecutorClientImpl.getHostFromCompleteURL(host));
 			SmartExecutorClientImpl client = new SmartExecutorClientImpl();
 			client.setAddress(host);
-			List<PluginDeclaration> plugins = client.getPlugins();
-			for(PluginDeclaration p : plugins) {
+			List<PluginDefinition> plugins = client.getPlugins();
+			for(PluginDefinition p : plugins) {
 				logger.debug("\tPlugin {}", p);
 				client.setPluginName(p.getName());
 				List<ScheduledTask> tasks = client.getScheduledLaunches();