[#1289] Fix icons for adapters

apache · Apr 3, 2023 · f64a517 · f64a517
1 parent 1b6ce08
commit f64a517
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
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,9 +17,8 @@
  */
 package org.apache.streampipes.extensions.management.util;
 
-import org.apache.streampipes.extensions.api.connect.IAdapter;
-import org.apache.streampipes.extensions.api.connect.IProtocol;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
+import org.apache.streampipes.extensions.management.connect.AdapterInterface;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -52,17 +51,15 @@ private static SpServiceTagPrefix getPrefix(NamedStreamPipesEntity entity) {
     }
   }
 
-  public static List<SpServiceTag> extractAppIdsFromAdapters(Collection<IAdapter> adapters) {
+  public static List<SpServiceTag> extractAppIdsFromAdapters(Collection<AdapterInterface> adapters) {
     return adapters
         .stream()
-        .map(d -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, d.declareModel().getAppId()))
+        .map(d -> SpServiceTag.create(
+                SpServiceTagPrefix.ADAPTER,
+                d.declareConfig().getAdapterDescription().getAppId()
+            )
+        )
         .collect(Collectors.toList());
   }
 
-  public static List<SpServiceTag> extractAppIdsFromProtocols(Collection<IProtocol> protocols) {
-    return protocols
-        .stream()
-        .map(p -> SpServiceTag.create(SpServiceTagPrefix.ADAPTER, p.declareModel().getAppId()))
-        .collect(Collectors.toList());
-  }
 }
diff --git a/...org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointGenerator.java b/...org/apache/streampipes/manager/execution/endpoint/ExtensionsServiceEndpointGenerator.java
@@ -33,8 +33,8 @@ public class ExtensionsServiceEndpointGenerator {
 
   private static final Logger LOG = LoggerFactory.getLogger(ExtensionsServiceEndpointGenerator.class);
 
-  private String appId;
-  private SpServiceUrlProvider spServiceUrlProvider;
+  private final String appId;
+  private final SpServiceUrlProvider spServiceUrlProvider;
 
   public ExtensionsServiceEndpointGenerator(String appId,
                                             SpServiceUrlProvider spServiceUrlProvider) {
@@ -56,8 +56,18 @@ public String getEndpointBaseUrl() throws NoServiceEndpointsAvailableException {
   }
 
   private List<String> getServiceEndpoints() {
-    return SpServiceDiscovery.getServiceDiscovery().getServiceEndpoints(DefaultSpServiceGroups.EXT, true,
-        Collections.singletonList(this.spServiceUrlProvider.getServiceTag(appId).asString()));
+    return SpServiceDiscovery
+        .getServiceDiscovery()
+        .getServiceEndpoints(
+            DefaultSpServiceGroups.EXT,
+            true,
+            Collections
+                .singletonList(
+                    this.spServiceUrlProvider
+                        .getServiceTag(appId)
+                        .asString()
+                )
+        );
   }
 
   private String selectService() throws NoServiceEndpointsAvailableException {

diff --git a/...xtensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java b/...xtensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java
@@ -18,9 +18,8 @@
 
 package org.apache.streampipes.service.extensions;
 
-import org.apache.streampipes.extensions.api.connect.IAdapter;
-import org.apache.streampipes.extensions.api.connect.IProtocol;
 import org.apache.streampipes.extensions.api.declarer.Declarer;
+import org.apache.streampipes.extensions.management.connect.AdapterInterface;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 import org.apache.streampipes.extensions.management.util.ServiceDefinitionUtil;
 import org.apache.streampipes.svcdiscovery.api.model.DefaultSpServiceTags;
@@ -49,11 +48,8 @@ private List<SpServiceTag> extractPipelineElementServiceTags() {
   }
 
   private List<SpServiceTag> extractAdapterServiceTags() {
-    var tags = new ArrayList<SpServiceTag>();
-    Collection<IAdapter> adapters = DeclarersSingleton.getInstance().getAllAdapters();
-    Collection<IProtocol> protocols = DeclarersSingleton.getInstance().getAllProtocols();
-    tags.addAll(ServiceDefinitionUtil.extractAppIdsFromAdapters(adapters));
-    tags.addAll(ServiceDefinitionUtil.extractAppIdsFromProtocols(protocols));
+    Collection<AdapterInterface> adapters = DeclarersSingleton.getInstance().getAdapters();
+    var tags = new ArrayList<>(ServiceDefinitionUtil.extractAppIdsFromAdapters(adapters));
     tags.add(DefaultSpServiceTags.CONNECT_WORKER);
 
     return tags;