You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by oe...@apache.org on 2026/10/29 16:47:05 UTC

(streampipes) 01/02: Rename to data stream schema update event

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

SvenO3 pushed a commit to branch change-data-stream-update-event-to-only-publish-schema-changes
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit eb93ed2e80c9ecd4760f86578d1d9b631226a49f
Author: Sven Oehler <oe...@web.de>
AuthorDate: Thu Oct 29 17:46:44 2026 +0100

    Rename to data stream schema update event
---
 .../management/management/AdapterUpdateManagement.java       | 12 ++----------
 .../management/management/AdapterUpdateAuditTest.java        |  2 ++
 ...amUpdatedEvent.java => DataStreamSchemaUpdatedEvent.java} |  2 +-
 .../manager/pipeline/update/DataStreamUpdateManagement.java  | 12 ++++++++++++
 .../apache/streampipes/rest/impl/pe/DataStreamResource.java  |  4 +---
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
index e5d8eb53be..34644fa72c 100644
--- a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
+++ b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/AdapterUpdateManagement.java
@@ -24,7 +24,6 @@ import org.apache.streampipes.audit.events.adapter.AdapterEditedDetails;
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
 import org.apache.streampipes.manager.api.extensions.ExtensionServiceRequestManager;
 import org.apache.streampipes.manager.pipeline.update.DataStreamUpdateManagement;
-import org.apache.streampipes.manager.pipeline.update.DataStreamUpdatedEvent;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.connect.adapter.PipelineUpdateInfo;
@@ -83,8 +82,7 @@ public class AdapterUpdateManagement {
 
       // update data source
       var updatedDataStream = this.updateDataSource(ad);
-      dataStreamUpdateManagement.updateDataStream(updatedDataStream);
-      publishEvent(new DataStreamUpdatedEvent(updatedDataStream));
+      dataStreamUpdateManagement.updateDataStream(updatedDataStream, eventPublisher);
 
       if (shouldRestart) {
         this.adapterMasterManagement.startAdapter(ad.getElementId(), actor);
@@ -104,7 +102,7 @@ public class AdapterUpdateManagement {
     // get data source
     SpDataStream dataStream = this.dataStreamResourceManager.find(ad.getCorrespondingDataStreamElementId());
 
-    return SourcesManagement.updateDataStream(ad, dataStream);
+    return SourcesManagement.updateDataStream(ad, new SpDataStream(dataStream));
   }
 
   private SpDataStream toDataStreamUpdate(AdapterDescription adapterDescription) {
@@ -115,10 +113,4 @@ public class AdapterUpdateManagement {
     dataStream.setEventSchema(adapterDescription.getEventSchema());
     return dataStream;
   }
-
-  private void publishEvent(Object event) {
-    if (eventPublisher != null) {
-      eventPublisher.publishEvent(event);
-    }
-  }
 }
diff --git a/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterUpdateAuditTest.java b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterUpdateAuditTest.java
index fde3170441..ec1aceda5c 100644
--- a/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterUpdateAuditTest.java
+++ b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterUpdateAuditTest.java
@@ -84,6 +84,8 @@ class AdapterUpdateAuditTest {
     before.setName("old");
     var after = new AdapterDescription();
     after.setElementId("adapter-1");
+    after.setCorrespondingDataStreamElementId("stream-1");
+    when(streams.find("stream-1")).thenReturn(new SpDataStream());
     after.setName(changed ? "new" : "old");
     after.setRunning(true);
     when(storage.getElementById("adapter-1")).thenReturn(before);
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdatedEvent.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamSchemaUpdatedEvent.java
similarity index 92%
rename from streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdatedEvent.java
rename to streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamSchemaUpdatedEvent.java
index 76bb4622c6..07d74c2f27 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdatedEvent.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamSchemaUpdatedEvent.java
@@ -20,5 +20,5 @@ package org.apache.streampipes.manager.pipeline.update;
 
 import org.apache.streampipes.model.SpDataStream;
 
-public record DataStreamUpdatedEvent(SpDataStream dataStream) {
+public record DataStreamSchemaUpdatedEvent(SpDataStream dataStream) {
 }
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagement.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagement.java
index 9fe004577c..9a19c17499 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagement.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagement.java
@@ -24,6 +24,8 @@ import org.apache.streampipes.model.connect.adapter.PipelineUpdateInfo;
 import org.apache.streampipes.resource.management.DataStreamResourceManager;
 import org.apache.streampipes.resource.management.SpResourceManager;
 
+import org.springframework.context.ApplicationEventPublisher;
+
 import java.util.List;
 
 public class DataStreamUpdateManagement {
@@ -42,6 +44,16 @@ public class DataStreamUpdateManagement {
     pipelineUpdateCoordinator.updatePipelines(dataStream);
   }
 
+  public void updateDataStream(SpDataStream dataStream, ApplicationEventPublisher eventPublisher) {
+    var previous = dataStreamResourceManager.find(dataStream.getElementId());
+    boolean schemaChanged = EventSchemaChangeDetector.hasChanged(
+        previous == null ? null : previous.getEventSchema(), dataStream.getEventSchema());
+    updateDataStream(dataStream);
+    if (schemaChanged && eventPublisher != null) {
+      eventPublisher.publishEvent(new DataStreamSchemaUpdatedEvent(dataStream));
+    }
+  }
+
   public List<PipelineUpdateInfo> checkPipelineMigrations(SpDataStream dataStream) {
     return pipelineUpdateCoordinator.checkPipelineMigrations(dataStream);
   }
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataStreamResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataStreamResource.java
index f7063bff4e..f15132d434 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataStreamResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/pe/DataStreamResource.java
@@ -21,7 +21,6 @@ package org.apache.streampipes.rest.impl.pe;
 import org.apache.streampipes.manager.api.extensions.ExtensionServiceRequestManager;
 import org.apache.streampipes.manager.pipeline.update.DataStreamDeletedEvent;
 import org.apache.streampipes.manager.pipeline.update.DataStreamUpdateManagement;
-import org.apache.streampipes.manager.pipeline.update.DataStreamUpdatedEvent;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.connect.adapter.PipelineUpdateInfo;
 import org.apache.streampipes.model.message.Message;
@@ -111,8 +110,7 @@ public class DataStreamResource extends AbstractAuthGuardedRestResource {
       throw new HttpResponseException(400,
           "Element ID in path variable does not match element ID in request body");
     } else {
-      dataStreamUpdateManagement.updateDataStream(updatedElement);
-      publishEvent(new DataStreamUpdatedEvent(updatedElement));
+      dataStreamUpdateManagement.updateDataStream(updatedElement, eventPublisher);
       return constructSuccessMessage(NotificationType.STORAGE_SUCCESS.uiNotification());
     }
   }