[#1289] Remove class ProtocolStreamDescription

apache · Feb 15, 2023 · b28fbd2 · b28fbd2
1 parent 73aabb8
commit b28fbd2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 51 deletions.
diff --git a/...test/java/org/apache/streampipes/connect/management/management/SourcesManagementTest.java b/...test/java/org/apache/streampipes/connect/management/management/SourcesManagementTest.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.connect.management.management;
 
 import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
 import org.apache.streampipes.model.schema.EventPropertyPrimitive;
 import org.apache.streampipes.model.schema.EventSchema;
@@ -42,7 +42,7 @@ public void updateDataStream() {
     EventSchema newEventSchema = new EventSchema();
     newEventSchema.addEventProperty(new EventPropertyPrimitive());
 
-    AdapterStreamDescription adapterDescription = new SpecificAdapterStreamDescription();
+    AdapterDescription adapterDescription = new SpecificAdapterStreamDescription();
     SpDataStream newDataStream = new SpDataStream();
     newDataStream.setEventSchema(newEventSchema);
     adapterDescription.setName(newAdapterName);

diff --git a/...-management/src/test/java/org/apache/streampipes/extensions/management/connect/Utils.java b/...-management/src/test/java/org/apache/streampipes/extensions/management/connect/Utils.java
@@ -18,15 +18,15 @@
 
 package org.apache.streampipes.extensions.management.connect;
 
-import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
 
 import java.util.ArrayList;
 
 public class Utils {
 
-  public static AdapterStreamDescription getMinimalStreamAdapter() {
-    AdapterStreamDescription result = new GenericAdapterStreamDescription();
+  public static AdapterDescription getMinimalStreamAdapter() {
+    AdapterDescription result = new GenericAdapterStreamDescription();
     String id = "https://t.de/";
     result.setElementId(id);
     result.setRules(new ArrayList<>());

diff --git a/...-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java b/...-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
@@ -44,6 +44,7 @@
 public abstract class AdapterDescription extends NamedStreamPipesEntity {
 
   protected SpDataStream dataStream;
+
   protected boolean running;
   private EventGrounding eventGrounding;
 

diff --git a/...in/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java b/...in/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
@@ -20,7 +20,6 @@
 
 import org.apache.streampipes.model.connect.grounding.FormatDescription;
 import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.model.connect.grounding.ProtocolStreamDescription;
 import org.apache.streampipes.model.schema.EventSchema;
 import org.apache.streampipes.model.shared.annotation.TsModel;
 import org.apache.streampipes.model.util.ElementIdGenerator;
@@ -39,7 +38,7 @@ public GenericAdapterStreamDescription() {
   }
 
   public GenericAdapterStreamDescription(FormatDescription formatDescription,
-                                         ProtocolStreamDescription protocolDescription) {
+                                         ProtocolDescription protocolDescription) {
     this.formatDescription = formatDescription;
     this.protocolDescription = protocolDescription;
   }
@@ -51,7 +50,7 @@ public GenericAdapterStreamDescription(GenericAdapterStreamDescription other) {
       this.formatDescription = new FormatDescription(other.getFormatDescription());
     }
     if (other.getProtocolDescription() != null) {
-      this.protocolDescription = new ProtocolStreamDescription(other.getProtocolDescription());
+      this.protocolDescription = new ProtocolDescription(other.getProtocolDescription());
     }
   }
 

diff --git a/...c/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java b/...c/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
@@ -18,7 +18,7 @@
 /* tslint:disable */
 /* eslint-disable */
 // @ts-nocheck
-// Generated using typescript-generator version 3.1.1185 on 2023-02-15 16:22:37.
+// Generated using typescript-generator version 3.1.1185 on 2023-02-15 16:54:35.
 
 export class ExtensionsServiceEndpointItem {
     appId: string;

diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -18,7 +18,7 @@
 /* tslint:disable */
 /* eslint-disable */
 // @ts-nocheck
-// Generated using typescript-generator version 3.1.1185 on 2023-02-15 16:22:35.
+// Generated using typescript-generator version 3.1.1185 on 2023-02-15 16:54:34.
 
 export class NamedStreamPipesEntity {
     '@class':