You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/06/28 21:41:26 UTC
[incubator-streampipes] 04/06: [STREAMPIPES-145] Switch
serialization format of worker registration
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 2ea48899e45f4da33420b36ee7b5b71627200fba
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Jun 28 13:44:28 2020 +0200
[STREAMPIPES-145] Switch serialization format of worker registration
---
.../master/rest/WorkerAdministrationResource.java | 16 ++++++----------
.../container/worker/management/MasterRestClient.java | 10 +++++-----
.../data-marketplace/data-marketplace.component.html | 2 +-
ui/src/app/connect/new-adapter/new-adapter.component.ts | 5 +++--
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
index 68d2108..8655e0e 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
@@ -18,15 +18,13 @@
package org.apache.streampipes.connect.container.master.rest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.streampipes.connect.container.master.management.WorkerAdministrationManagement;
import org.apache.streampipes.connect.rest.AbstractContainerResource;
-import org.apache.streampipes.model.message.Notifications;
import org.apache.streampipes.model.connect.worker.ConnectWorkerContainer;
-import org.apache.streampipes.rest.shared.annotation.GsonWithIds;
-import org.apache.streampipes.rest.shared.util.JsonLdUtils;
-import org.apache.streampipes.vocabulary.StreamPipes;
+import org.apache.streampipes.model.message.Notifications;
+import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -46,15 +44,13 @@ public class WorkerAdministrationResource extends AbstractContainerResource {
}
@POST
- @GsonWithIds
+ @JacksonSerialized
@Path("/")
@Produces(MediaType.APPLICATION_JSON)
- public Response addWorkerContainer(String connectWorkerContainerString) {
- ConnectWorkerContainer connectWorkerContainer = JsonLdUtils.fromJsonLd(connectWorkerContainerString, ConnectWorkerContainer.class, StreamPipes.CONNECT_WORKER_CONTAINER);
+ public Response addWorkerContainer(ConnectWorkerContainer connectWorkerContainer) {
LOG.info("Worker container: " + connectWorkerContainer.getEndpointUrl() + " was detected");
this.workerAdministrationManagement.register(connectWorkerContainer);
-
return ok(Notifications.success("Worker Container sucessfully added"));
}
diff --git a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
index 2985b53..c53a58d 100644
--- a/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
+++ b/streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/MasterRestClient.java
@@ -20,10 +20,10 @@ package org.apache.streampipes.connect.container.worker.management;
import org.apache.http.client.fluent.Request;
import org.apache.http.entity.ContentType;
+import org.apache.streampipes.model.connect.worker.ConnectWorkerContainer;
+import org.apache.streampipes.serializers.json.JacksonSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.streampipes.model.connect.worker.ConnectWorkerContainer;
-import org.apache.streampipes.rest.shared.util.JsonLdUtils;
import java.io.IOException;
@@ -33,11 +33,11 @@ public class MasterRestClient {
public static boolean register(String baseUrl, ConnectWorkerContainer connectWorkerContainer) {
- String adapterDescription = JsonLdUtils.toJsonLD(connectWorkerContainer);
-
- String url = baseUrl + "api/v1/admin@streampipes.org/master/workercontainer";
+ String url = baseUrl + "api/v1/admin@streampipes.org/master/workercontainer";
try {
+ String adapterDescription = JacksonSerializer.getObjectMapper().writeValueAsString(connectWorkerContainer);
+
Request.Post(url)
.bodyString(adapterDescription, ContentType.APPLICATION_JSON)
.connectTimeout(1000)
diff --git a/ui/src/app/connect/data-marketplace/data-marketplace.component.html b/ui/src/app/connect/data-marketplace/data-marketplace.component.html
index 10a4484..2e47f54 100644
--- a/ui/src/app/connect/data-marketplace/data-marketplace.component.html
+++ b/ui/src/app/connect/data-marketplace/data-marketplace.component.html
@@ -83,7 +83,7 @@
</div>
- <div class="box" class="container-fluid marketplace-container">
+ <div class="container-fluid marketplace-container">
<div *ngIf="selectedIndex === 0">
<div *ngIf="newAdapterFromDescription===undefined" fxLayout="row wrap" fxLayoutAlign="start stretch" class="adapter-description-container">
diff --git a/ui/src/app/connect/new-adapter/new-adapter.component.ts b/ui/src/app/connect/new-adapter/new-adapter.component.ts
index f3811ca..d6cd387 100644
--- a/ui/src/app/connect/new-adapter/new-adapter.component.ts
+++ b/ui/src/app/connect/new-adapter/new-adapter.component.ts
@@ -39,7 +39,7 @@ import {TransformationRuleService} from '../transformation-rule.service';
import {AdapterStartedDialog} from './component/adapter-started-dialog.component';
import {IconService} from './icon.service';
import {
- AdapterDescription,
+ AdapterDescription, AdapterDescriptionUnion,
EventProperty,
EventRateTransformationRuleDescription,
EventSchema,
@@ -68,7 +68,7 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
@Input()
- adapter: AdapterDescription;
+ adapter: AdapterDescriptionUnion;
@Output()
removeSelectionEmitter: EventEmitter<void> = new EventEmitter<void>();
@@ -196,6 +196,7 @@ export class NewAdapterComponent implements OnInit, AfterViewInit {
this.parentForm.statusChanges.subscribe((status)=>{
this.adapterSettingsFormValid = this.viewInitialized && this.parentForm.valid;
})
+
}
ngAfterViewInit() {