This is an automated email from the ASF dual-hosted git repository. zehnder pushed a commit to branch STREAMPIPES-145 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 12655613810635c5a7abe44d966b02e101389393 Author: Philipp Zehnder <[email protected]> AuthorDate: Thu Aug 6 08:35:04 2020 +0200 Fix Image Upload adapter and image preview --- .../master/init/AdapterMasterContainerResourceConfig.java | 4 ++++ .../worker/init/AdapterWorkerContainerResourceConfig.java | 3 +++ .../streampipes/connect/container/worker/rest/FileResource.java | 8 ++------ .../runtime-info/pipeline-element-runtime-info.component.html | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/init/AdapterMasterContainerResourceConfig.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/init/AdapterMasterContainerResourceConfig.java index a19fa65..9496f87 100644 --- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/init/AdapterMasterContainerResourceConfig.java +++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/init/AdapterMasterContainerResourceConfig.java @@ -17,6 +17,7 @@ */ package org.apache.streampipes.connect.container.master.init; +import org.apache.streampipes.rest.shared.serializer.JacksonSerializationProvider; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.springframework.stereotype.Component; import org.apache.streampipes.connect.container.master.rest.AdapterResource; @@ -48,5 +49,8 @@ public class AdapterMasterContainerResourceConfig extends AdapterContainerConfig register(UnitResource.class); register(WorkerAdministrationResource.class); register(RuntimeResolvableResource.class); + + + register(JacksonSerializationProvider.class); } } diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java index 763c740..f762a4f 100644 --- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java +++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainerResourceConfig.java @@ -16,6 +16,7 @@ */ package org.apache.streampipes.connect.container.worker.init; +import org.apache.streampipes.rest.shared.serializer.JacksonSerializationProvider; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.springframework.stereotype.Component; import org.apache.streampipes.connect.container.worker.rest.FileResource; @@ -40,5 +41,7 @@ public class AdapterWorkerContainerResourceConfig extends AdapterContainerConfig register(MultiPartFeature.class); register(AdapterResource.class); register(ProtocolResource.class); + + register(JacksonSerializationProvider.class); } } 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 4c63db7..b89fbe7 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 @@ -30,12 +30,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -56,6 +51,7 @@ public class FileResource extends AbstractContainerResource { @POST @Consumes(MediaType.MULTIPART_FORM_DATA) + @Produces(MediaType.APPLICATION_JSON) public Response uploadFiles(@FormDataParam("file_upload") InputStream uploadedInputStream, @FormDataParam("file_upload") FormDataContentDisposition fileDetail) { diff --git a/ui/src/app/connect/new-adapter/component/runtime-info/pipeline-element-runtime-info.component.html b/ui/src/app/connect/new-adapter/component/runtime-info/pipeline-element-runtime-info.component.html index 074bc0a..4537a96 100644 --- a/ui/src/app/connect/new-adapter/component/runtime-info/pipeline-element-runtime-info.component.html +++ b/ui/src/app/connect/new-adapter/component/runtime-info/pipeline-element-runtime-info.component.html @@ -38,7 +38,7 @@ <tbody id="preview-data-rows-id"> <tr *ngFor="let property of streamDescription.eventSchema.eventProperties"> <td>{{property.runtimeName}}</td> - <td *ngIf="isImage(property)"> <img src="data:image/png;base64,{{runtimeData[property.properties.runtimeName]}}" style="max-width: 150px;" /> </td> + <td *ngIf="isImage(property)"> <img src="data:image/png;base64,{{runtimeData[property.runtimeName]}}" style="max-width: 150px;" /> </td> <td *ngIf="isTimestamp(property)">{{runtimeData[property.runtimeName] | date:'yyyy-MM-dd HH:mm:ss '}}</td> <td *ngIf="hasNoDomainProperty(property)">{{runtimeData[property.runtimeName]}}</td> </tr>
