Rename AdapterInterface to StreamPipesAdapter (#1590)

apache · May 25, 2023 · 92b6943 · 92b6943
1 parent eec594f
commit 92b6943
Show file tree

Hide file tree

Showing 36 changed files with 88 additions and 88 deletions.
diff --git a/...pi/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapterConfiguration.java b/...pi/src/main/java/org/apache/streampipes/extensions/api/connect/IAdapterConfiguration.java
@@ -28,7 +28,7 @@ public interface IAdapterConfiguration {
 
   AdapterDescription getAdapterDescription();
 
-  Supplier<AdapterInterface> getSupplier();
+  Supplier<StreamPipesAdapter> getSupplier();
 
   void setAdapterDescription(AdapterDescription adapterDescription);
 }
diff --git a/...ensions/api/connect/AdapterInterface.java → ...sions/api/connect/StreamPipesAdapter.java b/...ensions/api/connect/AdapterInterface.java → ...sions/api/connect/StreamPipesAdapter.java
@@ -25,7 +25,7 @@
 import org.apache.streampipes.model.connect.guess.GuessSchema;
 
 // TODO Rename to IAdapter once the old class can be deleted
-public interface AdapterInterface {
+public interface StreamPipesAdapter {
   IAdapterConfiguration declareConfig();
 
   void onAdapterStarted(IAdapterParameterExtractor extractor,

diff --git a/...in/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java b/...in/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.extensions.management.connect;
 
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterRuntimeContext;
 import org.apache.streampipes.extensions.api.monitoring.SpMonitoringManager;
 import org.apache.streampipes.extensions.management.connect.adapter.model.EventCollector;
@@ -82,7 +82,7 @@ public void stopAdapter(AdapterDescription adapterDescription) throws AdapterExc
 
     String elementId = adapterDescription.getElementId();
 
-    AdapterInterface adapter = RunningAdapterInstances.INSTANCE.removeAdapter(elementId);
+    StreamPipesAdapter adapter = RunningAdapterInstances.INSTANCE.removeAdapter(elementId);
 
     if (adapter != null) {
 

diff --git a/...rg/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java b/...rg/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java
@@ -17,7 +17,7 @@
  */
 package org.apache.streampipes.extensions.management.connect;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 import org.apache.streampipes.extensions.management.locales.LabelGenerator;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
@@ -57,7 +57,7 @@ public Optional<AdapterDescription> getAdapterDescription(String id) {
    * This is a helper method to mock the Declarer Singleton in unit tests
    * @return the registered adapters from the DeclarerSingleton
    */
-  public Collection<AdapterInterface> getRegisteredAdapters() {
+  public Collection<StreamPipesAdapter> getRegisteredAdapters() {
     return DeclarersSingleton.getInstance().getAdapters();
   }
 

diff --git a/.../src/main/java/org/apache/streampipes/extensions/management/connect/RuntimeResovable.java b/.../src/main/java/org/apache/streampipes/extensions/management/connect/RuntimeResovable.java
@@ -18,17 +18,17 @@
 
 package org.apache.streampipes.extensions.management.connect;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 
 import java.util.Map;
 
 public class RuntimeResovable {
   private static final String SP_NS = "https://streampipes.org/vocabulary/v1/";
 
-  public static AdapterInterface getAdapter(String id) {
+  public static StreamPipesAdapter getAdapter(String id) {
     id = id.replaceAll("sp:", SP_NS);
-    Map<String, AdapterInterface> allAdapters = DeclarersSingleton.getInstance().getAdapterMap();
+    Map<String, StreamPipesAdapter> allAdapters = DeclarersSingleton.getInstance().getAdapterMap();
 
     if (allAdapters.containsKey(id)) {
       return allAdapters.get(id);

diff --git a/...t/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java b/...t/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java
@@ -20,7 +20,7 @@
 
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
 import org.apache.streampipes.dataformat.SpDataFormatManager;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
@@ -66,7 +66,7 @@ public class DeclarersSingleton implements IDeclarersSingleton {
   private Map<String, TransportProtocol> supportedProtocols;
   private Map<String, TransportFormat> supportedFormats;
 
-  private Map<String, AdapterInterface> adapters;
+  private Map<String, StreamPipesAdapter> adapters;
 
   private String serviceId;
 
@@ -253,19 +253,19 @@ public Map<String, IStreamPipesFunctionDeclarer> getFunctions() {
     return functions;
   }
 
-  public Collection<AdapterInterface> getAdapters() {
+  public Collection<StreamPipesAdapter> getAdapters() {
     return adapters.values();
   }
 
-  public Map<String, AdapterInterface> getAdapterMap() {
+  public Map<String, StreamPipesAdapter> getAdapterMap() {
     return adapters;
   }
 
-  public void setAdapters(List<AdapterInterface> adapters) {
+  public void setAdapters(List<StreamPipesAdapter> adapters) {
     adapters.forEach(a -> this.adapters.put(a.declareConfig().getAdapterDescription().getAppId(), a));
   }
 
-  public Optional<AdapterInterface> getAdapter(String id) {
+  public Optional<StreamPipesAdapter> getAdapter(String id) {
     return getAdapters().stream()
         .filter(adapter -> adapter.declareConfig()
             .getAdapterDescription()

diff --git a/.../src/main/java/org/apache/streampipes/extensions/management/init/IDeclarersSingleton.java b/.../src/main/java/org/apache/streampipes/extensions/management/init/IDeclarersSingleton.java
@@ -18,10 +18,10 @@
 
 package org.apache.streampipes.extensions.management.init;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 
 import java.util.Optional;
 
 public interface IDeclarersSingleton {
-  Optional<AdapterInterface> getAdapter(String id);
+  Optional<StreamPipesAdapter> getAdapter(String id);
 }
diff --git a/.../main/java/org/apache/streampipes/extensions/management/init/RunningAdapterInstances.java b/.../main/java/org/apache/streampipes/extensions/management/init/RunningAdapterInstances.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.extensions.management.init;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.model.connect.adapter.AdapterDescription;
 
 import java.util.Collection;
@@ -28,16 +28,16 @@
 public enum RunningAdapterInstances {
   INSTANCE;
 
-  private final Map<String, AdapterInterface> runningAdapterInstances = new HashMap<>();
+  private final Map<String, StreamPipesAdapter> runningAdapterInstances = new HashMap<>();
   private final Map<String, AdapterDescription> runningAdapterDescriptionInstances = new HashMap<>();
 
-  public void addAdapter(String elementId, AdapterInterface adapter, AdapterDescription adapterDescription) {
+  public void addAdapter(String elementId, StreamPipesAdapter adapter, AdapterDescription adapterDescription) {
     runningAdapterInstances.put(elementId, adapter);
     runningAdapterDescriptionInstances.put(elementId, adapterDescription);
   }
 
-  public AdapterInterface removeAdapter(String elementId) {
-    AdapterInterface result = runningAdapterInstances.get(elementId);
+  public StreamPipesAdapter removeAdapter(String elementId) {
+    StreamPipesAdapter result = runningAdapterInstances.get(elementId);
     runningAdapterInstances.remove(elementId);
     runningAdapterDescriptionInstances.remove(elementId);
     return result;

diff --git a/...src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java b/...src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java
@@ -18,7 +18,7 @@
 package org.apache.streampipes.extensions.management.model;
 
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
 import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
@@ -43,7 +43,7 @@ public class SpServiceDefinition {
   private List<SpProtocolDefinitionFactory<?>> protocolDefinitionFactories;
   private List<IStreamPipesFunctionDeclarer> functions;
 
-  private List<AdapterInterface> adapters;
+  private List<StreamPipesAdapter> adapters;
 
   private Map<String, ConfigItem> kvConfigs;
 
@@ -125,11 +125,11 @@ public void addConfig(ConfigItem configItem) {
     this.kvConfigs.put(configItem.getKey(), configItem);
   }
 
-  public void addAdapter(AdapterInterface adapter) {
+  public void addAdapter(StreamPipesAdapter adapter) {
     this.adapters.add(adapter);
   }
 
-  public void addAdapters(List<AdapterInterface> adapters) {
+  public void addAdapters(List<StreamPipesAdapter> adapters) {
     this.adapters.addAll(adapters);
   }
 
@@ -169,7 +169,7 @@ public List<IStreamPipesFunctionDeclarer> getFunctions() {
     return functions;
   }
 
-  public List<AdapterInterface> getAdapters() {
+  public List<StreamPipesAdapter> getAdapters() {
     return adapters;
   }
 }
diff --git a/...n/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java b/...n/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java
@@ -18,7 +18,7 @@
 package org.apache.streampipes.extensions.management.model;
 
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
 import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
@@ -96,7 +96,7 @@ public SpServiceDefinitionBuilder registerPipelineElements(Declarer<?>... declar
     return this;
   }
 
-  public SpServiceDefinitionBuilder registerAdapter(AdapterInterface adapter) {
+  public SpServiceDefinitionBuilder registerAdapter(StreamPipesAdapter adapter) {
     this.serviceDefinition.addAdapter(adapter);
     return this;
   }

diff --git a/...rc/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java b/...rc/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java
@@ -17,7 +17,7 @@
  */
 package org.apache.streampipes.extensions.management.util;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
@@ -51,7 +51,7 @@ private static SpServiceTagPrefix getPrefix(NamedStreamPipesEntity entity) {
     }
   }
 
-  public static List<SpServiceTag> extractAppIdsFromAdapters(Collection<AdapterInterface> adapters) {
+  public static List<SpServiceTag> extractAppIdsFromAdapters(Collection<StreamPipesAdapter> adapters) {
     return adapters
         .stream()
         .map(d -> SpServiceTag.create(

diff --git a/...pache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProviderTest.java b/...pache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProviderTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.extensions.management.connect;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
 
 import org.junit.Before;
@@ -42,15 +42,15 @@ public class ConnectWorkerDescriptionProviderTest {
   public void initializeProvider() {
     provider = spy(new ConnectWorkerDescriptionProvider());
 
-    var testAdapter = mock(AdapterInterface.class);
+    var testAdapter = mock(StreamPipesAdapter.class);
     doAnswer(invocation ->
         AdapterConfigurationBuilder
             .create(adapterId, null)
             .buildConfiguration())
         .when(testAdapter)
         .declareConfig();
 
-    List<AdapterInterface> adapters = List.of(testAdapter);
+    List<StreamPipesAdapter> adapters = List.of(testAdapter);
     doReturn(adapters).when(provider).getRegisteredAdapters();
   }
 

diff --git a/...c/test/java/org/apache/streampipes/extensions/management/init/DeclarersSingletonTest.java b/...c/test/java/org/apache/streampipes/extensions/management/init/DeclarersSingletonTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.extensions.management.init;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
 
 import org.junit.Test;
@@ -35,7 +35,7 @@ public class DeclarersSingletonTest {
   @Test
   public void getAdapterTest() {
     var id = "id";
-    var testAdapter = mock(AdapterInterface.class);
+    var testAdapter = mock(StreamPipesAdapter.class);
     doAnswer(invocation ->
         AdapterConfigurationBuilder
             .create(id, null)

diff --git a/...va/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilderTest.java b/...va/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilderTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.extensions.management.model;
 
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterGuessSchemaContext;
@@ -43,7 +43,7 @@ public void registerAdapter() {
     assertEquals(expected, result.getAdapters().get(0));
   }
 
-  private static class TestAdapter implements AdapterInterface {
+  private static class TestAdapter implements StreamPipesAdapter {
 
     @Override
     public IAdapterConfiguration declareConfig() {

diff --git a/...s-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java b/...s-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java
@@ -22,7 +22,7 @@
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
 import org.apache.streampipes.connect.iiot.adapters.opcua.configuration.SpOpcUaConfigBuilder;
 import org.apache.streampipes.connect.iiot.adapters.opcua.utils.OpcUaUtil;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.IPullAdapter;
@@ -74,7 +74,7 @@
 import static org.apache.streampipes.connect.iiot.adapters.opcua.utils.OpcUaUtil.OpcUaLabels.OPC_URL;
 import static org.apache.streampipes.connect.iiot.adapters.opcua.utils.OpcUaUtil.getSchema;
 
-public class OpcUaAdapter implements AdapterInterface, IPullAdapter, SupportsRuntimeConfig {
+public class OpcUaAdapter implements StreamPipesAdapter, IPullAdapter, SupportsRuntimeConfig {
 
   public static final String ID = "org.apache.streampipes.connect.iiot.adapters.opcua";
   private static final Logger LOG = LoggerFactory.getLogger(OpcUaAdapter.class);

diff --git a/...in/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java b/...in/java/org/apache/streampipes/connect/iiot/adapters/plc4x/modbus/Plc4xModbusAdapter.java
@@ -20,7 +20,7 @@
 
 
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.IPullAdapter;
@@ -65,7 +65,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-public class Plc4xModbusAdapter implements AdapterInterface, IPullAdapter {
+public class Plc4xModbusAdapter implements StreamPipesAdapter, IPullAdapter {
 
   private static final Logger LOG = LoggerFactory.getLogger(Plc4xModbusAdapter.class);
   /**

diff --git a/...t/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java b/...t/src/main/java/org/apache/streampipes/connect/iiot/adapters/plc4x/s7/Plc4xS7Adapter.java
@@ -20,7 +20,7 @@
 
 
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.IPullAdapter;
@@ -66,7 +66,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-public class Plc4xS7Adapter implements AdapterInterface, IPullAdapter, PlcReadResponseHandler {
+public class Plc4xS7Adapter implements StreamPipesAdapter, IPullAdapter, PlcReadResponseHandler {
 
   /**
    * A unique id to identify the Plc4xS7Adapter

diff --git a/...iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java b/...iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
@@ -20,7 +20,7 @@
 
 
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterGuessSchemaContext;
@@ -56,7 +56,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-public class RosBridgeAdapter implements AdapterInterface, ResolvesContainerProvidedOptions {
+public class RosBridgeAdapter implements StreamPipesAdapter, ResolvesContainerProvidedOptions {
 
   public static final String ID = "org.apache.streampipes.connect.iiot.adapters.ros";
 

diff --git a/...ache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorAdapter.java b/...ache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorAdapter.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.connect.iiot.adapters.simulator.machine;
 
 import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import org.apache.streampipes.extensions.api.connect.AdapterInterface;
+import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
 import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
 import org.apache.streampipes.extensions.api.connect.IEventCollector;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterGuessSchemaContext;
@@ -33,7 +33,7 @@
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.utils.Assets;
 
-public class MachineDataSimulatorAdapter implements AdapterInterface {
+public class MachineDataSimulatorAdapter implements StreamPipesAdapter {
 
   private static final String ID = "org.apache.streampipes.connect.iiot.adapters.simulator.machine";
   private static final String WAIT_TIME_MS = "wait-time-ms";