Fixed code

CHANGELOG.md

@@ -2,6 +2,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Smart Executor Service
 
+## [v3.2.0-SNAPSHOT]
+
+- Fixed RequestFilter to avoid to remove info to Smartgears
+- Migrated code to reorganized E/R format [#24992]
+- Force guava version to 23.6-jre to meet requirements of new plugins
+
+
 ## [v3.1.0]
 
 - Ported service to authorization-utils [#22871]
@@ -13,6 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Redesigned HTTP APIs to comply with RESTful architectural style [#12997]
 - Added API to retrieve scheduled tasks [#10780]
 
+
 ## [v2.0.0] 
 
 - Removed SOAP APIs

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.vremanagement</groupId>
 	<artifactId>smart-executor</artifactId>
-	<version>3.1.0</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<name>SmartExecutor</name>
 	<description>Smart Executor Service allows to launch recurrent tasks such as task for infrastructure management, healthy monitoring etc.</description>
 	<packaging>war</packaging>
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.2.0</version>
+				<version>2.5.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -104,6 +104,12 @@
 			<artifactId>smart-executor-client</artifactId>
 			<version>[3.0.0, 4.0.0-SNAPSHOT)</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>23.6-jre</version>
+		</dependency>
 
 
 		<!-- Jersey -->

src/main/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisher.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.gcube.informationsystem.base.reference.Direction;
-import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
@@ -151,7 +150,7 @@ public class RestISPublisher extends ISPublisher {
 	protected RunningPlugin publishRunningPluginWithRelations(Plugin plugin, UUID pluginUUID) throws Exception {
 		
 		RunningPlugin runningPlugin = new RunningPluginImpl();
-		runningPlugin.setHeader(new HeaderImpl(pluginUUID));
+		runningPlugin.setID(pluginUUID);
 		
 		SoftwareFacet softwareFacet = new SoftwareFacetImpl();
 		softwareFacet.setGroup(plugin.getGroup());
@@ -240,7 +239,7 @@ public class RestISPublisher extends ISPublisher {
 				runningPlugin = publishRunningPluginWithRelations(plugin, pluginUUID);
 			} catch (AvailableInAnotherContextException e) {
 				runningPlugin = new RunningPluginImpl();
-				runningPlugin.setHeader(new HeaderImpl(pluginUUID));
+				runningPlugin.setID(pluginUUID);
 				resourceRegistryPublisher.addToCurrentContext(runningPlugin, false);
 			} catch (ResourceRegistryException e) {
 				throw e;

src/main/java/org/gcube/vremanagement/executor/rest/RequestFilter.java

@@ -32,7 +32,7 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
 	public void filter(ContainerRequestContext requestContext) throws IOException {
 		logger.trace("PreMatching RequestFilter");
 		
-		SecretManagerProvider.instance.reset();
+		SecretManagerProvider.instance.remove();
 		SecretManager secretManager = new SecretManager();
 		
 		String token = AccessTokenProvider.instance.get();
@@ -48,14 +48,13 @@ public class RequestFilter implements ContainerRequestFilter, ContainerResponseF
 		}
 		
 		SecretManagerProvider.instance.set(secretManager);
-		
 	}
 
 	@Override
 	public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
 			throws IOException {
 		logger.trace("ResponseFilter");
-		SecretManagerProvider.instance.reset();
+		SecretManagerProvider.instance.remove();
 	}
 
 }

src/test/java/org/gcube/vremanagement/executor/ispublisher/RestISPublisherTest.java

@@ -6,7 +6,7 @@ import java.util.UUID;
 import javax.servlet.ServletContext;
 
 import org.gcube.common.events.Hub;
-import org.gcube.informationsystem.utils.ElementMapper;
+import org.gcube.informationsystem.serialization.ElementMapper;
 import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl;
 import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;