This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 2acb5b7542 refactor(#4009): remove deprecated field adapter type from
adapter description (#4010)
2acb5b7542 is described below
commit 2acb5b7542a0df8d2c18a8c07336f869f4c48a79
Author: Philipp Zehnder <[email protected]>
AuthorDate: Thu Dec 4 17:22:49 2025 +0100
refactor(#4009): remove deprecated field adapter type from adapter
description (#4010)
---
.../__classNamePrefix__GenericAdapter.java | 1 -
.../__classNamePrefix__SpecificAdapter.java | 1 -
.../connect/iiot/adapters/oi4/Oi4Adapter.java | 2 -
.../iiot/protocol/stream/FileReplayAdapter.java | 2 -
.../iiot/protocol/stream/HttpServerProtocol.java | 2 -
.../iiot/protocol/stream/HttpStreamProtocol.java | 2 -
.../connect/adapters/iss/IssAdapter.java | 2 -
.../connectors/kafka/adapter/KafkaProtocol.java | 2 -
.../connectors/mqtt/adapter/MqttProtocol.java | 2 -
.../connectors/nats/adapter/NatsProtocol.java | 2 -
.../connectors/opcua/adapter/OpcUaAdapter.java | 2 -
.../config/OpcUaAdapterVersionedConfig.java | 2 -
.../config/AdapterConfigurationProvider.java | 2 -
.../plc/adapter/modbus/Plc4xModbusAdapter.java | 2 -
.../connectors/plc/adapter/s7/Plc4xS7Adapter.java | 2 -
.../config/Plc4xModbusAdapterVersionedConfig.java | 2 -
.../connectors/pulsar/adapter/PulsarProtocol.java | 2 -
.../rocketmq/adapter/RocketMQProtocol.java | 2 -
.../connectors/ros/adapter/RosBridgeAdapter.java | 2 -
.../config/RosBridgeAdapterVersionedConfig.java | 3 -
.../connectors/tubemq/adapter/TubeMQProtocol.java | 2 -
.../org/apache/streampipes/model/AdapterType.java | 64 ----------------------
.../streampipes/model/DataProcessorType.java | 4 +-
.../org/apache/streampipes/model/DataSinkType.java | 4 +-
.../model/connect/adapter/AdapterDescription.java | 14 -----
.../rest/impl/PipelineElementCategory.java | 6 --
.../adapter/AdapterConfigurationBuilder.java | 16 ------
.../adapter/AdapterConfigurationBuilderTest.java | 15 -----
.../couchdb/serializer/AdapterTypeAdapter.java | 45 ---------------
.../storage/couchdb/serializer/GsonSerializer.java | 2 -
.../src/lib/apis/adapter.service.ts | 4 --
.../src/lib/model/gen/streampipes-model-client.ts | 6 +-
.../src/lib/model/gen/streampipes-model.ts | 23 +-------
.../adapter-catalog/adapter-catalog.component.html | 2 +-
.../filter-toolbar/filter-toolbar.component.ts | 28 +---------
ui/src/app/connect/filter/adapter-filter.pipe.ts | 23 +-------
.../connect/model/adapter-filter-settings.model.ts | 2 -
37 files changed, 12 insertions(+), 287 deletions(-)
diff --git
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
index 6e1fa3f6d8..221e16f553 100644
---
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
+++
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
@@ -54,7 +54,6 @@ public class ${classNamePrefix}GenericAdapter implements
StreamPipesAdapter {
0,
${classNamePrefix}GenericAdapter::new
)
- .withCategory(AdapterType.Manufacturing)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
.withSupportedParsers(Parsers.defaultParsers())
diff --git
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
index 3b167f45dd..e4847b74c3 100644
---
a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
+++
b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
@@ -54,7 +54,6 @@ public class ${classNamePrefix}SpecificAdapter implements
StreamPipesAdapter {
0,
${classNamePrefix}SpecificAdapter::new
)
- .withCategory(AdapterType.Manufacturing)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
.requiredTextParameter(Labels.withId(EXAMPLE_KEY))
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/oi4/Oi4Adapter.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/oi4/Oi4Adapter.java
index b83a98a249..0a048b8bd4 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/oi4/Oi4Adapter.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/oi4/Oi4Adapter.java
@@ -35,7 +35,6 @@ import
org.apache.streampipes.extensions.connectors.mqtt.shared.MqttConsumer;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.JsonParsers;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.json.JsonObjectParser;
import org.apache.streampipes.messaging.InternalEventProcessor;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.schema.EventSchema;
@@ -102,7 +101,6 @@ public class Oi4Adapter implements StreamPipesAdapter {
.create(ID, 1, Oi4Adapter::new)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
.requiredTextParameter(MqttConnectUtils.getBrokerUrlLabel())
.requiredAlternatives(MqttConnectUtils.getAccessModeLabel(),
MqttConnectUtils.getAnonymousAccess(),
MqttConnectUtils.getUsernameAccess(),
MqttConnectUtils.getClientCertAccess()
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileReplayAdapter.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileReplayAdapter.java
index a5a42a4c09..4640abbb97 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileReplayAdapter.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/FileReplayAdapter.java
@@ -32,7 +32,6 @@ import
org.apache.streampipes.extensions.management.connect.adapter.parser.CsvPa
import
org.apache.streampipes.extensions.management.connect.adapter.parser.ImageParser;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.JsonParsers;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.xml.XmlParser;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -101,7 +100,6 @@ public class FileReplayAdapter implements
StreamPipesAdapter {
)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic)
.requiredFile(
Labels.withId(FILE_PATH),
Filetypes.CSV,
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpServerProtocol.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpServerProtocol.java
index ed49af0e31..628be9f2ec 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpServerProtocol.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpServerProtocol.java
@@ -30,7 +30,6 @@ import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.management.connect.HttpServerAdapterManagement;
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.schema.EventProperty;
@@ -104,7 +103,6 @@ public class HttpServerProtocol implements
StreamPipesAdapter {
.withSupportedParsers(Parsers.defaultParsers())
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Generic)
.requiredTextParameter(Labels.withId(ENDPOINT_NAME))
.requiredAlternatives(Labels.withId(CONFIGURE),
Alternatives.from(Labels.withId(MANUALLY),
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
index 2033e280b6..bd36873f8e 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/HttpStreamProtocol.java
@@ -32,7 +32,6 @@ import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.management.connect.PullAdapterScheduler;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
import
org.apache.streampipes.extensions.management.connect.adapter.util.PollingSettings;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -110,7 +109,6 @@ public class HttpStreamProtocol implements
StreamPipesAdapter, IPullAdapter {
.withSupportedParsers(Parsers.defaultParsers())
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic)
.requiredTextParameter(Labels.withId(URL_PROPERTY))
.requiredIntegerParameter(Labels.withId(INTERVAL_PROPERTY))
.buildConfiguration();
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
index 29d82ec99f..8be0ab8d60 100644
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
+++
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
@@ -29,7 +29,6 @@ import
org.apache.streampipes.extensions.api.connect.context.IAdapterRuntimeCont
import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtractor;
import
org.apache.streampipes.extensions.management.connect.PullAdapterScheduler;
import
org.apache.streampipes.extensions.management.connect.adapter.util.PollingSettings;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -106,7 +105,6 @@ public class IssAdapter implements StreamPipesAdapter,
IPullAdapter {
return AdapterConfigurationBuilder.create(ID, 0, IssAdapter::new)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.OpenData)
.buildConfiguration();
}
diff --git
a/streampipes-extensions/streampipes-connectors-kafka/src/main/java/org/apache/streampipes/extensions/connectors/kafka/adapter/KafkaProtocol.java
b/streampipes-extensions/streampipes-connectors-kafka/src/main/java/org/apache/streampipes/extensions/connectors/kafka/adapter/KafkaProtocol.java
index ae8965cc08..1ca7c4357a 100644
---
a/streampipes-extensions/streampipes-connectors-kafka/src/main/java/org/apache/streampipes/extensions/connectors/kafka/adapter/KafkaProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-kafka/src/main/java/org/apache/streampipes/extensions/connectors/kafka/adapter/KafkaProtocol.java
@@ -37,7 +37,6 @@ import
org.apache.streampipes.extensions.connectors.kafka.shared.kafka.KafkaConf
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
import org.apache.streampipes.messaging.kafka.SpKafkaConsumer;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
@@ -144,7 +143,6 @@ public class KafkaProtocol implements StreamPipesAdapter,
SupportsRuntimeConfig
.withSupportedParsers(Parsers.defaultParsers())
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
.requiredAlternatives(KafkaConfigProvider.getAccessModeLabel(),
KafkaConfigProvider.getAlternativeUnauthenticatedPlain(),
diff --git
a/streampipes-extensions/streampipes-connectors-mqtt/src/main/java/org/apache/streampipes/extensions/connectors/mqtt/adapter/MqttProtocol.java
b/streampipes-extensions/streampipes-connectors-mqtt/src/main/java/org/apache/streampipes/extensions/connectors/mqtt/adapter/MqttProtocol.java
index e50a234a1b..9d013e5104 100644
---
a/streampipes-extensions/streampipes-connectors-mqtt/src/main/java/org/apache/streampipes/extensions/connectors/mqtt/adapter/MqttProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-mqtt/src/main/java/org/apache/streampipes/extensions/connectors/mqtt/adapter/MqttProtocol.java
@@ -31,7 +31,6 @@ import
org.apache.streampipes.extensions.connectors.mqtt.shared.MqttConsumer;
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
import org.apache.streampipes.messaging.InternalEventProcessor;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -69,7 +68,6 @@ public class MqttProtocol implements StreamPipesAdapter {
.withSupportedParsers(Parsers.defaultParsers())
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
.requiredTextParameter(MqttConnectUtils.getBrokerUrlLabel())
.requiredAlternatives(MqttConnectUtils.getAccessModeLabel(),
MqttConnectUtils.getAnonymousAccess(),
MqttConnectUtils.getUsernameAccess(),
MqttConnectUtils.getClientCertAccess())
diff --git
a/streampipes-extensions/streampipes-connectors-nats/src/main/java/org/apache/streampipes/extensions/connectors/nats/adapter/NatsProtocol.java
b/streampipes-extensions/streampipes-connectors-nats/src/main/java/org/apache/streampipes/extensions/connectors/nats/adapter/NatsProtocol.java
index 89d26c5414..d64378000a 100644
---
a/streampipes-extensions/streampipes-connectors-nats/src/main/java/org/apache/streampipes/extensions/connectors/nats/adapter/NatsProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-nats/src/main/java/org/apache/streampipes/extensions/connectors/nats/adapter/NatsProtocol.java
@@ -33,7 +33,6 @@ import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventP
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
import org.apache.streampipes.messaging.InternalEventProcessor;
import org.apache.streampipes.messaging.nats.NatsConsumer;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.nats.NatsConfig;
@@ -110,7 +109,6 @@ public class NatsProtocol implements StreamPipesAdapter {
return AdapterConfigurationBuilder
.create(ID, 0, NatsProtocol::new)
.withSupportedParsers(Parsers.defaultParsers())
- .withCategory(AdapterType.Generic)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.requiredTextParameter(Labels.withId(URLS_KEY), false, false)
diff --git
a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
index d9c6f4d7b0..c73a8b2926 100644
---
a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
+++
b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
@@ -38,7 +38,6 @@ import
org.apache.streampipes.extensions.connectors.opcua.model.node.OpcUaNode;
import org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaUtils;
import
org.apache.streampipes.extensions.management.connect.PullAdapterScheduler;
import
org.apache.streampipes.extensions.management.connect.adapter.util.PollingSettings;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
@@ -240,7 +239,6 @@ public class OpcUaAdapter implements StreamPipesAdapter,
IPullAdapter, SupportsR
var builder = AdapterConfigurationBuilder.create(ID, 6, () -> new
OpcUaAdapter(clientProvider))
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
.requiredAlternatives(Labels.withId(ADAPTER_TYPE),
Alternatives.from(Labels.withId(PULL_MODE),
SharedUserConfiguration.getPullModeGroup()
diff --git
a/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
index 6d82bcfff8..fd976f6fca 100644
---
a/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
+++
b/streampipes-extensions/streampipes-connectors-opcua/src/test/java/org/apache/streampipes/extensions/connectors/opcua/migration/config/OpcUaAdapterVersionedConfig.java
@@ -20,7 +20,6 @@ package
org.apache.streampipes.extensions.connectors.opcua.migration.config;
import org.apache.streampipes.extensions.connectors.opcua.adapter.OpcUaAdapter;
import
org.apache.streampipes.extensions.connectors.opcua.client.OpcUaClientProvider;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.StaticProperties;
@@ -56,7 +55,6 @@ public class OpcUaAdapterVersionedConfig {
var builder = AdapterConfigurationBuilder.create(ID, 1, () -> new
OpcUaAdapter(new OpcUaClientProvider()))
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic, AdapterType.Manufacturing)
.requiredAlternatives(Labels.withId(ADAPTER_TYPE),
Alternatives.from(Labels.withId(PULL_MODE),
StaticProperties.integerFreeTextProperty(
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/AdapterConfigurationProvider.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/AdapterConfigurationProvider.java
index 1877ce3922..40fecaac56 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/AdapterConfigurationProvider.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/AdapterConfigurationProvider.java
@@ -21,7 +21,6 @@ package
org.apache.streampipes.extensions.connectors.plc.adapter.generic.config;
import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.GenericPlc4xAdapter;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.assets.PlcAdapterAssetResolver;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.staticproperty.Option;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -59,7 +58,6 @@ public class AdapterConfigurationProvider {
.withAssetResolver(
new
PlcAdapterAssetResolver("org.apache.streampipes.connect.iiot.adapters.plc4x.generic",
appId, driver)
)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(PLC_IP))
.requiredIntegerParameter(Labels.withId(PLC_POLLING_INTERVAL), 1000)
.requiredSingleValueSelection(
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
index 0e92d06e76..00d1b66367 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/modbus/Plc4xModbusAdapter.java
@@ -30,7 +30,6 @@ import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.management.connect.PullAdapterScheduler;
import
org.apache.streampipes.extensions.management.connect.adapter.util.PollingSettings;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.schema.EventProperty;
@@ -272,7 +271,6 @@ public class Plc4xModbusAdapter implements
StreamPipesAdapter, IPullAdapter {
return AdapterConfigurationBuilder.create(ID, 1, () -> new
Plc4xModbusAdapter(connectionManager))
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(PLC_IP)).requiredIntegerParameter(Labels.withId(PLC_PORT))
.requiredTextParameter(Labels.withId(PLC_NODE_ID)).requiredCollection(Labels.withId(PLC_NODES),
StaticProperties.stringFreeTextProperty(Labels.withId(PLC_NODE_RUNTIME_NAME)),
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/Plc4xS7Adapter.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/Plc4xS7Adapter.java
index 9355b9f79f..1da84ce07a 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/Plc4xS7Adapter.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/s7/Plc4xS7Adapter.java
@@ -34,7 +34,6 @@ import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.connecti
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.model.Plc4xConnectionSettings;
import
org.apache.streampipes.extensions.connectors.plc.adapter.s7.config.ConfigurationParser;
import
org.apache.streampipes.extensions.management.connect.PullAdapterScheduler;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.schema.EventProperty;
@@ -114,7 +113,6 @@ public class Plc4xS7Adapter implements StreamPipesAdapter {
return AdapterConfigurationBuilder.create(ID, 1, () -> new
Plc4xS7Adapter(connectionManager))
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(PLC_IP))
.requiredIntegerParameter(Labels.withId(PLC_POLLING_INTERVAL), 1000)
.requiredAlternatives(
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
index d88fbbb923..fca6e86870 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/test/java/org/apache/streampipes/extensions/connectors/plc/adapter/migration/config/Plc4xModbusAdapterVersionedConfig.java
@@ -19,7 +19,6 @@
package
org.apache.streampipes.extensions.connectors.plc.adapter.migration.config;
import
org.apache.streampipes.extensions.connectors.plc.adapter.modbus.Plc4xModbusAdapter;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.StaticProperties;
@@ -43,7 +42,6 @@ public class Plc4xModbusAdapterVersionedConfig {
return AdapterConfigurationBuilder.create(ID, 0, () -> new
Plc4xModbusAdapter(null))
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(PLC_IP))
.requiredTextParameter(Labels.withId(PLC_PORT))
.requiredTextParameter(Labels.withId(PLC_NODE_ID))
diff --git
a/streampipes-extensions/streampipes-connectors-pulsar/src/main/java/org/apache/streampipes/extensions/connectors/pulsar/adapter/PulsarProtocol.java
b/streampipes-extensions/streampipes-connectors-pulsar/src/main/java/org/apache/streampipes/extensions/connectors/pulsar/adapter/PulsarProtocol.java
index 1fca92ca4f..f142ae705a 100644
---
a/streampipes-extensions/streampipes-connectors-pulsar/src/main/java/org/apache/streampipes/extensions/connectors/pulsar/adapter/PulsarProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-pulsar/src/main/java/org/apache/streampipes/extensions/connectors/pulsar/adapter/PulsarProtocol.java
@@ -30,7 +30,6 @@ import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import org.apache.streampipes.extensions.api.runtime.SupportsRuntimeConfig;
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.staticproperty.StaticProperty;
@@ -98,7 +97,6 @@ public class PulsarProtocol implements StreamPipesAdapter,
SupportsRuntimeConfig
.withSupportedParsers(Parsers.defaultParsers())
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic)
.requiredTextParameter(Labels.withId(PULSAR_BROKER_HOST))
.requiredIntegerParameter(Labels.withId(PULSAR_BROKER_PORT), 6650)
.requiredTextParameter(Labels.withId(PULSAR_TOPIC))
diff --git
a/streampipes-extensions/streampipes-connectors-rocketmq/src/main/java/org/apache/streampipes/extensions/connectors/rocketmq/adapter/RocketMQProtocol.java
b/streampipes-extensions/streampipes-connectors-rocketmq/src/main/java/org/apache/streampipes/extensions/connectors/rocketmq/adapter/RocketMQProtocol.java
index 23d85113da..814da420d7 100644
---
a/streampipes-extensions/streampipes-connectors-rocketmq/src/main/java/org/apache/streampipes/extensions/connectors/rocketmq/adapter/RocketMQProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-rocketmq/src/main/java/org/apache/streampipes/extensions/connectors/rocketmq/adapter/RocketMQProtocol.java
@@ -29,7 +29,6 @@ import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -77,7 +76,6 @@ public class RocketMQProtocol implements StreamPipesAdapter {
.withSupportedParsers(Parsers.defaultParsers())
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic)
.requiredTextParameter(Labels.withId(ENDPOINT_KEY))
.requiredTextParameter(Labels.withId(TOPIC_KEY))
.requiredTextParameter(Labels.withId(CONSUMER_GROUP_KEY))
diff --git
a/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
index 8f825815d6..68458282eb 100644
---
a/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
@@ -30,7 +30,6 @@ import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.ParserUtils;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.staticproperty.Option;
@@ -95,7 +94,6 @@ public class RosBridgeAdapter implements StreamPipesAdapter,
ResolvesContainerPr
return AdapterConfigurationBuilder.create(ID, 1, RosBridgeAdapter::new)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
.requiredSingleValueSelectionFromContainer(
diff --git
a/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
index 4b27a5385e..d99db026b9 100644
---
a/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.connectors.ros.migrations.config;
import org.apache.streampipes.connectors.ros.adapter.RosBridgeAdapter;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -39,7 +38,6 @@ public class RosBridgeAdapterVersionedConfig {
return AdapterConfigurationBuilder.create(RosBridgeAdapter.ID, 0,
RosBridgeAdapter::new)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredTextParameter(Labels.withId(ROS_PORT_KEY))
.requiredSingleValueSelectionFromContainer(
@@ -51,7 +49,6 @@ public class RosBridgeAdapterVersionedConfig {
return AdapterConfigurationBuilder.create(RosBridgeAdapter.ID, 1,
RosBridgeAdapter::new)
.withLocales(Locales.EN)
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
- .withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
.requiredSingleValueSelectionFromContainer(
diff --git
a/streampipes-extensions/streampipes-connectors-tubemq/src/main/java/org/apache/streampipes/extensions/connectors/tubemq/adapter/TubeMQProtocol.java
b/streampipes-extensions/streampipes-connectors-tubemq/src/main/java/org/apache/streampipes/extensions/connectors/tubemq/adapter/TubeMQProtocol.java
index 1addf73de6..fdaa195bf9 100644
---
a/streampipes-extensions/streampipes-connectors-tubemq/src/main/java/org/apache/streampipes/extensions/connectors/tubemq/adapter/TubeMQProtocol.java
+++
b/streampipes-extensions/streampipes-connectors-tubemq/src/main/java/org/apache/streampipes/extensions/connectors/tubemq/adapter/TubeMQProtocol.java
@@ -29,7 +29,6 @@ import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import
org.apache.streampipes.extensions.management.connect.adapter.BrokerEventProcessor;
import
org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
@@ -106,7 +105,6 @@ public class TubeMQProtocol implements StreamPipesAdapter {
.withSupportedParsers(Parsers.defaultParsers())
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
- .withCategory(AdapterType.Generic)
.requiredTextParameter(
Labels.withId(MASTER_HOST_AND_PORT_KEY))
.requiredTextParameter(Labels.withId(TOPIC_KEY))
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
deleted file mode 100644
index 37bbdf93f3..0000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/AdapterType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.model;
-
-import org.apache.streampipes.model.shared.annotation.TsModel;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.JsonNode;
-
-@TsModel
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
-public enum AdapterType {
-
- Generic("Generic Adapters", ""),
- Finance("Finance", ""),
- Environment("Environmental Data", ""),
- News("News", ""),
- SocialMedia("Social Media", ""),
- OpenData("Open Data", ""),
- Manufacturing("Production & Manufacturing", ""),
- Energy("Energy", ""),
- Debugging("Testing & Debugging", "");
-
- private final String label;
- private final String description;
-
- AdapterType(String label, String description) {
- this.label = label;
- this.description = description;
- }
-
- @JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
- }
-
- public String getCode() {
- return this.name();
- }
-
- public String getLabel() {
- return label;
- }
-
- public String getDescription() {
- return description;
- }
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
index 7dc650636b..d6f0bf1cab 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/DataProcessorType.java
@@ -55,8 +55,8 @@ public enum DataProcessorType {
}
@JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
+ public static DataProcessorType fromString(JsonNode json) {
+ return DataProcessorType.valueOf(json.get("code").asText());
}
public String getCode() {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
index 64b6417b3f..c42342a288 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/DataSinkType.java
@@ -48,8 +48,8 @@ public enum DataSinkType {
}
@JsonCreator
- public static AdapterType fromString(JsonNode json) {
- return AdapterType.valueOf(json.get("code").asText());
+ public static DataSinkType fromString(JsonNode json) {
+ return DataSinkType.valueOf(json.get("code").asText());
}
public String getCode() {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
index b0ba0e7ccd..0b9311f75b 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
@@ -49,8 +49,6 @@ public class AdapterDescription extends
VersionedNamedStreamPipesEntity {
private List<TransformationRuleDescription> rules;
- private List<String> category;
-
private long createdAt;
// Is used to store where the adapter is running to stop it
@@ -73,7 +71,6 @@ public class AdapterDescription extends
VersionedNamedStreamPipesEntity {
this.rules = new ArrayList<>();
this.eventGrounding = new EventGrounding();
this.config = new ArrayList<>();
- this.category = new ArrayList<>();
this.dataStream = new SpDataStream();
this.deploymentConfiguration = new ExtensionDeploymentConfiguration();
}
@@ -83,7 +80,6 @@ public class AdapterDescription extends
VersionedNamedStreamPipesEntity {
this.rules = new ArrayList<>();
this.eventGrounding = new EventGrounding();
this.config = new ArrayList<>();
- this.category = new ArrayList<>();
this.dataStream = new SpDataStream();
this.deploymentConfiguration = new ExtensionDeploymentConfiguration();
this.setVersion(version);
@@ -94,7 +90,6 @@ public class AdapterDescription extends
VersionedNamedStreamPipesEntity {
this.config = new Cloner().staticProperties(other.getConfig());
this.rules = other.getRules();
this.icon = other.getIcon();
- this.category = new Cloner().epaTypes(other.getCategory());
this.createdAt = other.getCreatedAt();
this.selectedEndpointUrl = other.getSelectedEndpointUrl();
this.correspondingServiceGroup = other.getCorrespondingServiceGroup();
@@ -183,15 +178,6 @@ public class AdapterDescription extends
VersionedNamedStreamPipesEntity {
this.icon = icon;
}
- public List<String> getCategory() {
- return category;
- }
-
- @Deprecated(forRemoval = true, since = "0.98.0")
- public void setCategory(List<String> category) {
- this.category = category;
- }
-
@Override
public String toString() {
return String.format("AdapterDescription{elementId= '%s', DOM= '%s'}",
elementId, dom);
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineElementCategory.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineElementCategory.java
index 9e1957e4a8..a7d2db3195 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineElementCategory.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/PipelineElementCategory.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.rest.impl;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.DataProcessorType;
import org.apache.streampipes.model.DataSinkType;
import org.apache.streampipes.model.SpDataStream;
@@ -51,11 +50,6 @@ public class PipelineElementCategory extends
AbstractAuthGuardedRestResource {
return ok(DataProcessorType.values());
}
- @GetMapping(path = "/adapter", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<AdapterType[]> getAdapterCategories() {
- return ok(AdapterType.values());
- }
-
@GetMapping(path = "/ec", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<DataSinkType[]> getEcCategories() {
return ok(DataSinkType.values());
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilder.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilder.java
index 8c29105101..113fb19f1e 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilder.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilder.java
@@ -22,16 +22,13 @@ import
org.apache.streampipes.extensions.api.assets.AssetResolver;
import org.apache.streampipes.extensions.api.assets.DefaultAssetResolver;
import org.apache.streampipes.extensions.api.connect.IParser;
import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import
org.apache.streampipes.sdk.builder.AbstractConfigurablePipelineElementBuilder;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
public class AdapterConfigurationBuilder extends
AbstractConfigurablePipelineElementBuilder<AdapterConfigurationBuilder,
AdapterDescription> {
@@ -97,19 +94,6 @@ public class AdapterConfigurationBuilder extends
return this;
}
- /**
- * @deprecated Categories are no longer needed for adapters as of version
0.98.0
- */
- @Deprecated(forRemoval = true, since = "0.98.0")
- public AdapterConfigurationBuilder withCategory(AdapterType... categories) {
- this.elementDescription
- .setCategory(Arrays
- .stream(categories)
- .map(Enum::name)
- .collect(Collectors.toList()));
- return me();
- }
-
public AdapterConfigurationBuilder withVersion(int version) {
this.elementDescription.setVersion(version);
return this;
diff --git
a/streampipes-sdk/src/test/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilderTest.java
b/streampipes-sdk/src/test/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilderTest.java
index db6bd41de6..458ca7a940 100644
---
a/streampipes-sdk/src/test/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilderTest.java
+++
b/streampipes-sdk/src/test/java/org/apache/streampipes/sdk/builder/adapter/AdapterConfigurationBuilderTest.java
@@ -20,7 +20,6 @@ package org.apache.streampipes.sdk.builder.adapter;
import org.apache.streampipes.extensions.api.connect.IParser;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.junit.jupiter.api.Assertions;
@@ -88,19 +87,5 @@ public class AdapterConfigurationBuilderTest {
Assertions.assertEquals(List.of(parser1, parser2),
adapterConfiguration.getSupportedParsers());
}
- @Test
- public void withCategory() {
- var adapterConfiguration = AdapterConfigurationBuilder
- .create(id, 0, null)
- .withCategory(AdapterType.Manufacturing)
- .buildConfiguration();
-
- var actual = adapterConfiguration.getAdapterDescription()
- .getCategory();
-
- Assertions.assertEquals(1, actual.size());
- Assertions.assertEquals(AdapterType.Manufacturing.getCode(),
actual.get(0));
- }
-
}
diff --git
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/AdapterTypeAdapter.java
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/AdapterTypeAdapter.java
deleted file mode 100644
index ba25006258..0000000000
---
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/AdapterTypeAdapter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.storage.couchdb.serializer;
-
-import org.apache.streampipes.model.AdapterType;
-
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-public class AdapterTypeAdapter extends PeTypeAdapter<AdapterType> {
-
- @Override
- public void write(JsonWriter out, AdapterType value) throws IOException {
- write(out, value.getLabel(), value.getDescription(), value.name());
- }
-
- @Override
- public AdapterType read(JsonReader in) throws IOException {
- in.beginObject();
- while (in.hasNext()) {
- String name = in.nextString();
- if (name.equals("type")) {
- return AdapterType.valueOf(name);
- }
- }
- throw new IOException();
- }
-}
diff --git
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
index d51874e4fb..db8a7970cb 100644
---
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
+++
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.storage.couchdb.serializer;
-import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.DataProcessorType;
import org.apache.streampipes.model.DataSinkType;
import org.apache.streampipes.model.SpDataStream;
@@ -82,7 +81,6 @@ public class GsonSerializer {
builder.registerTypeAdapter(MappingProperty.class, new
CouchDbJsonSerializer<MappingProperty>());
builder.registerTypeAdapter(ValueSpecification.class, new
CouchDbJsonSerializer<ValueSpecification>());
builder.registerTypeAdapter(DataSinkType.class, new EcTypeAdapter());
- builder.registerTypeAdapter(AdapterType.class, new AdapterTypeAdapter());
builder.registerTypeAdapter(Message.class, new
CouchDbJsonSerializer<Message>());
builder.registerTypeAdapter(DataProcessorType.class, new EpaTypeAdapter());
builder.registerTypeAdapter(URI.class, new UriSerializer());
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
index e1c8d6ed8c..8cebfd8263 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
@@ -142,10 +142,6 @@ export class AdapterService {
);
}
- getAdapterCategories(): Observable<any> {
- return this.http.get(`${this.baseUrl}/api/v2/categories/adapter`);
- }
-
private deleteRequest(
adapter: AdapterDescription,
deleteAssociatedPipelines: boolean,
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
index b5ef82ab32..4589e61e38 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts
@@ -19,7 +19,7 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2025-11-20
09:13:04.
+// Generated using typescript-generator version 3.2.1263 on 2025-12-02
15:38:17.
import { Storable } from './platform-services';
@@ -311,12 +311,8 @@ export type DefaultPrivilege =
| 'PRIVILEGE_WRITE_PIPELINE_ELEMENT'
| 'PRIVILEGE_READ_DASHBOARD'
| 'PRIVILEGE_WRITE_DASHBOARD'
- | 'PRIVILEGE_READ_DASHBOARD_WIDGET'
- | 'PRIVILEGE_WRITE_DASHBOARD_WIDGET'
| 'PRIVILEGE_READ_DATA_EXPLORER_VIEW'
| 'PRIVILEGE_WRITE_DATA_EXPLORER_VIEW'
- | 'PRIVILEGE_READ_DATA_EXPLORER_WIDGET'
- | 'PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET'
| 'PRIVILEGE_READ_APPS'
| 'PRIVILEGE_WRITE_APPS'
| 'PRIVILEGE_READ_NOTIFICATIONS'
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index 131db4da40..c9e29a27a6 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -19,7 +19,7 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2025-11-17
21:13:12.
+// Generated using typescript-generator version 3.2.1263 on 2025-12-02
15:38:14.
export class NamedStreamPipesEntity implements Storable {
'@class':
@@ -98,7 +98,6 @@ export class VersionedNamedStreamPipesEntity extends
NamedStreamPipesEntity {
export class AdapterDescription extends VersionedNamedStreamPipesEntity {
'@class':
'org.apache.streampipes.model.connect.adapter.AdapterDescription';
- 'category': string[];
'config': StaticPropertyUnion[];
'correspondingDataStreamElementId': string;
/**
@@ -127,9 +126,6 @@ export class AdapterDescription extends
VersionedNamedStreamPipesEntity {
}
const instance = target || new AdapterDescription();
super.fromData(data, instance);
- instance.category = __getCopyArrayFn(__identity<string>())(
- data.category,
- );
instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(
data.config,
);
@@ -183,23 +179,6 @@ export class AdapterEventPreview {
}
}
-export class AdapterType {
- code: string;
- description: string;
- label: string;
-
- static fromData(data: AdapterType, target?: AdapterType): AdapterType {
- if (!data) {
- return data;
- }
- const instance = target || new AdapterType();
- instance.code = data.code;
- instance.description = data.description;
- instance.label = data.label;
- return instance;
- }
-}
-
export class TransformationRuleDescription {
'@class':
|
'org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription'
diff --git
a/ui/src/app/connect/components/adapter-catalog/adapter-catalog.component.html
b/ui/src/app/connect/components/adapter-catalog/adapter-catalog.component.html
index 4f601345a8..3b0af4080c 100644
---
a/ui/src/app/connect/components/adapter-catalog/adapter-catalog.component.html
+++
b/ui/src/app/connect/components/adapter-catalog/adapter-catalog.component.html
@@ -64,7 +64,7 @@
</h4>
</div>
}
- @if (!adaptersLoading && !adapterLoadingError && currentFilter) {
+ @if (!adaptersLoading && !adapterLoadingError) {
<div class="container-fluid marketplace-container">
<div fxLayout="row wrap" fxLayoutAlign="start stretch">
@for (
diff --git
a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
index e098c127eb..807167aaf9 100644
--- a/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
+++ b/ui/src/app/connect/components/filter-toolbar/filter-toolbar.component.ts
@@ -16,9 +16,7 @@
*
*/
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { AdapterService } from '@streampipes/platform-services';
-import { MatSelectChange } from '@angular/material/select';
+import { Component, EventEmitter, Output } from '@angular/core';
import { AdapterFilterSettingsModel } from
'../../model/adapter-filter-settings.model';
@Component({
@@ -27,37 +25,15 @@ import { AdapterFilterSettingsModel } from
'../../model/adapter-filter-settings.
styleUrls: ['./filter-toolbar.component.scss'],
standalone: false,
})
-export class SpConnectFilterToolbarComponent implements OnInit {
+export class SpConnectFilterToolbarComponent {
@Output()
filterChangedEmitter: EventEmitter<AdapterFilterSettingsModel> =
new EventEmitter<AdapterFilterSettingsModel>();
- adapterCategories: any;
-
currentFilter: AdapterFilterSettingsModel = {
textFilter: '',
- selectedCategory: 'All',
- selectedType: 'All types',
};
- constructor(private dataMarketplaceService: AdapterService) {}
-
- ngOnInit(): void {
- this.loadAvailableTypeCategories();
- }
-
- loadAvailableTypeCategories() {
- this.dataMarketplaceService.getAdapterCategories().subscribe(res => {
- this.adapterCategories = res;
- this.adapterCategories.unshift({
- label: 'All categories',
- description: '',
- code: 'All',
- });
- this.filterChangedEmitter.emit(this.currentFilter);
- });
- }
-
updateFilterTerm(event: string) {
this.currentFilter.textFilter = event;
this.filterChangedEmitter.emit(this.currentFilter);
diff --git a/ui/src/app/connect/filter/adapter-filter.pipe.ts
b/ui/src/app/connect/filter/adapter-filter.pipe.ts
index 35a2cb29be..af62a744eb 100644
--- a/ui/src/app/connect/filter/adapter-filter.pipe.ts
+++ b/ui/src/app/connect/filter/adapter-filter.pipe.ts
@@ -45,29 +45,12 @@ export class AdapterFilterPipe implements PipeTransform {
adapterDescription: AdapterDescription,
activeFilters: AdapterFilterSettingsModel,
): boolean {
- return (
- this.meetsFilterCategoryCondition(
- adapterDescription,
- activeFilters.selectedCategory,
- ) &&
- this.meetsFilterTextCondition(
- adapterDescription,
- activeFilters.textFilter,
- )
+ return this.meetsFilterTextCondition(
+ adapterDescription,
+ activeFilters.textFilter,
);
}
- private meetsFilterCategoryCondition(
- adapterDescription: AdapterDescription,
- selectedCategory: string,
- ): boolean {
- if (selectedCategory === 'All') {
- return true;
- } else {
- return adapterDescription.category.indexOf(selectedCategory) !==
-1;
- }
- }
-
private meetsFilterTextCondition(
adapterDescription: AdapterDescription,
filterTerm: string,
diff --git a/ui/src/app/connect/model/adapter-filter-settings.model.ts
b/ui/src/app/connect/model/adapter-filter-settings.model.ts
index 00e878a0a5..45d4cf547d 100644
--- a/ui/src/app/connect/model/adapter-filter-settings.model.ts
+++ b/ui/src/app/connect/model/adapter-filter-settings.model.ts
@@ -18,6 +18,4 @@
export interface AdapterFilterSettingsModel {
textFilter: string;
- selectedType: string;
- selectedCategory: string;
}
