From c22a27a19e57504dbfb18072f63a1cee019cff97 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 14 Jan 2019 19:03:53 +0000
Subject: [PATCH] Added getOperatorById with refresh option

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/data-miner-manager-cl@176540 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                           |  6 +++---
 distro/changelog.xml                                 |  4 ++++
 pom.xml                                              |  2 +-
 .../dataminermanagercl/server/dmservice/SClient.java | 12 ++++++++++++
 .../server/dmservice/SClient4WPS.java                |  8 +++++++-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.classpath b/.classpath
index e87016c..eb4a3d2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/data-miner-manager-cl-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/data-miner-manager-cl-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/data-miner-manager-cl-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/data-miner-manager-cl-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -33,5 +33,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/data-miner-manager-cl-1.5.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/data-miner-manager-cl-1.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 7749855..816faa6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-6-0"
+		date="2019-01-31">
+		<Change>Updated to support get operator by id with refresh</Change>
+	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-5-0"
 		date="2018-10-01">
 		<Change>Updated to support StorageHub[ticket #11720]</Change>
diff --git a/pom.xml b/pom.xml
index b3f44ba..0265010 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.data.analysis</groupId>
 	<artifactId>data-miner-manager-cl</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 
 	<name>data-miner-manager-cl</name>
 	<description>DataMiner Manager Client Library</description>
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient.java
index c4ea41c..a446e77 100644
--- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient.java
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient.java
@@ -59,6 +59,18 @@ public abstract class SClient implements Serializable {
 	 */
 	public abstract Operator getOperatorById(String id) throws Exception;
 
+	/**
+	 * 
+	 * @param id
+	 *            operator id
+	 * @param refresh
+	 *            if true refresh the operators in cache
+	 * @return operator
+	 * @throws Exception
+	 *             exception
+	 */
+	public abstract Operator getOperatorById(String id, boolean refresh) throws Exception;
+
 	/**
 	 * Get input paramters of the operator
 	 * 
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient4WPS.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient4WPS.java
index 5cb91c0..cd63d43 100644
--- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient4WPS.java
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient4WPS.java
@@ -224,15 +224,21 @@ public class SClient4WPS extends SClient {
 		}
 	}
 
+
 	@Override
 	public Operator getOperatorById(String id) throws Exception {
+		return getOperatorById(id, false);
+	}
+	
+	@Override
+	public Operator getOperatorById(String id, boolean refresh) throws Exception {
 		if (id == null || id.isEmpty()) {
 			String error = "Invalid operator request, id=" + id;
 			logger.error(error);
 			throw new ServiceException(error);
 		}
 
-		List<OperatorsClassification> operatorsClassifications = getOperatorsClassifications();
+		List<OperatorsClassification> operatorsClassifications = getOperatorsClassifications(refresh);
 
 		if (operatorsClassifications != null && operatorsClassifications.size() > 0) {
 			Operator operator = null;