[incubator-streampipes] 01/03: [hotfix] Fix bug in FileResource

[ri...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit beeb46f96f49d943f708bc5e493e5b2efa63021d
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Aug 23 20:37:14 2020 +0200

    [hotfix] Fix bug in FileResource
---
 .../container/master/management/WorkerRestClient.java    |  3 +--
 .../connect/container/worker/rest/FileResource.java      | 16 +++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
index e60aba0..8c87a67 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
@@ -18,7 +18,6 @@
 
 package org.apache.streampipes.connect.container.master.management;
 
-import com.google.gson.Gson;
 import org.apache.http.client.fluent.Request;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.MultipartEntity;
@@ -196,7 +195,7 @@ public class WorkerRestClient {
                     .connectTimeout(1000)
                     .socketTimeout(100000)
                     .execute().returnContent().asString();
-            List<String> paths = new Gson().fromJson(stringResponse, List.class);
+            List<String> paths = JacksonSerializer.getObjectMapper().readValue(stringResponse, List.class);
 
             logger.info("Got File paths successfully");
             return paths;
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/FileResource.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/FileResource.java
index b89fbe7..2671ad6 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/FileResource.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/FileResource.java
@@ -18,21 +18,21 @@
 
 package org.apache.streampipes.connect.container.worker.rest;
 
+import org.apache.streampipes.connect.container.worker.management.FileManagement;
+import org.apache.streampipes.connect.rest.AbstractContainerResource;
+import org.apache.streampipes.model.message.Notifications;
+import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.streampipes.connect.container.worker.management.FileManagement;
-import org.apache.streampipes.connect.rest.AbstractContainerResource;
-import org.apache.streampipes.model.message.Notifications;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 @Path("/api/v1/{username}/worker/file")
 public class FileResource extends AbstractContainerResource {
@@ -81,6 +81,8 @@ public class FileResource extends AbstractContainerResource {
     }
 
     @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @JacksonSerialized
     public Response getFilePaths(@PathParam("username") String username) {
         return ok(fileManagement.getFilePaths());
     }