From ccad4e9ab07b8fee299b5add4b5eafb022f3bddb Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <mauro.mugnaini@nubisware.com>
Date: Mon, 27 Dec 2021 12:53:41 +0100
Subject: [PATCH] Aligned to new "retrieve" functions of abstract library

---
 CHANGELOG.md                                  |  7 +++---
 pom.xml                                       | 23 +++++++++++--------
 .../lr62/AbstractLR62EventPublisher.java      | 10 ++++++++
 .../event/publisher/lr62/PortalEvent.java     |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7469ee9..8585c26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
 # Changelog for "event-publisher-portal"
 
+## [v1.1.0-SNAPSHOT]
+
 ## [v1.0.2]
 - OIDC token only is now used to send events to the orchestrator endpoint (UMA token is no more involved).
 
 ## [v1.0.1]
 - First release (#19461)
-
-
-This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ce6e3c6..f7ceca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,33 +1,39 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
 		<version>1.1.0</version>
 		<relativePath />
 	</parent>
+
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>event-publisher-portal</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<version>1.0.2</version>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.3-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-    <scm>
-        <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-        <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
-        <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
-    </scm>
+
+	<scm>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
+	</scm>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -40,16 +46,15 @@
 			</plugin>
 		</plugins>
 	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>oidc-library-portal</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>event-publisher-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/AbstractLR62EventPublisher.java b/src/main/java/org/gcube/portal/event/publisher/lr62/AbstractLR62EventPublisher.java
index 2bd9ff9..3a274e4 100644
--- a/src/main/java/org/gcube/portal/event/publisher/lr62/AbstractLR62EventPublisher.java
+++ b/src/main/java/org/gcube/portal/event/publisher/lr62/AbstractLR62EventPublisher.java
@@ -6,6 +6,7 @@ import org.gcube.event.publisher.EventSender;
 import org.gcube.event.publisher.HTTPWithOIDCAuthEventSender;
 import org.gcube.oidc.rest.OpenIdConnectConfiguration;
 import org.gcube.portal.oidc.lr62.LiferayOpenIdConnectConfiguration;
+import org.json.simple.JSONObject;
 
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -27,6 +28,15 @@ public abstract class AbstractLR62EventPublisher extends AbstractEventPublisher
                 public void send(Event event) {
                     System.out.println(event);
                 }
+                @Override
+                public String sendAndGetResult(Event event) {
+                    System.out.println(event);
+                    return null;
+                }
+                @Override
+                public JSONObject retrive(String id) {
+                    return null;
+                }
             };
         } else {
             OpenIdConnectConfiguration openIdConnectConfiguration = LiferayOpenIdConnectConfiguration
diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/PortalEvent.java b/src/main/java/org/gcube/portal/event/publisher/lr62/PortalEvent.java
index d706556..8fc89e2 100644
--- a/src/main/java/org/gcube/portal/event/publisher/lr62/PortalEvent.java
+++ b/src/main/java/org/gcube/portal/event/publisher/lr62/PortalEvent.java
@@ -94,7 +94,7 @@ public class PortalEvent extends Event {
     public void setRole(Role role) throws PortalException, SystemException {
         setRole(getRoleIdentifier(role));
     }
-    
+
     protected String getRoleIdentifier(Role role) throws PortalException, SystemException {
         try {
             return ROLE_MANAGER.getRole(role.getRoleId()).getRoleName();