You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/07 20:53:58 UTC
[incubator-streampipes] 02/03: Remove auto stop of pipelines from
adapter
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-438
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit edccbb389c81df52ec2b5a70eef47b1d259830bf
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Oct 7 22:42:23 2021 +0200
Remove auto stop of pipelines from adapter
---
.../model/connect/adapter/AdapterDescription.java | 4 --
.../model/connect/grounding/FormatDescription.java | 46 ----------------------
.../connect/grounding/ProtocolDescription.java | 2 -
.../start-adapter-configuration.component.html | 5 ---
.../start-adapter-configuration.component.ts | 3 --
.../adapter-started-dialog.component.ts | 3 --
6 files changed, 63 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
index 0a171da..635d470 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
@@ -92,9 +92,6 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
public AdapterDescription(AdapterDescription other) {
super(other);
-// this.adapterId = other.getAdapterId();
- //this.id = other.getId();
- //this.rev = other.getRev();
this.config = new Cloner().staticProperties(other.getConfig());
this.userName = other.getUserName();
this.rules = other.getRules();
@@ -107,7 +104,6 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
if (other.getEventGrounding() != null) this.eventGrounding = new EventGrounding(other.getEventGrounding());
}
- // TODO check if it can be deleted
public String getRev() {
return this.rev;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
index 810f969..cac5f91 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
@@ -26,7 +26,6 @@ import org.apache.streampipes.model.util.Cloner;
import java.util.ArrayList;
import java.util.List;
-
public class FormatDescription extends NamedStreamPipesEntity {
private List<StaticProperty> config;
@@ -51,7 +50,6 @@ public class FormatDescription extends NamedStreamPipesEntity {
this.config = new Cloner().staticProperties(other.getConfig());
}
-
public void addConfig(StaticProperty sp) {
this.config.add(sp);
}
@@ -64,50 +62,6 @@ public class FormatDescription extends NamedStreamPipesEntity {
this.config = config;
}
-
-
-
-
-
-
-
-// public static void main(String... args) {
-// FormatDescription f = new FormatDescription("", "","");
-// FreeTextStaticProperty fts = new FreeTextStaticProperty("internal_name_value", "label_value",
-// "description value");
-// FreeTextStaticProperty fts1 = new FreeTextStaticProperty("internal_name_value1", "label_value1",
-// "description value1");
-// f.addConfig(fts);
-//// f.addConfig(fts1);
-//
-// ProtocolDescription p = new ProtocolDescription("", "","");
-// FreeTextStaticProperty fts2 = new FreeTextStaticProperty("internal_name_value2", "label_value2",
-// "description value2");
-//
-// p.addConfig(fts2);
-//
-// AdapterDescription a = new AdapterDescription();
-// a.setFormatDescription(f);
-// a.setProtocolDescription(p);
-//
-// JsonLdTransformer jsonLdTransformer = new JsonLdTransformer();
-// try {
-// System.out.println(Utils.asString(jsonLdTransformer.toJsonLd(a)));
-// } catch (IllegalAccessException e) {
-// e.printStackTrace();
-// } catch (InvocationTargetException e) {
-// e.printStackTrace();
-// } catch (ClassNotFoundException e) {
-// e.printStackTrace();
-// } catch (InvalidRdfException e) {
-// e.printStackTrace();
-// } catch (RDFHandlerException e) {
-// e.printStackTrace();
-// }
-//
-// }
-
-
@Override
public String toString() {
return "FormatDescription{" +
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
index 5761dc3..4c8e71e 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
@@ -29,8 +29,6 @@ import java.util.List;
@TsModel
public class ProtocolDescription extends NamedStreamPipesEntity {
-
- //Remove for new classes
@Deprecated
String sourceType;
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
index e2fdae2..8992ec8 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
@@ -90,11 +90,6 @@
</mat-option>
</mat-select>
</mat-form-field>
-
- <mat-checkbox *ngIf="isSetAdapter" [(ngModel)]="adapterDescription.stopPipeline"
- [ngModelOptions]="{standalone: true}">Stop pipeline when replay is completed
- </mat-checkbox>
-
</div>
</div>
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
index e8d1a7d..21ed441 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -85,8 +85,6 @@ export class StartAdapterConfigurationComponent implements OnInit {
saveInDataLake = false;
dataLakeTimestampField: string;
- isSetAdapter = false;
-
constructor(
private dialogService: DialogService,
@@ -104,7 +102,6 @@ export class StartAdapterConfigurationComponent implements OnInit {
if (this.adapterDescription instanceof GenericAdapterSetDescription ||
this.adapterDescription instanceof SpecificAdapterSetDescription) {
- this.isSetAdapter = true;
}
// Auto selection of timestamp field for datalake
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
index 67e931b..9f2c614 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
@@ -89,8 +89,6 @@ export class AdapterStartedDialog implements OnInit {
if (this.saveInDataLake) {
const pipelineId = 'org.apache.streampipes.manager.template.instances.DataLakePipelineTemplate';
- console.log(x.notifications[0].title);
- console.log(this.adapter);
this.pipelineTemplateService.getPipelineTemplateInvocation(x.notifications[0].title, pipelineId)
.subscribe(res => {
@@ -124,7 +122,6 @@ export class AdapterStartedDialog implements OnInit {
}
}
});
-
}
onCloseConfirm() {