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 2022/10/21 09:32:51 UTC

[incubator-streampipes] branch STREAMPIPES-597 updated: [STREAMPIPES-597] Update data source when adapter is edited

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

zehnder pushed a commit to branch STREAMPIPES-597
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/STREAMPIPES-597 by this push:
     new da04456ba [STREAMPIPES-597] Update data source when adapter is edited
da04456ba is described below

commit da04456bad9c3f33aeaa9691533d7cad6ed35d1a
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri Oct 21 11:32:40 2022 +0200

    [STREAMPIPES-597] Update data source when adapter is edited
---
 .../master/management/AdapterMasterManagement.java |  31 ++++-
 .../master/management/SourcesManagement.java       | 147 ++++++++++++---------
 .../management/AdapterMasterManagementTest.java    |   8 +-
 .../master/management/SourcesManagementTest.java   |  93 ++++---------
 .../management/DataStreamResourceManager.java      |  14 +-
 .../management/DataStreamResourceManagerTest.java  |  40 ++++++
 ui/cypress/tests/adapter/editAdapter.smoke.spec.ts |  14 +-
 .../existing-adapters.component.html               |   3 +-
 8 files changed, 205 insertions(+), 145 deletions(-)

diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
index 93cfcb0fd..579420c89 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
@@ -51,15 +51,20 @@ public class AdapterMasterManagement {
   private final IAdapterStorage adapterInstanceStorage;
   private final AdapterResourceManager adapterResourceManager;
 
+  private final DataStreamResourceManager dataStreamResourceManager;
+
   public AdapterMasterManagement() {
     this.adapterInstanceStorage = getAdapterInstanceStorage();
     this.adapterResourceManager = new SpResourceManager().manageAdapters();
+    this.dataStreamResourceManager = new SpResourceManager().manageDataStreams();
   }
 
   public AdapterMasterManagement(IAdapterStorage adapterStorage,
-                                 AdapterResourceManager adapterResourceManager) {
+                                 AdapterResourceManager adapterResourceManager,
+                                 DataStreamResourceManager dataStreamResourceManager) {
     this.adapterInstanceStorage = adapterStorage;
     this.adapterResourceManager = adapterResourceManager;
+    this.dataStreamResourceManager = dataStreamResourceManager;
   }
 
   public String addAdapter(AdapterDescription ad,
@@ -95,14 +100,16 @@ public class AdapterMasterManagement {
   }
 
   public void updateAdapter(AdapterDescription ad,
-                              String principalSid)
+                            String principalSid)
       throws AdapterException {
+    // update adapter in database
     this.adapterResourceManager.encryptAndUpdate(ad);
-  }
-
 
+    // update data source in database
+    this.updateDataSource(ad);
+  }
 
-    public AdapterDescription getAdapter(String elementId) throws AdapterException {
+  public AdapterDescription getAdapter(String elementId) throws AdapterException {
     List<AdapterDescription> allAdapters = adapterInstanceStorage.getAllAdapters();
 
     if (allAdapters != null && elementId != null) {
@@ -118,6 +125,7 @@ public class AdapterMasterManagement {
 
   /**
    * First the adapter is stopped removed, then the corresponding data source is deleted
+   *
    * @param elementId The elementId of the adapter instance
    * @throws AdapterException when adapter can not be stopped
    */
@@ -138,8 +146,7 @@ public class AdapterMasterManagement {
     LOG.info("Successfully deleted adapter: " + elementId);
 
     // Delete data stream
-    DataStreamResourceManager resourceManager = new SpResourceManager().manageDataStreams();
-    resourceManager.delete(adapter.getCorrespondingDataStreamElementId());
+    this.dataStreamResourceManager.delete(adapter.getCorrespondingDataStreamElementId());
     LOG.info("Successfully deleted data stream: " + adapter.getCorrespondingDataStreamElementId());
   }
 
@@ -201,6 +208,16 @@ public class AdapterMasterManagement {
     }
   }
 
+  private void updateDataSource(AdapterDescription ad) throws AdapterException {
+    // get data source
+    SpDataStream dataStream = this.dataStreamResourceManager.find(ad.getCorrespondingDataStreamElementId());
+
+    dataStream = SourcesManagement.updateDataStream(ad, dataStream);
+
+    // Update data source in database
+    this.dataStreamResourceManager.update(dataStream);
+  }
+
   private void installDataSource(SpDataStream stream,
                                  String principalSid,
                                  boolean publicElement) throws AdapterException {
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/SourcesManagement.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/SourcesManagement.java
index 454a5a77a..6deb54246 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/SourcesManagement.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/SourcesManagement.java
@@ -28,6 +28,7 @@ import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 import org.apache.streampipes.model.connect.adapter.AdapterSetDescription;
 import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
 import org.apache.streampipes.model.grounding.EventGrounding;
+import org.apache.streampipes.model.schema.EventSchema;
 import org.apache.streampipes.resource.management.secret.SecretProvider;
 import org.apache.streampipes.sdk.helpers.SupportedProtocols;
 import org.apache.streampipes.storage.couchdb.impl.AdapterInstanceStorageImpl;
@@ -39,79 +40,99 @@ import java.util.Arrays;
 
 public class SourcesManagement {
 
-    private Logger logger = LoggerFactory.getLogger(SourcesManagement.class);
+  private final Logger logger = LoggerFactory.getLogger(SourcesManagement.class);
 
-    private AdapterInstanceStorageImpl adapterInstanceStorage;
+  private final AdapterInstanceStorageImpl adapterInstanceStorage;
 
-    public SourcesManagement(AdapterInstanceStorageImpl adapterStorage) {
-      this.adapterInstanceStorage = adapterStorage;
-    }
 
-    public SourcesManagement() {
-       this(new AdapterInstanceStorageImpl());
-    }
+  public SourcesManagement(AdapterInstanceStorageImpl adapterStorage) {
+    this.adapterInstanceStorage = adapterStorage;
+  }
 
-    public void addSetAdapter(SpDataSet dataSet) throws AdapterException, NoServiceEndpointsAvailableException {
+  public SourcesManagement() {
+    this(new AdapterInstanceStorageImpl());
+  }
 
-        AdapterSetDescription ad = (AdapterSetDescription) getAndDecryptAdapter(dataSet.getCorrespondingAdapterId());
-        ad.setDataSet(dataSet);
-        ad.setElementId(ad.getElementId() + "/streams/" + dataSet.getDatasetInvocationId());
+  public void addSetAdapter(SpDataSet dataSet) throws AdapterException, NoServiceEndpointsAvailableException {
 
-        try {
-            String baseUrl = WorkerPaths.findEndpointUrl(ad.getAppId());
-            WorkerRestClient.invokeSetAdapter(baseUrl, ad);
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-        }
-    }
+    AdapterSetDescription ad = (AdapterSetDescription) getAndDecryptAdapter(dataSet.getCorrespondingAdapterId());
+    ad.setDataSet(dataSet);
+    ad.setElementId(ad.getElementId() + "/streams/" + dataSet.getDatasetInvocationId());
 
-    /**
-     * @param runningInstanceId
-     * @throws AdapterException
-     * @throws NoServiceEndpointsAvailableException
-     */
-    public void detachAdapter(String elementId, String runningInstanceId) throws AdapterException, NoServiceEndpointsAvailableException {
-        AdapterSetDescription ad = (AdapterSetDescription) getAndDecryptAdapter(elementId);
-        try {
-            String baseUrl = WorkerPaths.findEndpointUrl(ad.getAppId());
-            ad.setElementId(ad.getElementId() + "/streams/" + runningInstanceId);
-            WorkerRestClient.stopSetAdapter(baseUrl, ad);
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-        }
+    try {
+      String baseUrl = WorkerPaths.findEndpointUrl(ad.getAppId());
+      WorkerRestClient.invokeSetAdapter(baseUrl, ad);
+    } catch (URISyntaxException e) {
+      e.printStackTrace();
     }
-
-    public SpDataStream createAdapterDataStream(AdapterDescription adapterDescription,
-                                                String dataStreamElementId) {
-
-        SpDataStream ds;
-        if (adapterDescription instanceof AdapterSetDescription) {
-            ds = ((AdapterSetDescription) adapterDescription).getDataSet();
-            EventGrounding eg = new EventGrounding();
-            eg.setTransportProtocols(
-                    Arrays.asList(SupportedProtocols.kafka(),
-                            SupportedProtocols.jms(),
-                            SupportedProtocols.mqtt()));
-            eg.setTransportFormats(Arrays.asList(TransportFormatGenerator.getTransportFormat()));
-            ((SpDataSet) ds).setSupportedGrounding(eg);
-        } else {
-            ds = ((AdapterStreamDescription) adapterDescription).getDataStream();
-            ds.setEventGrounding(new EventGrounding(adapterDescription.getEventGrounding()));
-        }
-
-        ds.setElementId(dataStreamElementId);
-        ds.setName(adapterDescription.getName());
-        ds.setDescription(adapterDescription.getDescription());
-        ds.setCorrespondingAdapterId(adapterDescription.getElementId());
-        ds.setInternallyManaged(true);
-
-        return ds;
+  }
+
+  /**
+   * @param elementId
+   * @param runningInstanceId
+   * @throws AdapterException
+   * @throws NoServiceEndpointsAvailableException
+   */
+  public void detachAdapter(String elementId, String runningInstanceId)
+      throws AdapterException, NoServiceEndpointsAvailableException {
+    AdapterSetDescription ad = (AdapterSetDescription) getAndDecryptAdapter(elementId);
+    try {
+      String baseUrl = WorkerPaths.findEndpointUrl(ad.getAppId());
+      ad.setElementId(ad.getElementId() + "/streams/" + runningInstanceId);
+      WorkerRestClient.stopSetAdapter(baseUrl, ad);
+    } catch (URISyntaxException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public SpDataStream createAdapterDataStream(AdapterDescription adapterDescription,
+                                              String dataStreamElementId) {
+
+    SpDataStream ds;
+    if (adapterDescription instanceof AdapterSetDescription) {
+      ds = ((AdapterSetDescription) adapterDescription).getDataSet();
+      EventGrounding eg = new EventGrounding();
+      eg.setTransportProtocols(
+          Arrays.asList(SupportedProtocols.kafka(),
+              SupportedProtocols.jms(),
+              SupportedProtocols.mqtt()));
+      eg.setTransportFormats(Arrays.asList(TransportFormatGenerator.getTransportFormat()));
+      ((SpDataSet) ds).setSupportedGrounding(eg);
+    } else {
+      ds = ((AdapterStreamDescription) adapterDescription).getDataStream();
+      ds.setEventGrounding(new EventGrounding(adapterDescription.getEventGrounding()));
     }
 
-    private AdapterDescription getAndDecryptAdapter(String adapterId) {
-        AdapterDescription adapter = this.adapterInstanceStorage.getAdapter(adapterId);
-        SecretProvider.getDecryptionService().apply(adapter);
-        return adapter;
+    ds.setElementId(dataStreamElementId);
+    ds.setName(adapterDescription.getName());
+    ds.setDescription(adapterDescription.getDescription());
+    ds.setCorrespondingAdapterId(adapterDescription.getElementId());
+    ds.setInternallyManaged(true);
+
+    return ds;
+  }
+
+  public static SpDataStream updateDataStream(AdapterDescription adapterDescription,
+                                       SpDataStream oldDataStream) {
+
+    oldDataStream.setName(adapterDescription.getName());
+//
+//    // Update event schema
+    EventSchema newEventSchema;
+    if (adapterDescription instanceof AdapterStreamDescription) {
+      newEventSchema = ((AdapterStreamDescription) adapterDescription).getDataStream().getEventSchema();
+    } else {
+      newEventSchema = ((AdapterSetDescription) adapterDescription).getDataSet().getEventSchema();
     }
+    oldDataStream.setEventSchema(newEventSchema);
+
+    return oldDataStream;
+  }
+
+  private AdapterDescription getAndDecryptAdapter(String adapterId) {
+    AdapterDescription adapter = this.adapterInstanceStorage.getAdapter(adapterId);
+    SecretProvider.getDecryptionService().apply(adapter);
+    return adapter;
+  }
 
 }
diff --git a/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagementTest.java b/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagementTest.java
index 63e29433a..00826a687 100644
--- a/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagementTest.java
+++ b/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagementTest.java
@@ -40,7 +40,7 @@ public class AdapterMasterManagementTest {
         AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
         when(adapterStorage.getAllAdapters()).thenReturn(null);
 
-        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager);
+        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager, null);
 
         adapterMasterManagement.getAdapter("id2");
     }
@@ -52,7 +52,7 @@ public class AdapterMasterManagementTest {
         AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
         when(adapterStorage.getAllAdapters()).thenReturn(adapterDescriptions);
 
-        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager);
+        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager, null);
 
         adapterMasterManagement.getAdapter("id2");
     }
@@ -64,7 +64,7 @@ public class AdapterMasterManagementTest {
         AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
         when(adapterStorage.getAllAdapters()).thenReturn(adapterDescriptions);
 
-        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager);
+        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager, null);
 
         List<AdapterDescription> result = adapterMasterManagement.getAllAdapterInstances();
 
@@ -77,7 +77,7 @@ public class AdapterMasterManagementTest {
         AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
         when(adapterStorage.getAllAdapters()).thenReturn(null);
 
-        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager);
+        AdapterMasterManagement adapterMasterManagement = new AdapterMasterManagement(adapterStorage, resourceManager, null);
 
         adapterMasterManagement.getAllAdapterInstances();
 
diff --git a/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/SourcesManagementTest.java b/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/SourcesManagementTest.java
index d9feb52da..e355aa937 100644
--- a/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/SourcesManagementTest.java
+++ b/streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/SourcesManagementTest.java
@@ -18,82 +18,39 @@
 
 package org.apache.streampipes.connect.container.master.management;
 
-import org.apache.streampipes.model.SpDataSet;
-import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-import org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
-import org.apache.streampipes.storage.couchdb.impl.AdapterInstanceStorageImpl;
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
+import org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
+import org.apache.streampipes.model.schema.EventPropertyPrimitive;
+import org.apache.streampipes.model.schema.EventSchema;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
-import static org.powermock.api.mockito.PowerMockito.doNothing;
-import static org.powermock.api.mockito.PowerMockito.verifyStatic;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ WorkerRestClient.class })
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
 public class SourcesManagementTest {
-    private final static String ID = "id_1234";
-
-    @Before
-    public  void before() {
-        PowerMockito.mockStatic(WorkerRestClient.class);
-    }
-
-    @Ignore
-    @Test
-    public void addAdapterSuccess() throws Exception {
-        AdapterInstanceStorageImpl adapterStorage = mock(AdapterInstanceStorageImpl.class);
-        when(adapterStorage.getAllAdapters()).thenReturn(getAdapterDescriptionList());
-        SourcesManagement sourcesManagement = new SourcesManagement(adapterStorage);
-        doNothing().when(WorkerRestClient.class, "invokeSetAdapter", anyString(), any());
-
-        sourcesManagement.addSetAdapter(new SpDataSet());
-
-        verify(adapterStorage, times(1)).getAllAdapters();
-        verifyStatic(WorkerRestClient.class, times(1));
-        WorkerRestClient.invokeSetAdapter(eq("/"), any());
-
-    }
 
-    private List<AdapterDescription> getAdapterDescriptionList() {
-        GenericAdapterSetDescription adapterSetDescription = new GenericAdapterSetDescription();
+  @Before
+  public void before() {
+  }
 
-        adapterSetDescription.setElementId(ID);
+  @Test
+  public void updateDataStream() {
+    String newAdapterName = "newName";
+    EventSchema newEventSchema = new EventSchema();
+    newEventSchema.addEventProperty(new EventPropertyPrimitive());
 
-        return Arrays.asList(adapterSetDescription);
-    }
+    AdapterStreamDescription adapterDescription = new SpecificAdapterStreamDescription();
+    SpDataStream newDataStream = new SpDataStream();
+    newDataStream.setEventSchema(newEventSchema);
+    adapterDescription.setName(newAdapterName);
+    adapterDescription.setDataStream(newDataStream);
 
+    SpDataStream result = SourcesManagement.updateDataStream(adapterDescription, new SpDataStream());
 
-    private String getJsonString() {
-        return "[" +
-                "{" +
-                "\"uri\":\"id_1234\"," +
-                "\"name\":\"Adapter Stream\"," +
-                "\"description\":\"This stream is generated by an StreamPipes Connect adapter. ID of adapter: id_1234\"," +
-                "\"type\":\"source\"," +
-                "\"editable\":true," +
-                "\"streams\":[" +
-                "{" +
-                "\"uri\":\"id_1234\"," +
-                "\"name\":\"GenericAdapterSetDescription\"," +
-                "\"description\":\"\"," +
-                "\"type\":\"set\"," +
-                "\"editable\":false" +
-                "}" +
-                "]" +
-                "}" +
-                "]";
-    }
+    assertNotNull(result);
+    assertEquals(newAdapterName, result.getName());
+    assertEquals(newEventSchema, result.getEventSchema());
+  }
 }
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataStreamResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataStreamResourceManager.java
index 40e27fee5..76b9a0ab9 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataStreamResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/DataStreamResourceManager.java
@@ -22,7 +22,12 @@ import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.storage.api.IDataStreamStorage;
 import org.apache.streampipes.storage.management.StorageDispatcher;
 
-public class DataStreamResourceManager extends AbstractPipelineElementResourceManager<IDataStreamStorage, SpDataStream, SpDataStream> {
+public class DataStreamResourceManager
+    extends AbstractPipelineElementResourceManager<IDataStreamStorage, SpDataStream, SpDataStream> {
+
+  public DataStreamResourceManager(IDataStreamStorage db) {
+    super(db);
+  }
 
   public DataStreamResourceManager() {
     super(StorageDispatcher.INSTANCE.getNoSqlStore().getDataStreamStorage());
@@ -32,4 +37,11 @@ public class DataStreamResourceManager extends AbstractPipelineElementResourceMa
   protected SpDataStream toInvocation(SpDataStream description) {
     return description instanceof SpDataSet ? new SpDataSet((SpDataSet) description) : new SpDataStream(description);
   }
+
+  /**
+   * Takes a data stream {@link SpDataStream} as an input updates it in the database
+   */
+  public void update(SpDataStream dataStream) {
+    db.updateElement(dataStream);
+  }
 }
diff --git a/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/DataStreamResourceManagerTest.java b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/DataStreamResourceManagerTest.java
new file mode 100644
index 000000000..94dd53988
--- /dev/null
+++ b/streampipes-resource-management/src/test/java/org/apache/streampipes/resource/management/DataStreamResourceManagerTest.java
@@ -0,0 +1,40 @@
+/*
+ *  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.resource.management;
+
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.storage.api.IDataStreamStorage;
+import org.junit.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class DataStreamResourceManagerTest {
+
+  @Test
+  public void update() {
+    IDataStreamStorage storage = mock(IDataStreamStorage.class);
+    DataStreamResourceManager dataStreamResourceManager = new DataStreamResourceManager(storage);
+    dataStreamResourceManager.update(new SpDataStream());
+
+    verify(storage, times(1)).updateElement(any());
+  }
+}
\ No newline at end of file
diff --git a/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
index 77a8984db..60746a6ad 100644
--- a/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
+++ b/ui/cypress/tests/adapter/editAdapter.smoke.spec.ts
@@ -36,6 +36,8 @@ describe('Test Edit Adapter', () => {
     });
 
     it('Perform Test', () => {
+        const newAdapterName = 'Edited Adapter';
+
         ConnectUtils.goToConnect();
 
         // check that edit button is deactivated while adapter is running
@@ -64,6 +66,9 @@ describe('Test Edit Adapter', () => {
 
         ConnectUtils.finishEventSchemaConfiguration();
 
+        cy.dataCy('sp-adapter-name').clear().type(newAdapterName);
+
+
         ConnectBtns.storeEditAdapter().click();
 
         cy.dataCy('info-adapter-successfully-updated', {
@@ -72,7 +77,8 @@ describe('Test Edit Adapter', () => {
 
         ConnectUtils.closeAdapterPreview();
 
-        // Start Adapter
+
+       // Start Adapter
         ConnectBtns.startAdapter().should('not.be.disabled');
         ConnectBtns.startAdapter().click();
 
@@ -83,6 +89,7 @@ describe('Test Edit Adapter', () => {
             .parent()
             .click();
 
+
         // Validate resulting event
         cy.dataCy('sp-connect-adapter-live-preview', { timeout: 10000 }).should(
             'be.visible',
@@ -92,5 +99,10 @@ describe('Test Edit Adapter', () => {
         cy.get('.preview-row', { timeout: 10000 })
             .its('length')
             .should('eq', 3);
+
+        // TODO Validate that name of adapter and data source
+        cy.dataCy('adapter-name').contains(newAdapterName);
+        cy.get('.sp-dialog-content').contains(newAdapterName);
+
     });
 });
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index b3acc3186..e563f5ee4 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -82,7 +82,8 @@
                     mat-sort-header
                     *matHeaderCellDef> Name</th>
                 <td mat-cell *matCellDef="let adapter">
-                  <h4 style="margin-bottom:0;">{{adapter.name}}</h4>
+                  <h4 style="margin-bottom:0;"
+                      data-cy="adapter-name">{{adapter.name}}</h4>
                   <h5>{{adapter.description != '' ? adapter.description : '-'}}</h5>
                 </td>
               </ng-container>