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:04 UTC
(streampipes) branch change-data-stream-update-event-to-only-publish-schema-changes created (now f91c76c4f7)
This is an automated email from the ASF dual-hosted git repository.
SvenO3 pushed a change to branch change-data-stream-update-event-to-only-publish-schema-changes
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at f91c76c4f7 Add tests
This branch includes the following new commits:
new eb93ed2e80 Rename to data stream schema update event
new f91c76c4f7 Add tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(streampipes) 02/02: Add tests
Posted by oe...@apache.org.
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 f91c76c4f7c1d5de1ac429f087481aec7cc2de23
Author: Sven Oehler <oe...@web.de>
AuthorDate: Thu Oct 29 17:46:52 2026 +0100
Add tests
---
.../management/AdapterSchemaUpdateTest.java | 92 ++++++++++++++++
.../pipeline/update/EventSchemaChangeDetector.java | 84 ++++++++++++++
.../update/DataStreamUpdateManagementTest.java | 109 ++++++++++++++++++
.../update/EventSchemaChangeDetectorTest.java | 122 +++++++++++++++++++++
4 files changed, 407 insertions(+)
diff --git a/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterSchemaUpdateTest.java b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterSchemaUpdateTest.java
new file mode 100644
index 0000000000..01dd00c867
--- /dev/null
+++ b/streampipes-connect-management/src/test/java/org/apache/streampipes/connect/management/management/AdapterSchemaUpdateTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connect.management.management;
+
+import org.apache.streampipes.audit.api.AuditService;
+import org.apache.streampipes.manager.pipeline.update.DataStreamSchemaUpdatedEvent;
+import org.apache.streampipes.manager.pipeline.update.PipelineUpdateCoordinator;
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.resource.management.AdapterResourceManager;
+import org.apache.streampipes.resource.management.DataStreamResourceManager;
+import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.storage.api.connect.IAdapterStorage;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.ApplicationEventPublisher;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+class AdapterSchemaUpdateTest {
+
+ @Test
+ void publishesSchemaEventWhenAdapterFieldAdded() throws Exception {
+ verifyUpdate(true);
+ }
+
+ @Test
+ void doesNotPublishSchemaEventWhenAdapterRenamed() throws Exception {
+ verifyUpdate(false);
+ }
+
+ private void verifyUpdate(boolean schemaChanged) throws Exception {
+ var resources = mock(SpResourceManager.class);
+ var adapters = mock(AdapterResourceManager.class);
+ var streams = mock(DataStreamResourceManager.class);
+ var storage = mock(IAdapterStorage.class);
+ var publisher = mock(ApplicationEventPublisher.class);
+ when(resources.getAuditService()).thenReturn(mock(AuditService.class));
+ when(resources.manageAdapters()).thenReturn(adapters);
+ when(resources.manageDataStreams()).thenReturn(streams);
+ when(adapters.getDb()).thenReturn(storage);
+ when(storage.getElementById("adapter-1")).thenReturn(new AdapterDescription());
+ var previous = new SpDataStream();
+ previous.setElementId("stream-1");
+ when(streams.find("stream-1")).thenReturn(previous);
+ var updated = new AdapterDescription();
+ updated.setElementId("adapter-1");
+ updated.setCorrespondingDataStreamElementId("stream-1");
+ updated.setName("Renamed adapter");
+ var adapterStream = new SpDataStream(previous);
+ if (schemaChanged) {
+ adapterStream.getEventSchema().addEventProperty(new EventPropertyPrimitive("xs:double", "value", null, null));
+ }
+ updated.setDataStream(adapterStream);
+
+ try (var ignored = mockConstruction(PipelineUpdateCoordinator.class)) {
+ new AdapterUpdateManagement(mock(AdapterMasterManagement.class), null, resources, publisher)
+ .updateAdapter(updated, "user-1");
+
+ verify(streams).update(any(SpDataStream.class));
+ assertEquals(0, previous.getEventSchema().getEventProperties().size());
+ if (schemaChanged) {
+ verify(publisher).publishEvent(any(DataStreamSchemaUpdatedEvent.class));
+ } else {
+ verifyNoInteractions(publisher);
+ }
+ }
+ }
+}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetector.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetector.java
new file mode 100644
index 0000000000..d300b2b396
--- /dev/null
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetector.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.pipeline.update;
+
+import org.apache.streampipes.model.schema.EventProperty;
+import org.apache.streampipes.model.schema.EventPropertyList;
+import org.apache.streampipes.model.schema.EventPropertyNested;
+import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.model.schema.EventSchema;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+final class EventSchemaChangeDetector {
+
+ private EventSchemaChangeDetector() {
+ }
+
+ static boolean hasChanged(EventSchema previous, EventSchema updated) {
+ return !sameProperties(previous == null ? null : previous.getEventProperties(),
+ updated == null ? null : updated.getEventProperties());
+ }
+
+ private static boolean sameProperties(List<EventProperty> previous, List<EventProperty> updated) {
+ var previousProperties = previous == null ? List.<EventProperty>of() : previous;
+ var unmatched = new ArrayList<>(updated == null ? List.<EventProperty>of() : updated);
+ if (previousProperties.size() != unmatched.size()) {
+ return false;
+ }
+ // Match fields independently of order, including fields within nested objects.
+ for (var property : previousProperties) {
+ boolean matched = false;
+ for (int i = 0; i < unmatched.size(); i++) {
+ if (sameProperty(property, unmatched.get(i))) {
+ unmatched.remove(i);
+ matched = true;
+ break;
+ }
+ }
+ if (!matched) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static boolean sameProperty(EventProperty previous, EventProperty updated) {
+ if (previous == null || updated == null) {
+ return previous == updated;
+ }
+ if (previous.getClass() != updated.getClass()
+ || !Objects.equals(previous.getRuntimeName(), updated.getRuntimeName())
+ || !Objects.equals(previous.getPropertyScope(), updated.getPropertyScope())) {
+ return false;
+ }
+ if (previous instanceof EventPropertyPrimitive primitive) {
+ return Objects.equals(primitive.getRuntimeType(), ((EventPropertyPrimitive) updated).getRuntimeType());
+ }
+ if (previous instanceof EventPropertyNested nested) {
+ return sameProperties(nested.getEventProperties(), ((EventPropertyNested) updated).getEventProperties());
+ }
+ if (previous instanceof EventPropertyList list) {
+ return sameProperty(list.getEventProperty(), ((EventPropertyList) updated).getEventProperty());
+ }
+ return true;
+ }
+}
diff --git a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagementTest.java b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagementTest.java
new file mode 100644
index 0000000000..9b3f25d5f1
--- /dev/null
+++ b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/DataStreamUpdateManagementTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.pipeline.update;
+
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.resource.management.DataStreamResourceManager;
+import org.apache.streampipes.resource.management.SpResourceManager;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.context.ApplicationEventPublisher;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+class DataStreamUpdateManagementTest {
+
+ @Test
+ void publishesSchemaEventAfterSuccessfulUpdate() {
+ var previous = stream();
+ var updated = new SpDataStream(previous);
+ updated.getEventSchema().addEventProperty(new EventPropertyPrimitive("xs:string", "new-field", null, null));
+ var resources = mock(SpResourceManager.class);
+ var streams = mock(DataStreamResourceManager.class);
+ var publisher = mock(ApplicationEventPublisher.class);
+ when(resources.manageDataStreams()).thenReturn(streams);
+ when(streams.find("stream-1")).thenReturn(previous);
+
+ try (var coordinators = mockConstruction(PipelineUpdateCoordinator.class)) {
+ var management = new DataStreamUpdateManagement(null, resources);
+ management.updateDataStream(updated, publisher);
+
+ var order = inOrder(streams, coordinators.constructed().getFirst(), publisher);
+ order.verify(streams).find("stream-1");
+ order.verify(streams).update(updated);
+ order.verify(coordinators.constructed().getFirst()).updatePipelines(updated);
+ order.verify(publisher).publishEvent(new DataStreamSchemaUpdatedEvent(updated));
+ }
+ }
+
+ @Test
+ void persistsStreamRenameWithoutSchemaEvent() {
+ var previous = stream();
+ var updated = new SpDataStream(previous);
+ updated.setName("Renamed stream");
+ updated.setDescription("New description");
+ var resources = mock(SpResourceManager.class);
+ var streams = mock(DataStreamResourceManager.class);
+ var publisher = mock(ApplicationEventPublisher.class);
+ when(resources.manageDataStreams()).thenReturn(streams);
+ when(streams.find("stream-1")).thenReturn(previous);
+
+ try (var coordinators = mockConstruction(PipelineUpdateCoordinator.class)) {
+ new DataStreamUpdateManagement(null, resources).updateDataStream(updated, publisher);
+
+ verify(streams).update(updated);
+ verify(coordinators.constructed().getFirst()).updatePipelines(updated);
+ verifyNoInteractions(publisher);
+ }
+ }
+
+ @Test
+ void doesNotPublishWhenPersistenceFails() {
+ var updated = stream();
+ updated.getEventSchema().addEventProperty(new EventPropertyPrimitive("xs:string", "new-field", null, null));
+ var resources = mock(SpResourceManager.class);
+ var streams = mock(DataStreamResourceManager.class);
+ var publisher = mock(ApplicationEventPublisher.class);
+ when(resources.manageDataStreams()).thenReturn(streams);
+ when(streams.find("stream-1")).thenReturn(stream());
+ doThrow(new IllegalStateException("Persistence failed")).when(streams).update(updated);
+
+ try (var coordinators = mockConstruction(PipelineUpdateCoordinator.class)) {
+ var management = new DataStreamUpdateManagement(null, resources);
+ assertThrows(IllegalStateException.class, () -> management.updateDataStream(updated, publisher));
+
+ verifyNoInteractions(publisher, coordinators.constructed().getFirst());
+ }
+ }
+
+ private SpDataStream stream() {
+ var stream = new SpDataStream();
+ stream.setElementId("stream-1");
+ stream.setName("Stream");
+ return stream;
+ }
+}
diff --git a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetectorTest.java b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetectorTest.java
new file mode 100644
index 0000000000..81d0b6086f
--- /dev/null
+++ b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/pipeline/update/EventSchemaChangeDetectorTest.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.pipeline.update;
+
+import org.apache.streampipes.model.schema.EventProperty;
+import org.apache.streampipes.model.schema.EventPropertyList;
+import org.apache.streampipes.model.schema.EventPropertyNested;
+import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.model.schema.EventSchema;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.net.URI;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class EventSchemaChangeDetectorTest {
+
+ @ParameterizedTest
+ @MethodSource("schemaChanges")
+ void detectsFieldChanges(EventSchema previous, EventSchema updated) {
+ assertTrue(EventSchemaChangeDetector.hasChanged(previous, updated));
+ assertTrue(EventSchemaChangeDetector.hasChanged(updated, previous));
+ }
+
+ private static Stream<Arguments> schemaChanges() {
+ var original = schema(field("value", "xs:string", "measurement"));
+ return Stream.of(
+ Arguments.of(original, schema()),
+ Arguments.of(original, schema(field("value", "xs:string", "measurement"), field("extra"))),
+ Arguments.of(original, schema(field("renamed", "xs:string", "measurement"))),
+ Arguments.of(original, schema(field("value", "xs:double", "measurement"))),
+ Arguments.of(original, schema(field("value", "xs:string", "dimension"))),
+ Arguments.of(original, schema(field("value", "xs:string", null))),
+ Arguments.of(schema(new EventPropertyNested("object", List.of(field("child")))),
+ schema(new EventPropertyNested("object", List.of(field("renamed"))))),
+ Arguments.of(schema(new EventPropertyNested("object", List.of(field("child")))),
+ schema(new EventPropertyNested("object", List.of()))),
+ Arguments.of(schema(new EventPropertyList("values", field("item"))),
+ schema(new EventPropertyList("values", field("item", "xs:double", null)))),
+ Arguments.of(schema(new EventPropertyList("values", new EventPropertyNested("item", List.of(field("child"))))),
+ schema(new EventPropertyList("values", new EventPropertyNested("item", List.of(field("new")))))),
+ Arguments.of(schema(field("value")), schema(new EventPropertyNested("value", List.of()))),
+ Arguments.of(schema(field("value")), schema(new EventPropertyList("value", field("item")))),
+ Arguments.of(null, schema(field("value")))
+ );
+ }
+
+ @Test
+ void ignoresFieldOrderAtEveryLevel() {
+ var previous = schema(field("a"), new EventPropertyNested("object", List.of(field("b"), field("c"))),
+ new EventPropertyList("list", new EventPropertyNested("item", List.of(field("d"), field("e")))));
+ var updated = schema(
+ new EventPropertyList("list", new EventPropertyNested("item", List.of(field("e"), field("d")))),
+ new EventPropertyNested("object", List.of(field("c"), field("b"))), field("a"));
+
+ assertFalse(EventSchemaChangeDetector.hasChanged(previous, updated));
+ }
+
+ @Test
+ void ignoresDescriptiveAndGeneratedMetadata() {
+ var previous = field("value");
+ var updated = field("value");
+ updated.setLabel("New label");
+ updated.setDescription("New description");
+ updated.setElementId("new-id");
+ updated.setRuntimeId("new-runtime-id");
+ updated.setSemanticType("new-semantic-type");
+ updated.setMeasurementUnit(URI.create("urn:unit:new"));
+
+ assertFalse(EventSchemaChangeDetector.hasChanged(schema(previous), schema(updated)));
+ }
+
+ @Test
+ void treatsMissingAndEmptySchemasAsHavingNoFields() {
+ assertFalse(EventSchemaChangeDetector.hasChanged(null, schema()));
+ var missingFields = schema();
+ missingFields.setEventProperties(null);
+ assertFalse(EventSchemaChangeDetector.hasChanged(missingFields, schema()));
+ }
+
+ @Test
+ void detectsDuplicateFieldRemoval() {
+ assertTrue(EventSchemaChangeDetector.hasChanged(schema(field("value"), field("value")), schema(field("value"))));
+ }
+
+ private static EventSchema schema(EventProperty... properties) {
+ return new EventSchema(List.of(properties));
+ }
+
+ private static EventPropertyPrimitive field(String name) {
+ return field(name, "xs:string", null);
+ }
+
+ private static EventPropertyPrimitive field(String name, String type, String scope) {
+ var property = new EventPropertyPrimitive(type, name, null, null);
+ property.setPropertyScope(scope);
+ return property;
+ }
+}
(streampipes) 01/02: Rename to data stream schema update event
Posted by oe...@apache.org.
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());
}
}