This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch remove-set-adapters
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/remove-set-adapters by this
push:
new 6c8e3b2e2 [#1289] Remove data set model
6c8e3b2e2 is described below
commit 6c8e3b2e29e940b3906a19e7fc6327051a5a9fae
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Feb 15 07:54:24 2023 +0100
[#1289] Remove data set model
---
.../management/management/SourcesManagement.java | 77 ++--------------
.../management/management/WorkerRestClient.java | 15 ----
.../management/connect/AdapterUtils.java | 10 ---
.../connect/AdapterWorkerManagement.java | 25 ------
.../connect/ConnectWorkerDescriptionProvider.java | 33 +++----
.../connect/adapter/GroundingService.java | 18 +---
.../model/generic/GenericDataSetAdapter.java | 68 --------------
.../model/specific/SpecificDataSetAdapter.java | 33 -------
.../connect/adapter/preprocessing/Util.java | 4 -
.../streampipes/connect/ConnectAdapterInit.java | 4 -
.../adapters/image/set/ImageSetAdapter.java | 100 ---------------------
.../simulator/random/RandomDataSetAdapter.java | 91 -------------------
.../documentation.md | 32 -------
.../icon.png | Bin 5332 -> 0 bytes
.../strings.en | 26 ------
.../documentation.md | 33 -------
.../icon.png | Bin 13079 -> 0 bytes
.../strings.en | 27 ------
.../model/connect/adapter/AdapterDescription.java | 2 -
.../connect/adapter/AdapterSetDescription.java | 57 ------------
.../adapter/GenericAdapterSetDescription.java | 79 ----------------
.../adapter/SpecificAdapterSetDescription.java | 37 --------
.../connect/grounding/ProtocolSetDescription.java | 41 ---------
.../org/apache/streampipes/model/util/Cloner.java | 9 +-
.../manager/template/AdapterTemplateHandler.java | 6 +-
.../extensions/connect/AdapterWorkerResource.java | 40 ---------
.../rest/impl/connect/SourcesResource.java | 81 -----------------
.../adapter/SpecificDataSetAdapterBuilder.java | 68 --------------
.../service/core/StreamPipesResourceConfig.java | 2 -
.../storage/couchdb/serializer/GsonSerializer.java | 6 --
30 files changed, 19 insertions(+), 1005 deletions(-)
diff --git
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/SourcesManagement.java
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/SourcesManagement.java
index 717a38429..7d899161c 100644
---
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/SourcesManagement.java
+++
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/SourcesManagement.java
@@ -18,27 +18,15 @@
package org.apache.streampipes.connect.management.management;
-import
org.apache.streampipes.commons.exceptions.NoServiceEndpointsAvailableException;
-import org.apache.streampipes.connect.management.util.WorkerPaths;
-import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
-import
org.apache.streampipes.extensions.management.connect.adapter.util.TransportFormatGenerator;
-import org.apache.streampipes.model.SpDataSet;
import org.apache.streampipes.model.SpDataStream;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-
public class SourcesManagement {
private final Logger logger =
LoggerFactory.getLogger(SourcesManagement.class);
@@ -58,68 +46,19 @@ public class SourcesManagement {
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();
- }
+
+ // Update event schema
+ var newEventSchema = ((AdapterStreamDescription)
adapterDescription).getDataStream().getEventSchema();
oldDataStream.setEventSchema(newEventSchema);
return oldDataStream;
}
- public void addSetAdapter(SpDataSet dataSet) throws AdapterException,
NoServiceEndpointsAvailableException {
-
- AdapterSetDescription ad = (AdapterSetDescription)
getAndDecryptAdapter(dataSet.getCorrespondingAdapterId());
- ad.setDataSet(dataSet);
- ad.setElementId(ad.getElementId() + "/streams/" +
dataSet.getDatasetInvocationId());
-
- try {
- String baseUrl = WorkerPaths.findEndpointUrl(ad.getAppId());
- WorkerRestClient.invokeSetAdapter(baseUrl, ad);
- } catch (URISyntaxException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @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()));
- }
+ var ds = ((AdapterStreamDescription) adapterDescription).getDataStream();
+ ds.setEventGrounding(new
EventGrounding(adapterDescription.getEventGrounding()));
ds.setElementId(dataStreamElementId);
ds.setName(adapterDescription.getName());
@@ -130,10 +69,4 @@ public class SourcesManagement {
return ds;
}
- private AdapterDescription getAndDecryptAdapter(String adapterId) {
- AdapterDescription adapter =
this.adapterInstanceStorage.getAdapter(adapterId);
- SecretProvider.getDecryptionService().apply(adapter);
- return adapter;
- }
-
}
diff --git
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
index 7cd313dd9..169b8820b 100644
---
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
+++
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
@@ -22,7 +22,6 @@ import
org.apache.streampipes.commons.exceptions.SpConfigurationException;
import org.apache.streampipes.connect.management.util.WorkerPaths;
import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
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.runtime.RuntimeOptionsRequest;
import org.apache.streampipes.model.runtime.RuntimeOptionsResponse;
@@ -72,20 +71,6 @@ public class WorkerRestClient {
updateStreamAdapterStatus(adapterStreamDescription.getElementId(), false);
}
- public static void invokeSetAdapter(String endpointUrl,
- AdapterSetDescription
adapterSetDescription) throws AdapterException {
- String url = endpointUrl + WorkerPaths.getSetInvokePath();
-
- startAdapter(url, adapterSetDescription);
- }
-
- public static void stopSetAdapter(String baseUrl,
- AdapterSetDescription
adapterSetDescription) throws AdapterException {
- String url = baseUrl + WorkerPaths.getSetStopPath();
-
- stopAdapter(adapterSetDescription, url);
- }
-
public static List<AdapterDescription>
getAllRunningAdapterInstanceDescriptions(String url) throws AdapterException {
try {
logger.info("Requesting all running adapter description instances: " +
url);
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterUtils.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterUtils.java
index d0cf644cc..ca79caa32 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterUtils.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterUtils.java
@@ -21,11 +21,9 @@ package org.apache.streampipes.extensions.management.connect;
import org.apache.streampipes.extensions.api.connect.IAdapter;
import org.apache.streampipes.extensions.api.connect.IProtocol;
import
org.apache.streampipes.extensions.management.connect.adapter.model.generic.GenericAdapter;
-import
org.apache.streampipes.extensions.management.connect.adapter.model.generic.GenericDataSetAdapter;
import
org.apache.streampipes.extensions.management.connect.adapter.model.generic.GenericDataStreamAdapter;
import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
import org.slf4j.Logger;
@@ -40,17 +38,9 @@ public class AdapterUtils {
if (adapterDescription instanceof GenericAdapterStreamDescription) {
adapter = (IAdapter<?>) new GenericDataStreamAdapter().getInstance(
(GenericAdapterStreamDescription) adapterDescription);
- } else if (adapterDescription instanceof GenericAdapterSetDescription) {
- adapter = new
GenericDataSetAdapter().getInstance((GenericAdapterSetDescription)
adapterDescription);
}
IProtocol protocol = null;
- if (adapterDescription instanceof GenericAdapterSetDescription) {
- protocol = DeclarersSingleton.getInstance()
- .getProtocol(((GenericAdapterSetDescription)
adapterDescription).getProtocolDescription().getAppId());
- ((GenericAdapter) adapter).setProtocol(protocol);
- }
-
if (adapterDescription instanceof GenericAdapterStreamDescription) {
protocol = DeclarersSingleton.getInstance()
.getProtocol(((GenericAdapterStreamDescription)
adapterDescription).getProtocolDescription().getAppId());
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java
index 17d3ccccb..53d445fa4 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/AdapterWorkerManagement.java
@@ -23,7 +23,6 @@ import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
import
org.apache.streampipes.extensions.management.init.RunningAdapterInstances;
import
org.apache.streampipes.extensions.management.monitoring.SpMonitoringManager;
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.slf4j.Logger;
@@ -52,30 +51,6 @@ public class AdapterWorkerManagement {
stopAdapter(adapterStreamDescription);
}
- public void invokeSetAdapter(AdapterSetDescription adapterSetDescription)
throws AdapterException {
-
- IAdapter<?> adapter = AdapterUtils.setAdapter(adapterSetDescription);
-
-
RunningAdapterInstances.INSTANCE.addAdapter(adapterSetDescription.getElementId(),
adapter, adapterSetDescription);
-
-
adapter.changeEventGrounding(adapterSetDescription.getDataSet().getEventGrounding().getTransportProtocol());
-
- // Start a thread to start a set adapter
- Runnable r = () -> {
- try {
- adapter.startAdapter();
- } catch (AdapterException e) {
- e.printStackTrace();
- }
- };
-
- new Thread(r).start();
- }
-
- public void stopSetAdapter(AdapterSetDescription adapterSetDescription)
throws AdapterException {
- stopAdapter(adapterSetDescription);
- }
-
private void stopAdapter(AdapterDescription adapterDescription) throws
AdapterException {
String elementId = adapterDescription.getElementId();
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java
index b50785e55..d8d8c6226 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/ConnectWorkerDescriptionProvider.java
@@ -23,10 +23,8 @@ import
org.apache.streampipes.extensions.management.init.DeclarersSingleton;
import org.apache.streampipes.extensions.management.locales.LabelGenerator;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.sdk.helpers.AdapterSourceType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,27 +88,16 @@ public class ConnectWorkerDescriptionProvider {
for (IProtocol p : allProtocols) {
ProtocolDescription protocolDescription = (ProtocolDescription)
rewrite(p.declareModel());
- if
(protocolDescription.getSourceType().equals(AdapterSourceType.STREAM.toString()))
{
- GenericAdapterStreamDescription desc = new
GenericAdapterStreamDescription();
- desc.setName(protocolDescription.getName());
- desc.setDescription(protocolDescription.getDescription());
- desc.setIncludedAssets(protocolDescription.getIncludedAssets());
- desc.setElementId(protocolDescription.getElementId());
- desc.setAppId(protocolDescription.getAppId());
- desc.setProtocolDescription(protocolDescription);
- desc.setCorrespondingServiceGroup(serviceGroup);
- result.add(desc);
- } else if
(protocolDescription.getSourceType().equals(AdapterSourceType.SET.toString())) {
- GenericAdapterSetDescription desc = new GenericAdapterSetDescription();
- desc.setName(protocolDescription.getName());
- desc.setDescription(protocolDescription.getDescription());
- desc.setIncludedAssets(protocolDescription.getIncludedAssets());
- desc.setElementId(protocolDescription.getElementId());
- desc.setAppId(protocolDescription.getAppId());
- desc.setProtocolDescription(protocolDescription);
- desc.setCorrespondingServiceGroup(serviceGroup);
- result.add(desc);
- }
+ GenericAdapterStreamDescription desc = new
GenericAdapterStreamDescription();
+ desc.setName(protocolDescription.getName());
+ desc.setDescription(protocolDescription.getDescription());
+ desc.setIncludedAssets(protocolDescription.getIncludedAssets());
+ desc.setElementId(protocolDescription.getElementId());
+ desc.setAppId(protocolDescription.getAppId());
+ desc.setProtocolDescription(protocolDescription);
+ desc.setCorrespondingServiceGroup(serviceGroup);
+ result.add(desc);
+
}
return result;
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/GroundingService.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/GroundingService.java
index a71f750d2..bed9ba74b 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/GroundingService.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/GroundingService.java
@@ -19,29 +19,13 @@
package org.apache.streampipes.extensions.management.connect.adapter;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
import org.apache.streampipes.model.grounding.EventGrounding;
public class GroundingService {
public static String extractTopic(AdapterDescription adapterDescription) {
- EventGrounding eventGrounding = getEventGrounding(adapterDescription);
+ EventGrounding eventGrounding = adapterDescription.getEventGrounding();
return
eventGrounding.getTransportProtocol().getTopicDefinition().getActualTopicName();
}
- private static EventGrounding getEventGrounding(AdapterDescription
adapterDescription) {
- EventGrounding eventGrounding;
-
- if (adapterDescription instanceof SpecificAdapterSetDescription) {
- eventGrounding = ((SpecificAdapterSetDescription)
adapterDescription).getDataSet().getEventGrounding();
- } else if (adapterDescription instanceof GenericAdapterSetDescription) {
- eventGrounding = ((GenericAdapterSetDescription)
adapterDescription).getDataSet().getEventGrounding();
- } else {
- eventGrounding = adapterDescription.getEventGrounding();
- }
-
- return eventGrounding;
- }
-
}
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java
deleted file mode 100644
index 990252497..000000000
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/generic/GenericDataSetAdapter.java
+++ /dev/null
@@ -1,68 +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.extensions.management.connect.adapter.model.generic;
-
-import org.apache.streampipes.extensions.api.connect.IProtocol;
-import org.apache.streampipes.extensions.management.connect.adapter.Adapter;
-import org.apache.streampipes.model.connect.adapter.GenericAdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
-
-public class GenericDataSetAdapter extends
GenericAdapter<GenericAdapterSetDescription> {
-
- public static final String ID = GenericAdapterSetDescription.ID;
-
- public GenericDataSetAdapter() {
- super();
- }
-
- public GenericDataSetAdapter(GenericAdapterSetDescription
adapterDescription) {
- super(adapterDescription);
- }
-
- @Override
- public GenericAdapterSetDescription declareModel() {
- GenericAdapterSetDescription adapterDescription = new
GenericAdapterSetDescription();
- adapterDescription.setAppId(GenericAdapterSetDescription.ID);
- return adapterDescription;
- }
-
- @Override
- public Adapter<GenericAdapterSetDescription>
getInstance(GenericAdapterSetDescription adapterDescription) {
- return new GenericDataSetAdapter(adapterDescription);
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
- public void stopAdapter() {
- protocol.stop();
- }
-
- @Override
- public GenericAdapterDescription getAdapterDescription() {
- return adapterDescription;
- }
-
- @Override
- public void setProtocol(IProtocol protocol) {
- this.protocol = protocol;
- }
-}
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java
deleted file mode 100644
index 8ae5b69d0..000000000
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/model/specific/SpecificDataSetAdapter.java
+++ /dev/null
@@ -1,33 +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.extensions.management.connect.adapter.model.specific;
-
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
-
-public abstract class SpecificDataSetAdapter extends
SpecificAdapter<SpecificAdapterSetDescription> {
-
- public SpecificDataSetAdapter() {
- super();
- }
-
- public SpecificDataSetAdapter(SpecificAdapterSetDescription
adapterDescription) {
- super(adapterDescription);
- }
-
-}
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/preprocessing/Util.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/preprocessing/Util.java
index 24c87856b..cdcb9d5fd 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/preprocessing/Util.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/adapter/preprocessing/Util.java
@@ -19,7 +19,6 @@
package
org.apache.streampipes.extensions.management.connect.adapter.preprocessing;
import org.apache.streampipes.model.connect.adapter.GenericAdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
import org.apache.streampipes.model.schema.EventSchema;
@@ -49,9 +48,6 @@ public class Util {
public static EventSchema getEventSchema(GenericAdapterDescription
adapterDescription) {
if (adapterDescription instanceof GenericAdapterStreamDescription) {
return ((GenericAdapterStreamDescription)
adapterDescription).getDataStream().getEventSchema();
- } else if (adapterDescription instanceof GenericAdapterSetDescription) {
- return ((GenericAdapterSetDescription)
adapterDescription).getDataSet().getEventSchema();
-
}
return null;
}
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index ef6c69f4f..1b70ae044 100644
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -23,12 +23,10 @@ import
org.apache.streampipes.connect.adapters.flic.FlicMQTTAdapter;
import org.apache.streampipes.connect.adapters.gdelt.GdeltAdapter;
import org.apache.streampipes.connect.adapters.iex.IexCloudNewsAdapter;
import org.apache.streampipes.connect.adapters.iex.IexCloudStockAdapter;
-import org.apache.streampipes.connect.adapters.image.set.ImageSetAdapter;
import org.apache.streampipes.connect.adapters.image.stream.ImageStreamAdapter;
import org.apache.streampipes.connect.adapters.iss.IssAdapter;
import org.apache.streampipes.connect.adapters.netio.NetioMQTTAdapter;
import org.apache.streampipes.connect.adapters.netio.NetioRestAdapter;
-import
org.apache.streampipes.connect.adapters.simulator.random.RandomDataSetAdapter;
import
org.apache.streampipes.connect.adapters.simulator.random.RandomDataStreamAdapter;
import org.apache.streampipes.connect.adapters.slack.SlackAdapter;
import org.apache.streampipes.connect.adapters.ti.TISensorTag;
@@ -55,13 +53,11 @@ public class ConnectAdapterInit extends
ExtensionsModelSubmitter {
.registerAdapter(new NetioMQTTAdapter())
.registerAdapter(new IexCloudNewsAdapter())
.registerAdapter(new IexCloudStockAdapter())
- .registerAdapter(new RandomDataSetAdapter())
.registerAdapter(new RandomDataStreamAdapter())
.registerAdapter(new SlackAdapter())
.registerAdapter(new WikipediaEditedArticlesAdapter())
.registerAdapter(new WikipediaNewArticlesAdapter())
.registerAdapter(new ImageStreamAdapter())
- .registerAdapter(new ImageSetAdapter())
.registerAdapter(new IssAdapter())
.registerAdapter(new FlicMQTTAdapter())
.registerAdapter(new TISensorTag())
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/image/set/ImageSetAdapter.java
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/image/set/ImageSetAdapter.java
deleted file mode 100644
index 67fd03558..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/image/set/ImageSetAdapter.java
+++ /dev/null
@@ -1,100 +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.connect.adapters.image.set;
-
-import org.apache.streampipes.connect.adapters.image.ImageZipAdapter;
-import org.apache.streampipes.connect.adapters.image.ImageZipUtils;
-import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
-import org.apache.streampipes.extensions.api.connect.exception.ParseException;
-import org.apache.streampipes.extensions.management.connect.adapter.Adapter;
-import
org.apache.streampipes.extensions.management.connect.adapter.model.specific.SpecificDataSetAdapter;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.sdk.builder.adapter.GuessSchemaBuilder;
-import
org.apache.streampipes.sdk.builder.adapter.SpecificDataSetAdapterBuilder;
-import org.apache.streampipes.sdk.helpers.Filetypes;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.streampipes.sdk.helpers.EpProperties.imageProperty;
-import static
org.apache.streampipes.sdk.helpers.EpProperties.timestampProperty;
-
-public class ImageSetAdapter extends SpecificDataSetAdapter {
-
- private static final Logger LOG =
LoggerFactory.getLogger(ImageSetAdapter.class);
-
- public static final String ID =
"org.apache.streampipes.connect.adapters.image.set";
-
- private ImageZipAdapter imageZipAdapter;
-
- public ImageSetAdapter() {
-
- }
-
- public ImageSetAdapter(SpecificAdapterSetDescription adapterDescription) {
- super(adapterDescription);
- }
-
- @Override
- public SpecificAdapterSetDescription declareModel() {
- SpecificAdapterSetDescription description =
SpecificDataSetAdapterBuilder.create(ID)
- .withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
- .requiredIntegerParameter(Labels.withId(ImageZipUtils.INTERVAL_KEY))
- .requiredFile(Labels.withId(ImageZipUtils.ZIP_FILE_KEY), Filetypes.ZIP)
- .build();
- description.setAppId(ID);
-
- return description;
- }
-
- @Override
- public void startAdapter() throws AdapterException {
- imageZipAdapter = new ImageZipAdapter(adapterDescription);
- imageZipAdapter.start(adapterPipeline, false);
- }
-
- @Override
- public void stopAdapter() throws AdapterException {
- imageZipAdapter.stop();
- }
-
- @Override
- public GuessSchema getSchema(SpecificAdapterSetDescription
adapterDescription)
- throws AdapterException, ParseException {
- return GuessSchemaBuilder.create()
- .property(timestampProperty(ImageZipUtils.TIMESTAMP))
- .property(imageProperty(ImageZipUtils.IMAGE))
- .build();
- }
-
- @Override
- public Adapter getInstance(SpecificAdapterSetDescription adapterDescription)
{
- return new ImageSetAdapter(adapterDescription);
- }
-
- @Override
- public String getId() {
- return ID;
- }
-}
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/random/RandomDataSetAdapter.java
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/random/RandomDataSetAdapter.java
deleted file mode 100644
index 017b50692..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/simulator/random/RandomDataSetAdapter.java
+++ /dev/null
@@ -1,91 +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.connect.adapters.simulator.random;
-
-import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
-import org.apache.streampipes.extensions.api.connect.exception.ParseException;
-import org.apache.streampipes.extensions.management.connect.adapter.Adapter;
-import
org.apache.streampipes.extensions.management.connect.adapter.model.specific.SpecificDataSetAdapter;
-import
org.apache.streampipes.extensions.management.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.model.AdapterType;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import
org.apache.streampipes.sdk.builder.adapter.SpecificDataSetAdapterBuilder;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
-
-public class RandomDataSetAdapter extends SpecificDataSetAdapter {
-
- public static final String ID =
"org.apache.streampipes.connect.adapters.simulator.randomdataset";
-
- private static final String WaitTimeMs = "wait-time-ms";
- private static final String NumberOfEvents = "number-of-events";
-
- private RandomDataSimulator randomDataSimulator;
-
- public RandomDataSetAdapter() {
- super();
- }
-
- public RandomDataSetAdapter(SpecificAdapterSetDescription
adapterSetDescription) {
- super(adapterSetDescription);
- ParameterExtractor extractor = new
ParameterExtractor(adapterSetDescription.getConfig());
- Integer waitTimeMs = extractor.singleValue(WaitTimeMs, Integer.class);
- Integer numberOfEvents = extractor.singleValue(NumberOfEvents,
Integer.class);
- this.randomDataSimulator = new RandomDataSimulator(adapterPipeline,
waitTimeMs, numberOfEvents);
- }
-
- @Override
- public SpecificAdapterSetDescription declareModel() {
- return SpecificDataSetAdapterBuilder.create(ID)
- .withAssets(Assets.DOCUMENTATION)
- .withLocales(Locales.EN)
- .category(AdapterType.Debugging)
- .requiredIntegerParameter(Labels.withId(WaitTimeMs))
- .requiredIntegerParameter(Labels.withId(NumberOfEvents))
- .build();
- }
-
- @Override
- public void startAdapter() throws AdapterException {
- Thread thread = new Thread(this.randomDataSimulator);
- thread.start();
- }
-
- @Override
- public void stopAdapter() throws AdapterException {
- this.randomDataSimulator.setRunning(false);
- }
-
- @Override
- public Adapter getInstance(SpecificAdapterSetDescription adapterDescription)
{
- return new RandomDataSetAdapter(adapterDescription);
- }
-
- @Override
- public GuessSchema getSchema(SpecificAdapterSetDescription
adapterDescription)
- throws AdapterException, ParseException {
- return RandomDataSimulatorUtils.randomSchema();
- }
-
- @Override
- public String getId() {
- return ID;
- }
-}
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/documentation.md
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/documentation.md
deleted file mode 100644
index 317c87bd2..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/documentation.md
+++ /dev/null
@@ -1,32 +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.
- ~
- -->
-
-## Image upload (Set)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-Upload a zip file of images and create an event per image
-
-
-***
-
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/icon.png
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/icon.png
deleted file mode 100644
index 52f3575a3..000000000
Binary files
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/icon.png
and /dev/null differ
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/strings.en
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/strings.en
deleted file mode 100644
index 0723e1006..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.image.set/strings.en
+++ /dev/null
@@ -1,26 +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.
-#
-
-
-org.apache.streampipes.connect.adapters.image.set.title=Image Upload (Set)
-org.apache.streampipes.connect.adapters.image.set.description=
-
-interval-key.title=Interval [ms]
-interval-key.description=Define waiting time between the images
-
-zip-file-key.title=Zipped Folder With Images
-zip-file-key.description=A zip file that contains the images to stream
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/documentation.md
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/documentation.md
deleted file mode 100644
index acd8fb5ee..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/documentation.md
+++ /dev/null
@@ -1,33 +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.
- ~
- -->
-
-## Random Data Simulator (Set)
-
-<p align="center">
- <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Publishes a bounded stream of random events.
-
-
-***
-
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/icon.png
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/icon.png
deleted file mode 100644
index 05cc7c3a9..000000000
Binary files
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/icon.png
and /dev/null differ
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/strings.en
b/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/strings.en
deleted file mode 100644
index 294bfa641..000000000
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/resources/org.apache.streampipes.connect.adapters.simulator.randomdataset/strings.en
+++ /dev/null
@@ -1,27 +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.
-#
-
-
-org.apache.streampipes.connect.adapters.simulator.randomdataset.title=Random
Data Simulator (Set)
-org.apache.streampipes.connect.adapters.simulator.randomdataset.description=Publishes
a bounded stream of random events
-
-
-wait-time-ms.title=Wait Time (MS)
-wait-time-ms.description=The time to wait between two events in milliseconds
-
-number-of-events.title=Number of Events
-number-of-events.description=The number of events to send
\ No newline at end of file
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 c685b709e..1f818683a 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
@@ -42,10 +42,8 @@ import java.util.Arrays;
import java.util.List;
@JsonSubTypes({
- @JsonSubTypes.Type(GenericAdapterSetDescription.class),
@JsonSubTypes.Type(GenericAdapterStreamDescription.class),
@JsonSubTypes.Type(SpecificAdapterStreamDescription.class),
- @JsonSubTypes.Type(SpecificAdapterSetDescription.class)
})
@TsModel
public abstract class AdapterDescription extends NamedStreamPipesEntity {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
deleted file mode 100644
index 1239c2cf9..000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
+++ /dev/null
@@ -1,57 +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.connect.adapter;
-
-import org.apache.streampipes.model.SpDataSet;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-
-@JsonSubTypes({
- @JsonSubTypes.Type(GenericAdapterSetDescription.class),
- @JsonSubTypes.Type(SpecificAdapterSetDescription.class)
-})
-public abstract class AdapterSetDescription extends AdapterDescription {
-
- private SpDataSet dataSet;
-
- public AdapterSetDescription() {
- this.dataSet = new SpDataSet();
- }
-
- public AdapterSetDescription(String uri, String name, String description) {
- super(uri, name, description);
- this.dataSet = new SpDataSet();
- }
-
- public AdapterSetDescription(AdapterSetDescription other) {
- super(other);
- if (other.getDataSet() != null) {
- this.setDataSet(new SpDataSet(other.getDataSet()));
- }
- }
-
- public SpDataSet getDataSet() {
- return dataSet;
- }
-
- public void setDataSet(SpDataSet dataSet) {
- this.dataSet = dataSet;
- }
-
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
deleted file mode 100644
index 45e292bbf..000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
+++ /dev/null
@@ -1,79 +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.connect.adapter;
-
-import org.apache.streampipes.model.connect.grounding.FormatDescription;
-import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.model.connect.grounding.ProtocolSetDescription;
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.model.util.ElementIdGenerator;
-
-@TsModel
-public class GenericAdapterSetDescription extends AdapterSetDescription
implements GenericAdapterDescription {
-
- public static final String ID =
ElementIdGenerator.makeFixedElementId(GenericAdapterSetDescription.class);
-
- private FormatDescription formatDescription;
-
- private ProtocolDescription protocolDescription;
-
-
- public GenericAdapterSetDescription() {
- super(ID, "GenericAdapterSetDescription", "");
- }
-
-
- public GenericAdapterSetDescription(FormatDescription formatDescription,
ProtocolSetDescription protocolDescription) {
- this.formatDescription = formatDescription;
- this.protocolDescription = protocolDescription;
- }
-
- public GenericAdapterSetDescription(GenericAdapterSetDescription other) {
- super(other);
-
- if (other.getFormatDescription() != null) {
- this.formatDescription = new
FormatDescription(other.getFormatDescription());
- }
- if (other.getProtocolDescription() != null) {
- this.protocolDescription = new
ProtocolSetDescription(other.getProtocolDescription());
- }
- }
-
- public FormatDescription getFormatDescription() {
- return formatDescription;
- }
-
- public void setFormatDescription(FormatDescription formatDescription) {
- this.formatDescription = formatDescription;
- }
-
- public ProtocolDescription getProtocolDescription() {
- return protocolDescription;
- }
-
- public void setProtocolDescription(ProtocolDescription protocolDescription) {
- this.protocolDescription = protocolDescription;
- }
-
- public EventSchema getEventSchema() {
- return this.getDataSet().getEventSchema();
- }
-
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
deleted file mode 100644
index d48aa3c86..000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
+++ /dev/null
@@ -1,37 +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.connect.adapter;
-
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.model.shared.annotation.TsModel;
-
-@TsModel
-public class SpecificAdapterSetDescription extends AdapterSetDescription {
-
- public SpecificAdapterSetDescription() {
- }
-
- public SpecificAdapterSetDescription(AdapterSetDescription other) {
- super(other);
- }
-
- public EventSchema getEventSchema() {
- return this.getDataSet().getEventSchema();
- }
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
deleted file mode 100644
index 6aece7d8c..000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
+++ /dev/null
@@ -1,41 +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.connect.grounding;
-
-import org.apache.streampipes.model.staticproperty.StaticProperty;
-
-import java.util.List;
-
-public class ProtocolSetDescription extends ProtocolDescription {
-
- public ProtocolSetDescription() {
- }
-
- public ProtocolSetDescription(String uri, String name, String description) {
- super(uri, name, description);
- }
-
- public ProtocolSetDescription(String uri, String name, String description,
List<StaticProperty> config) {
- super(uri, name, description, config);
- }
-
- public ProtocolSetDescription(ProtocolDescription other) {
- super(other);
- }
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
index 5427cd88b..4e7e312f0 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
@@ -22,11 +22,8 @@ import org.apache.streampipes.model.SpDataSet;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
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.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
import org.apache.streampipes.model.graph.DataProcessorDescription;
import org.apache.streampipes.model.graph.DataSinkDescription;
@@ -316,12 +313,8 @@ public class Cloner {
}
public AdapterDescription adapterDescription(AdapterDescription ad) {
- if (ad instanceof GenericAdapterSetDescription) {
- return new GenericAdapterSetDescription((GenericAdapterSetDescription)
ad);
- } else if (ad instanceof GenericAdapterStreamDescription) {
+ if (ad instanceof GenericAdapterStreamDescription) {
return new
GenericAdapterStreamDescription((GenericAdapterStreamDescription) ad);
- } else if (ad instanceof SpecificAdapterSetDescription) {
- return new SpecificAdapterSetDescription((AdapterSetDescription) ad);
} else if (ad instanceof SpecificAdapterStreamDescription) {
return new SpecificAdapterStreamDescription((AdapterStreamDescription)
ad);
} else {
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/AdapterTemplateHandler.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/AdapterTemplateHandler.java
index e6e00d6c8..35b940ecb 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/AdapterTemplateHandler.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/AdapterTemplateHandler.java
@@ -20,9 +20,7 @@ package org.apache.streampipes.manager.template;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.adapter.GenericAdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
import org.apache.streampipes.model.template.PipelineElementTemplate;
@@ -36,9 +34,9 @@ public class AdapterTemplateHandler extends
AbstractTemplateHandler<AdapterDescr
@Override
protected void visitStaticProperties(PipelineElementTemplateVisitor visitor)
{
- if (element instanceof SpecificAdapterStreamDescription || element
instanceof SpecificAdapterSetDescription) {
+ if (element instanceof SpecificAdapterStreamDescription) {
element.getConfig().forEach(config -> config.accept(visitor));
- } else if (element instanceof GenericAdapterSetDescription || element
instanceof GenericAdapterStreamDescription) {
+ } else if (element instanceof GenericAdapterStreamDescription) {
((GenericAdapterDescription)
element).getProtocolDescription().getConfig()
.forEach(config -> config.accept(visitor));
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java
index 7d359417d..c3df865c9 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java
@@ -21,7 +21,6 @@ package org.apache.streampipes.rest.extensions.connect;
import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
import
org.apache.streampipes.extensions.management.connect.AdapterWorkerManagement;
import org.apache.streampipes.model.StreamPipesErrorMessage;
-import org.apache.streampipes.model.connect.adapter.AdapterSetDescription;
import org.apache.streampipes.model.connect.adapter.AdapterStreamDescription;
import org.apache.streampipes.model.message.Notifications;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
@@ -104,43 +103,4 @@ public class AdapterWorkerResource extends
AbstractSharedRestInterface {
}
}
- @POST
- @JacksonSerialized
- @Path("/set/invoke")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response invokeSetAdapter(AdapterSetDescription
adapterSetDescription) {
-
- try {
- adapterManagement.invokeSetAdapter(adapterSetDescription);
- } catch (AdapterException e) {
- logger.error("Error while starting adapter with id " +
adapterSetDescription.getElementId(), e);
- return ok(Notifications.error(e.getMessage()));
- }
-
- String responseMessage = "Set adapter with id " +
adapterSetDescription.getElementId() + " successfully started";
-
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
- }
-
- @POST
- @JacksonSerialized
- @Path("/set/stop")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response stopSetAdapter(AdapterSetDescription adapterSetDescription) {
-
- try {
- adapterManagement.stopSetAdapter(adapterSetDescription);
- } catch (AdapterException e) {
- logger.error("Error while stopping adapter with id " +
adapterSetDescription.getElementId(), e);
- return ok(Notifications.error(e.getMessage()));
- }
-
- String responseMessage = "Set adapter with id " +
adapterSetDescription.getElementId() + " successfully stopped";
-
- logger.info(responseMessage);
- return ok(Notifications.success(responseMessage));
- }
}
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/SourcesResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/SourcesResource.java
deleted file mode 100644
index 599382de4..000000000
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/SourcesResource.java
+++ /dev/null
@@ -1,81 +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.rest.impl.connect;
-
-import
org.apache.streampipes.commons.exceptions.NoServiceEndpointsAvailableException;
-import org.apache.streampipes.connect.management.management.SourcesManagement;
-import
org.apache.streampipes.extensions.api.connect.exception.AdapterException;
-import org.apache.streampipes.model.SpDataSet;
-import org.apache.streampipes.model.message.Notifications;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-
-@Path("/v2/connect/master/sources")
-public class SourcesResource extends
AbstractAdapterResource<SourcesManagement> {
-
- private static final Logger LOG =
LoggerFactory.getLogger(SourcesResource.class);
-
- public SourcesResource() {
- super(SourcesManagement::new);
- }
-
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- public Response addSetAdapter(SpDataSet dataSet) {
-
- String responseMessage = "Instance of data set " + dataSet.getElementId()
+ " successfully started";
-
- try {
- managementService.addSetAdapter(dataSet);
- } catch (AdapterException | NoServiceEndpointsAvailableException e) {
- LOG.error("Could not set data set instance: " + dataSet.getElementId(),
e);
- return ok(Notifications.error("Could not set data set instance: " +
dataSet.getElementId()));
- }
-
- return ok(Notifications.success(responseMessage));
- }
-
- @DELETE
- @Path("{adapterId}/{runningInstanceId}")
- @Produces(MediaType.APPLICATION_JSON)
- public Response detach(@PathParam("adapterId") String elementId,
- @PathParam("runningInstanceId") String
runningInstanceId) {
- String responseMessage = "Instance id: " + runningInstanceId + "
successfully started";
-
- try {
- managementService.detachAdapter(elementId, runningInstanceId);
- } catch (AdapterException | NoServiceEndpointsAvailableException e) {
- LOG.error("Could not detach instance id: " + runningInstanceId, e);
- return fail();
- }
-
- return ok(Notifications.success(responseMessage));
- }
-}
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/SpecificDataSetAdapterBuilder.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/SpecificDataSetAdapterBuilder.java
deleted file mode 100644
index a8d21dbed..000000000
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/adapter/SpecificDataSetAdapterBuilder.java
+++ /dev/null
@@ -1,68 +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.sdk.builder.adapter;
-
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
-import org.apache.streampipes.sdk.builder.DataSetBuilder;
-
-public class SpecificDataSetAdapterBuilder extends
- AdapterDescriptionBuilder<SpecificDataSetAdapterBuilder,
SpecificAdapterSetDescription> {
-
-
- private SpecificDataSetAdapterBuilder(String id, String label, String
description) {
- super(id, label, description, new SpecificAdapterSetDescription());
- }
-
- private SpecificDataSetAdapterBuilder(String appId) {
- super(appId, new SpecificAdapterSetDescription());
- }
-
- /**
- * Creates a new specific data set adapter using the builder pattern.
- *
- * @param appId A unique identifier of the new element, e.g.,
com.mycompany.set.mynewdataset
- * @param label A human-readable name of the element.
- * Will later be shown as the element name in the
StreamPipes UI.
- * @param description A human-readable description of the element.
- * @return a new instance of {@link DataSetBuilder}
- */
- public static SpecificDataSetAdapterBuilder create(String appId, String
label, String
- description) {
- return new SpecificDataSetAdapterBuilder(appId, label, description);
- }
-
- /**
- * Creates a new specific data set adapter using the builder pattern.
- *
- * @param appId A unique identifier of the new element, e.g.,
com.mycompany.set.mynewdataset
- * @return a new instance of {@link DataSetBuilder}
- */
- public static SpecificDataSetAdapterBuilder create(String appId) {
- return new SpecificDataSetAdapterBuilder(appId);
- }
-
- @Override
- protected SpecificDataSetAdapterBuilder me() {
- return this;
- }
-
- @Override
- protected void prepareBuild() {
- this.elementDescription.setConfig(getStaticProperties());
- }
-}
diff --git
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesResourceConfig.java
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesResourceConfig.java
index 1a4f253b7..59f66b956 100644
---
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesResourceConfig.java
+++
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/StreamPipesResourceConfig.java
@@ -70,7 +70,6 @@ import
org.apache.streampipes.rest.impl.connect.AdapterResource;
import org.apache.streampipes.rest.impl.connect.DescriptionResource;
import org.apache.streampipes.rest.impl.connect.GuessResource;
import org.apache.streampipes.rest.impl.connect.RuntimeResolvableResource;
-import org.apache.streampipes.rest.impl.connect.SourcesResource;
import org.apache.streampipes.rest.impl.connect.UnitResource;
import org.apache.streampipes.rest.impl.connect.WorkerAdministrationResource;
import org.apache.streampipes.rest.impl.dashboard.Dashboard;
@@ -173,7 +172,6 @@ public class StreamPipesResourceConfig extends
BaseResourceConfig {
// Connect Master
AdapterResource.class,
DescriptionResource.class,
- SourcesResource.class,
GuessResource.class,
UnitResource.class,
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 abf806b0c..9f9cf8423 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
@@ -25,9 +25,7 @@ import org.apache.streampipes.model.SpDataSet;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.client.user.Principal;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
-import
org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription;
-import
org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription;
import
org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription;
import
org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
@@ -129,12 +127,8 @@ public class GsonSerializer {
"org.apache.streampipes.model.CorrectionValueTransformationRuleDescription"));
builder.registerTypeAdapterFactory(RuntimeTypeAdapterFactory.of(AdapterDescription.class,
"type")
- .registerSubtype(SpecificAdapterSetDescription.class,
-
"org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription")
.registerSubtype(SpecificAdapterStreamDescription.class,
"org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription")
- .registerSubtype(GenericAdapterSetDescription.class,
-
"org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription")
.registerSubtype(GenericAdapterStreamDescription.class,
"org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription"));
