From b1d6ce25e3fce243d7889ce626d90707c9b6df36 Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Tue, 23 Jun 2020 13:09:44 +0200
Subject: [PATCH] EventSender now sends Event instead of its superclass
 JSONObject

---
 .../java/org/gcube/event/publisher/EventSender.java |  4 +---
 .../org/gcube/event/publisher/HTTPEventSender.java  | 13 ++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/gcube/event/publisher/EventSender.java b/src/main/java/org/gcube/event/publisher/EventSender.java
index 6a2c825..55f039d 100644
--- a/src/main/java/org/gcube/event/publisher/EventSender.java
+++ b/src/main/java/org/gcube/event/publisher/EventSender.java
@@ -1,9 +1,7 @@
 package org.gcube.event.publisher;
 
-import org.json.simple.JSONObject;
-
 public interface EventSender {
 
-    void send(JSONObject event);
+    void send(Event event);
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/gcube/event/publisher/HTTPEventSender.java b/src/main/java/org/gcube/event/publisher/HTTPEventSender.java
index 9d1e0be..dafe2a7 100644
--- a/src/main/java/org/gcube/event/publisher/HTTPEventSender.java
+++ b/src/main/java/org/gcube/event/publisher/HTTPEventSender.java
@@ -8,7 +8,6 @@ import java.net.URL;
 
 import org.gcube.oidc.rest.JWTToken;
 import org.gcube.oidc.rest.OpenIdConnectRESTHelper;
-import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,19 +28,19 @@ public class HTTPEventSender implements EventSender {
     }
 
     @Override
-    public void send(JSONObject event) {
+    public void send(Event event) {
         if (log.isDebugEnabled()) {
             log.debug("Starting HTTP POST thread to: " + endpoint);
         }
-        new Thread(new HTTPost(event)).start();
+        new Thread(new HTTPost(event.toJSONString())).start();
     }
 
     public class HTTPost implements Runnable {
 
-        private JSONObject data;
+        private String json;
 
-        public HTTPost(JSONObject data) {
-            this.data = data;
+        public HTTPost(String json) {
+            this.json = json;
         }
 
         @Override
@@ -65,7 +64,7 @@ public class HTTPEventSender implements EventSender {
                 if (log.isTraceEnabled()) {
                     log.trace("Sending event JSON");
                 }
-                os.write(data.toJSONString().getBytes("UTF-8"));
+                os.write(json.getBytes("UTF-8"));
                 os.close();
 
                 StringBuilder sb = new StringBuilder();