You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/12/03 23:26:42 UTC
[incubator-streampipes] branch edge-extensions updated (bae29cb ->
4e66460)
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a change to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from bae29cb Merge branch 'dev' into edge-extensions
new 6e129a1 [STREAMPIPES-252] clean up comments
add a31b87f [STREAMPIPES-252] clean up comments
add 5cec898 [STREAMPIPES-263] add ExtensionsModelSubmitter for bundled extensions module
add ccdf2ae Add missing license headers to a few files
add f5587f8 Add UI config for release 0.66.0
add d6e81e0 Update settings to configure release validation
add 737029e add license header
add ffd8b65 Fix bug in prebuild script
add 3bbe273 Explicitly add dist subdirectories to gitignore to avoid problems with rat plugin
add 3d5e33e [STREAMPIPES-110] Temporarily disable dependency-check maven plugin
add 8cf6f46 Modify docker-compose version
add cef2d67 Fix bug in prebuild script
add 7617b2b Use 0.66.0-SNAPSHOT as sp.version in archetypes
add edb43f6 Set sp.version in archetypes to 0.66.0
add 73a3272 Set streampipes version to 0.66.0
add d606f2c Perform some cleanup
add 72f394a Modify release settings in pom
add 5a989fc [maven-release-plugin] prepare release release/0.66.0
add 5444d20 [maven-release-plugin] prepare for next development iteration
add 81e8693 Revert to development version 0.66.0-SNAPSHOT
add 7aada08 Cleanup properties files
add 09775ad Update package.json
add ebac9f4 Fix bug in app overview module
add 71cc882 Add NotificationCount view to installation process
add 60c697e Import Roboto font in angular.json
add 47e22d7 Add assembly profile
add b8c23e6 [maven-release-plugin] prepare release release/0.66.0
add cf18d51 Kafka producer and consumer
add 8b69d44 Merge branch 'dev' of github.com:apache/incubator-streampipes into kafka-auth
add ab864f4 Merge branch 'dev' into kafka-auth
add 99fcb8e Removed legacy ui code
add 999cc60 Removed legacy ui code
add 499ef66 Merge branch 'dev' into kafka-auth
add 1324b37 Fix v1-api route
add fe213d1 Deleted streampipes-app-file-export/
add 82b79fd Merge remote-tracking branch 'main/dev' into kafka-auth
add df9e394 Removed DISCLAIMER-WIP
add a18e426 Merge pull request #28 from heymarco/kafka-auth
add cc29299 Merge branch 'dev' into bundle
add 24c7699 [hotfix] add configuration option for RDF4J storage dir
add b8f46b6 [hotfix] minor renaming of config option
new a37b412 Merge branch 'dev' into edge-extensions
add 67940fc [STREAMPIPES-263] add logging message for adapter registration process
new 389b51b Merge branch 'dev' into edge-extensions
add 284ec2c [STREAMPIPES-174] add debug init for model submitter
new f6fef98 Merge branch 'dev' into edge-extensions
new 4e66460 [WIP] add initial model and support for data stream relay
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
streampipes-backend/src/main/resources/shiro.ini | 1 +
.../pom.xml | 15 +-
.../extensions/ExtensionsModelSubmitter.java | 162 +++++++++++
.../extensions/ExtensionsResourceConfig.java | 49 ++++
.../src/main/resources/banner.txt | 2 +-
.../standalone/init/StandaloneModelSubmitter.java | 2 +-
.../streampipes/container/init/ModelSubmitter.java | 6 +-
.../model/{PeConfig.java => ExtensionsConfig.java} | 4 +-
.../messaging/kafka/SpKafkaConsumer.java | 43 ++-
.../messaging/kafka/SpKafkaProducer.java | 18 +-
.../kafka/config/AbstractConfigFactory.java | 2 +
.../kafka/config/ConsumerConfigFactory.java | 17 +-
.../kafka/config/ProducerConfigFactory.java | 17 ++
.../streampipes/model/SpDataStreamRelay.java | 73 +++++
.../model/connect/adapter/AdapterDescription.java | 3 -
.../model/graph/DataProcessorDescription.java | 27 +-
.../model/graph/DataProcessorInvocation.java | 28 +-
.../org/apache/streampipes/model/util/Cloner.java | 5 +
.../manager/matching/DataSetGroundingSelector.java | 12 -
.../manager/matching/InvocationGraphBuilder.java | 25 +-
.../jsonld/CustomAnnotationProvider.java | 8 +-
.../storage/rdf4j}/config/ConfigKeys.java | 13 +-
.../storage/rdf4j/config/Rdf4JConfig.java | 13 +-
.../apache/streampipes/vocabulary/StreamPipes.java | 3 +-
streampipes-wrapper-python/setup.py | 4 +-
.../{api/resources/processor.py => instances.py} | 32 ++-
.../streampipes/model/__init__.py | 2 +-
.../streampipes/submitter.py | 13 +-
.../streampipes/utils/__init__.py | 2 +-
ui/src/app/core-model/gen/streampipes-model.ts | 298 ++++++++++++++++++++-
.../runtime-resolvable.service.ts | 2 +-
32 files changed, 809 insertions(+), 93 deletions(-)
copy {streampipes-container-standalone => streampipes-container-extensions}/pom.xml (75%)
create mode 100644 streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
create mode 100644 streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsResourceConfig.java
copy {streampipes-connect-container-worker => streampipes-container-extensions}/src/main/resources/banner.txt (89%)
copy streampipes-container/src/main/java/org/apache/streampipes/container/model/{PeConfig.java => ExtensionsConfig.java} (91%)
create mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamRelay.java
copy {archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/src/main/java => streampipes-storage-rdf4j/src/main/java/org/apache/streampipes/storage/rdf4j}/config/ConfigKeys.java (76%)
copy streampipes-wrapper-python/streampipes/{api/resources/processor.py => instances.py} (51%)
[incubator-streampipes] 05/05: [WIP] add initial model and support
for data stream relay
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 4e6646051a48dde18a791d51e1d032b3eac76f56
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Fri Dec 4 00:26:20 2020 +0100
[WIP] add initial model and support for data stream relay
---
.../streampipes/model/SpDataStreamRelay.java | 73 +++++
.../model/graph/DataProcessorDescription.java | 27 +-
.../model/graph/DataProcessorInvocation.java | 28 +-
.../org/apache/streampipes/model/util/Cloner.java | 5 +
.../manager/matching/InvocationGraphBuilder.java | 25 +-
.../jsonld/CustomAnnotationProvider.java | 8 +-
.../apache/streampipes/vocabulary/StreamPipes.java | 3 +-
ui/src/app/core-model/gen/streampipes-model.ts | 298 ++++++++++++++++++++-
8 files changed, 447 insertions(+), 20 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamRelay.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamRelay.java
new file mode 100644
index 0000000..4486dac
--- /dev/null
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamRelay.java
@@ -0,0 +1,73 @@
+/*
+ * 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 io.fogsy.empire.annotations.RdfProperty;
+import io.fogsy.empire.annotations.RdfsClass;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.streampipes.model.base.NamedStreamPipesEntity;
+import org.apache.streampipes.model.grounding.EventGrounding;
+import org.apache.streampipes.vocabulary.StreamPipes;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+@RdfsClass(StreamPipes.DATA_STREAM_RELAY)
+@Entity
+public class SpDataStreamRelay extends NamedStreamPipesEntity {
+
+ private static final long serialVersionUID = -4675162465357705480L;
+
+ private static final String prefix = "urn:apache.org:relaystream:";
+
+ @OneToOne(fetch = FetchType.EAGER,
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+ @RdfProperty(StreamPipes.HAS_GROUNDING)
+ protected EventGrounding eventGrounding;
+
+ public SpDataStreamRelay() {
+ super(prefix + RandomStringUtils.randomAlphabetic(6));
+ }
+
+ public SpDataStreamRelay(NamedStreamPipesEntity other, EventGrounding eventGrounding) {
+ super(other);
+ this.eventGrounding = eventGrounding;
+ }
+
+ public SpDataStreamRelay(SpDataStreamRelay other) {
+ super(other);
+ if (other.getEventGrounding() != null) {
+ this.eventGrounding = new EventGrounding(other.getEventGrounding());
+ }
+ }
+
+ public SpDataStreamRelay(EventGrounding eventGrounding) {
+ this.eventGrounding = eventGrounding;
+ }
+
+ public EventGrounding getEventGrounding() {
+ return eventGrounding;
+ }
+
+ public void setEventGrounding(EventGrounding eventGrounding) {
+ this.eventGrounding = eventGrounding;
+ }
+
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
index 0921ed4..ef15259 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
@@ -21,16 +21,14 @@ package org.apache.streampipes.model.graph;
import io.fogsy.empire.annotations.RdfProperty;
import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.SpDataStreamRelay;
import org.apache.streampipes.model.base.ConsumableStreamPipesEntity;
import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
@@ -45,6 +43,11 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
@RdfProperty(StreamPipes.HAS_OUTPUT_STRATEGY)
private List<OutputStrategy> outputStrategies;
+ @OneToOne(fetch = FetchType.EAGER,
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+ @RdfProperty(StreamPipes.HAS_EVENT_RELAY)
+ private List<SpDataStreamRelay> outputStreamRelays;
+
private String pathName;
@OneToMany(fetch = FetchType.EAGER,
@@ -57,20 +60,25 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
this.outputStrategies = new Cloner().strategies(other.getOutputStrategies());
this.pathName = other.getPathName();
this.category = new Cloner().epaTypes(other.getCategory());
+ this.outputStreamRelays = new Cloner().relays(other.getOutputStreamRelays());
}
public DataProcessorDescription() {
super();
this.outputStrategies = new ArrayList<>();
this.category = new ArrayList<>();
+ this.outputStreamRelays = new ArrayList<>();
}
- public DataProcessorDescription(String uri, String name, String description, String iconUrl, List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties, List<OutputStrategy> outputStrategies) {
+ public DataProcessorDescription(String uri, String name, String description, String iconUrl,
+ List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties,
+ List<OutputStrategy> outputStrategies, List<SpDataStreamRelay> outputStreamRelays) {
super(uri, name, description, iconUrl);
this.pathName = uri;
this.spDataStreams = spDataStreams;
this.staticProperties = staticProperties;
this.outputStrategies = outputStrategies;
+ this.outputStreamRelays = outputStreamRelays;
}
public DataProcessorDescription(String pathName, String name, String description, String iconUrl) {
@@ -78,6 +86,7 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
this.pathName = pathName;
spDataStreams = new ArrayList<>();
staticProperties = new ArrayList<>();
+ outputStreamRelays = new ArrayList<>();
}
public DataProcessorDescription(String pathName, String name, String description) {
@@ -85,6 +94,7 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
this.pathName = pathName;
spDataStreams = new ArrayList<>();
staticProperties = new ArrayList<>();
+ outputStreamRelays = new ArrayList<>();
}
@@ -112,4 +122,11 @@ public class DataProcessorDescription extends ConsumableStreamPipesEntity {
this.outputStrategies = outputStrategies;
}
+ public List<SpDataStreamRelay> getOutputStreamRelays() {
+ return outputStreamRelays;
+ }
+
+ public void setOutputStreamRelays(List<SpDataStreamRelay> outputStreamRelays) {
+ this.outputStreamRelays = outputStreamRelays;
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
index e224806..a34628b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.model.graph;
import io.fogsy.empire.annotations.RdfProperty;
import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.SpDataStreamRelay;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.staticproperty.StaticProperty;
@@ -49,6 +50,11 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
@RdfProperty(StreamPipes.HAS_OUTPUT_STRATEGY)
private List<OutputStrategy> outputStrategies;
+ @OneToOne(fetch = FetchType.EAGER,
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+ @RdfProperty(StreamPipes.HAS_EVENT_RELAY)
+ private List<SpDataStreamRelay> outputStreamRelays;
+
private String pathName;
@OneToMany(fetch = FetchType.EAGER,
@@ -74,6 +80,9 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
this.setElementEndpointServiceName(sepa.getElementEndpointServiceName());
this.setElementEndpointHostname(sepa.getElementEndpointHostname());
this.setElementEndpointPort(sepa.getElementEndpointPort());
+
+ this.setOutputStreamRelays(sepa.getOutputStreamRelays());
+
//this.setUri(belongsTo +"/" +getElementId());
}
@@ -83,6 +92,9 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
if (other.getOutputStream() != null) {
this.outputStream = new Cloner().stream(other.getOutputStream());
}
+ if (other.getOutputStreamRelays() != null) {
+ this.outputStreamRelays = new Cloner().relays(other.getOutputStreamRelays());
+ }
this.pathName = other.getPathName();
this.category = new Cloner().epaTypes(other.getCategory());
}
@@ -95,13 +107,17 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
public DataProcessorInvocation() {
super();
inputStreams = new ArrayList<>();
+ outputStreamRelays = new ArrayList<>();
}
- public DataProcessorInvocation(String uri, String name, String description, String iconUrl, String pathName, List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties) {
+ public DataProcessorInvocation(String uri, String name, String description, String iconUrl, String pathName,
+ List<SpDataStream> spDataStreams, List<StaticProperty> staticProperties,
+ List<SpDataStreamRelay> spDataStreamRelays) {
super(uri, name, description, iconUrl);
this.pathName = pathName;
this.inputStreams = spDataStreams;
this.staticProperties = staticProperties;
+ this.outputStreamRelays = spDataStreamRelays;
}
public DataProcessorInvocation(String uri, String name, String description, String iconUrl, String pathName) {
@@ -109,6 +125,7 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
this.pathName = pathName;
inputStreams = new ArrayList<>();
staticProperties = new ArrayList<>();
+ outputStreamRelays = new ArrayList<>();
}
public boolean addInputStream(SpDataStream spDataStream) {
@@ -148,4 +165,13 @@ public class DataProcessorInvocation extends InvocableStreamPipesEntity implemen
this.category = category;
}
+ public boolean addOutputStreamRelay(SpDataStreamRelay spDataStreamRelay) { return outputStreamRelays.add(spDataStreamRelay); }
+
+ public List<SpDataStreamRelay> getOutputStreamRelays() {
+ return outputStreamRelays;
+ }
+
+ public void setOutputStreamRelays(List<SpDataStreamRelay> outputStreamRelays) {
+ this.outputStreamRelays = outputStreamRelays;
+ }
}
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 178ebf7..8145c56 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
@@ -18,6 +18,7 @@
package org.apache.streampipes.model.util;
+import org.apache.streampipes.model.SpDataStreamRelay;
import org.apache.streampipes.model.grounding.*;
import org.apache.streampipes.model.output.*;
import org.apache.streampipes.model.staticproperty.*;
@@ -188,6 +189,10 @@ public class Cloner {
return spDataStreams.stream().map(s -> new SpDataStream(s)).collect(Collectors.toList());
}
+ public List<SpDataStreamRelay> relays(List<SpDataStreamRelay> spDataStreamRelays) {
+ return spDataStreamRelays.stream().map(s -> new SpDataStreamRelay(s)).collect(Collectors.toList());
+ }
+
public SpDataStream mapSequence(SpDataStream seq) {
if (seq instanceof SpDataSet) {
return new SpDataSet((SpDataSet) seq);
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/InvocationGraphBuilder.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/InvocationGraphBuilder.java
index 597e9d0..edd6c46 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/InvocationGraphBuilder.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/InvocationGraphBuilder.java
@@ -25,6 +25,7 @@ import org.apache.streampipes.manager.data.PipelineGraphHelpers;
import org.apache.streampipes.manager.matching.output.OutputSchemaFactory;
import org.apache.streampipes.manager.matching.output.OutputSchemaGenerator;
import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.SpDataStreamRelay;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,10 +35,7 @@ import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.sdk.helpers.Tuple2;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
public class InvocationGraphBuilder {
@@ -102,6 +100,25 @@ public class InvocationGraphBuilder {
// target runs on cloud node: use central cloud broker, e.g. kafka
// TODO: set event relay to true
// TODO: add cloud broker to List<EventRelays>
+
+
+ if (source instanceof DataProcessorInvocation) {
+ EventGrounding relayEventGrounding = new EventGrounding();
+
+ relayEventGrounding.setTransportProtocol(
+ new KafkaTransportProtocol(
+ BackendConfig.INSTANCE.getKafkaHost(),
+ BackendConfig.INSTANCE.getKafkaPort(),
+ inputGrounding.getTransportProtocol().getTopicDefinition().getActualTopicName(),
+ BackendConfig.INSTANCE.getZookeeperHost(),
+ BackendConfig.INSTANCE.getZookeeperPort()));
+
+ relayEventGrounding.setTransportFormats(inputGrounding.getTransportFormats());
+
+ ((DataProcessorInvocation) source)
+ .addOutputStreamRelay(new SpDataStreamRelay(relayEventGrounding));
+ }
+
t.getInputStreams()
.get(getIndex(source.getDOM(), t))
.setEventGrounding(inputGrounding);
diff --git a/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java b/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
index bfed0b9..4b6f1e7 100644
--- a/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
+++ b/streampipes-serializers/src/main/java/org/apache/streampipes/serializers/jsonld/CustomAnnotationProvider.java
@@ -19,10 +19,7 @@
package org.apache.streampipes.serializers.jsonld;
import io.fogsy.empire.core.empire.util.EmpireAnnotationProvider;
-import org.apache.streampipes.model.ApplicationLink;
-import org.apache.streampipes.model.SpDataSet;
-import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.SpDataStreamContainer;
+import org.apache.streampipes.model.*;
import org.apache.streampipes.model.base.StreamPipesJsonLdContainer;
import org.apache.streampipes.model.connect.adapter.*;
import org.apache.streampipes.model.connect.grounding.FormatDescription;
@@ -186,7 +183,8 @@ public class CustomAnnotationProvider implements EmpireAnnotationProvider {
VisualizablePipeline.class,
DataExplorerWidgetModel.class,
StreamPipesJsonLdContainer.class,
- DataLakeMeasure.class
+ DataLakeMeasure.class,
+ SpDataStreamRelay.class
);
}
}
diff --git a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
index 8897ffa..4f7f3b4 100644
--- a/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
+++ b/streampipes-vocabulary/src/main/java/org/apache/streampipes/vocabulary/StreamPipes.java
@@ -105,6 +105,7 @@ public class StreamPipes {
public static final String EVENT_SCHEMA = NS + "EventSchema";
public static final String DATA_SOURCE = NS + "DataSource";
public static final String DATA_STREAM = NS + "DataStream";
+ public static final String DATA_STREAM_RELAY = NS + "DataStreamRelay";
public static final String DATA_SET = NS + "DataSet";
public static final String DATA_SEQUENCE = NS + "DataSequence";
public static final String DATA_SET_INVOCATION_ID = NS + "DataSetInvocationId";
@@ -418,5 +419,5 @@ public class StreamPipes {
public static final String PE_CONFIGURED = NS + "isPeConfigured" ;
public static final String HAS_REQUIRED_FILETYPES = NS + "hasRequiredFiletypes" ;
- public static final String HAS_EVENT_STREAM_RELAYS = NS + "hasEventStreamRelays";
+ public static final String HAS_EVENT_RELAY = NS + "hasEventRelay";
}
diff --git a/ui/src/app/core-model/gen/streampipes-model.ts b/ui/src/app/core-model/gen/streampipes-model.ts
index e9e95be..3b896db 100644
--- a/ui/src/app/core-model/gen/streampipes-model.ts
+++ b/ui/src/app/core-model/gen/streampipes-model.ts
@@ -19,10 +19,10 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 2.24.612 on 2020-11-10 15:19:54.
+// Generated using typescript-generator version 2.24.612 on 2020-12-04 00:21:22.
export class AbstractStreamPipesEntity {
- "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter.G [...]
+ "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter.G [...]
static fromData(data: AbstractStreamPipesEntity, target?: AbstractStreamPipesEntity): AbstractStreamPipesEntity {
if (!data) {
@@ -34,8 +34,27 @@ export class AbstractStreamPipesEntity {
}
}
+export class AccessibleSensorActuatorResource {
+ connectionInfo: string;
+ connectionType: string;
+ name: string;
+ type: string;
+
+ static fromData(data: AccessibleSensorActuatorResource, target?: AccessibleSensorActuatorResource): AccessibleSensorActuatorResource {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new AccessibleSensorActuatorResource();
+ instance.name = data.name;
+ instance.type = data.type;
+ instance.connectionInfo = data.connectionInfo;
+ instance.connectionType = data.connectionType;
+ return instance;
+ }
+}
+
export class UnnamedStreamPipesEntity extends AbstractStreamPipesEntity {
- "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.streamp [...]
+ "@class": "org.apache.streampipes.model.base.UnnamedStreamPipesEntity" | "org.apache.streampipes.model.connect.guess.GuessSchema" | "org.apache.streampipes.model.connect.rules.TransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription" | "org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription" | "org.apache.streamp [...]
elementId: string;
static fromData(data: UnnamedStreamPipesEntity, target?: UnnamedStreamPipesEntity): UnnamedStreamPipesEntity {
@@ -119,7 +138,7 @@ export class Accuracy extends EventPropertyQualityDefinition {
}
export class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
- "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter.G [...]
+ "@class": "org.apache.streampipes.model.base.NamedStreamPipesEntity" | "org.apache.streampipes.model.connect.adapter.AdapterDescription" | "org.apache.streampipes.model.connect.adapter.AdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription" | "org.apache.streampipes.model.connect.adapter.AdapterStreamDescription" | "org.apache.streampipes.model.connect.adapter.G [...]
appId: string;
applicationLinks: ApplicationLink[];
connectedTo: string[];
@@ -596,6 +615,21 @@ export class ApplicationLink extends UnnamedStreamPipesEntity {
}
}
+export class CPU {
+ arch: string;
+ cores: number;
+
+ static fromData(data: CPU, target?: CPU): CPU {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new CPU();
+ instance.cores = data.cores;
+ instance.arch = data.arch;
+ return instance;
+ }
+}
+
export class Category {
_id: string;
_rev: string;
@@ -717,6 +751,21 @@ export class CreateNestedRuleDescription extends SchemaTransformationRuleDescrip
}
}
+export class Cuda {
+ cudaDriverVersion: string;
+ cudaRuntimeVersion: string;
+
+ static fromData(data: Cuda, target?: Cuda): Cuda {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new Cuda();
+ instance.cudaDriverVersion = data.cudaDriverVersion;
+ instance.cudaRuntimeVersion = data.cudaRuntimeVersion;
+ return instance;
+ }
+}
+
export class CustomOutputStrategy extends OutputStrategy {
"@class": "org.apache.streampipes.model.output.CustomOutputStrategy";
availablePropertyKeys: string[];
@@ -751,6 +800,19 @@ export class CustomTransformOutputStrategy extends OutputStrategy {
}
}
+export class DISK {
+ diskTotal: number;
+
+ static fromData(data: DISK, target?: DISK): DISK {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new DISK();
+ instance.diskTotal = data.diskTotal;
+ return instance;
+ }
+}
+
export class DashboardEntity extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.dashboard.DashboardEntity" | "org.apache.streampipes.model.dashboard.DashboardWidgetModel" | "org.apache.streampipes.model.dashboard.VisualizablePipeline" | "org.apache.streampipes.model.datalake.DataExplorerWidgetModel";
_id: string;
@@ -930,6 +992,13 @@ export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
configured: boolean;
correspondingPipeline: string;
correspondingUser: string;
+ deploymentRunningInstanceId: string;
+ deploymentTargetNodeHostname: string;
+ deploymentTargetNodeId: string;
+ deploymentTargetNodePort: number;
+ elementEndpointHostname: string;
+ elementEndpointPort: number;
+ elementEndpointServiceName: string;
inputStreams: SpDataStreamUnion[];
staticProperties: StaticPropertyUnion[];
statusInfoSettings: ElementStatusInfoSettings;
@@ -951,6 +1020,13 @@ export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
instance.correspondingPipeline = data.correspondingPipeline;
instance.correspondingUser = data.correspondingUser;
instance.streamRequirements = __getCopyArrayFn(SpDataStream.fromDataUnion)(data.streamRequirements);
+ instance.elementEndpointHostname = data.elementEndpointHostname;
+ instance.elementEndpointPort = data.elementEndpointPort;
+ instance.deploymentTargetNodeId = data.deploymentTargetNodeId;
+ instance.deploymentTargetNodeHostname = data.deploymentTargetNodeHostname;
+ instance.deploymentTargetNodePort = data.deploymentTargetNodePort;
+ instance.deploymentRunningInstanceId = data.deploymentRunningInstanceId;
+ instance.elementEndpointServiceName = data.elementEndpointServiceName;
instance.configured = data.configured;
instance.uncompleted = data.uncompleted;
return instance;
@@ -962,6 +1038,7 @@ export class DataProcessorInvocation extends InvocableStreamPipesEntity {
category: string[];
outputStrategies: OutputStrategyUnion[];
outputStream: SpDataStreamUnion;
+ outputStreamRelays: SpDataStreamRelay[];
pathName: string;
static fromData(data: DataProcessorInvocation, target?: DataProcessorInvocation): DataProcessorInvocation {
@@ -972,6 +1049,7 @@ export class DataProcessorInvocation extends InvocableStreamPipesEntity {
super.fromData(data, instance);
instance.outputStream = SpDataStream.fromDataUnion(data.outputStream);
instance.outputStrategies = __getCopyArrayFn(OutputStrategy.fromDataUnion)(data.outputStrategies);
+ instance.outputStreamRelays = __getCopyArrayFn(SpDataStreamRelay.fromData)(data.outputStreamRelays);
instance.pathName = data.pathName;
instance.category = __getCopyArrayFn(__identity<string>())(data.category);
return instance;
@@ -1092,6 +1170,25 @@ export class DeleteRuleDescription extends SchemaTransformationRuleDescription {
}
}
+export class Docker {
+ apiVersion: string;
+ hasDocker: boolean;
+ hasNvidiaRuntime: boolean;
+ serverVersion: string;
+
+ static fromData(data: Docker, target?: Docker): Docker {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new Docker();
+ instance.hasDocker = data.hasDocker;
+ instance.hasNvidiaRuntime = data.hasNvidiaRuntime;
+ instance.serverVersion = data.serverVersion;
+ instance.apiVersion = data.apiVersion;
+ return instance;
+ }
+}
+
export class DomainPropertyProbability extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.connect.guess.DomainPropertyProbability";
domainProperty: string;
@@ -1580,6 +1677,23 @@ export class Frequency extends EventStreamQualityDefinition {
}
}
+export class GPU {
+ cudaCores: number;
+ hasGPU: boolean;
+ type: string;
+
+ static fromData(data: GPU, target?: GPU): GPU {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new GPU();
+ instance.hasGPU = data.hasGPU;
+ instance.cudaCores = data.cudaCores;
+ instance.type = data.type;
+ return instance;
+ }
+}
+
export interface GenericAdapterDescription {
eventSchema: EventSchema;
formatDescription: FormatDescription;
@@ -1642,6 +1756,25 @@ export class GuessSchema extends UnnamedStreamPipesEntity {
}
}
+export class HardwareResource {
+ cpu: CPU;
+ disk: DISK;
+ gpu: GPU;
+ memory: MEM;
+
+ static fromData(data: HardwareResource, target?: HardwareResource): HardwareResource {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new HardwareResource();
+ instance.cpu = CPU.fromData(data.cpu);
+ instance.memory = MEM.fromData(data.memory);
+ instance.disk = DISK.fromData(data.disk);
+ instance.gpu = GPU.fromData(data.gpu);
+ return instance;
+ }
+}
+
export class TransportProtocol extends UnnamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.grounding.TransportProtocol" | "org.apache.streampipes.model.grounding.JmsTransportProtocol" | "org.apache.streampipes.model.grounding.KafkaTransportProtocol" | "org.apache.streampipes.model.grounding.MqttTransportProtocol";
brokerHostname: string;
@@ -1791,6 +1924,19 @@ export class ListOutputStrategy extends OutputStrategy {
}
}
+export class MEM {
+ memTotal: number;
+
+ static fromData(data: MEM, target?: MEM): MEM {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new MEM();
+ instance.memTotal = data.memTotal;
+ return instance;
+ }
+}
+
export class MappingProperty extends StaticProperty {
"@class": "org.apache.streampipes.model.staticproperty.MappingProperty" | "org.apache.streampipes.model.staticproperty.MappingPropertyUnary" | "org.apache.streampipes.model.staticproperty.MappingPropertyNary";
mapsFromOptions: string[];
@@ -1948,6 +2094,93 @@ export class MqttTransportProtocol extends TransportProtocol {
}
}
+export class Node {
+ nodeInfo: NodeInfo;
+
+ static fromData(data: Node, target?: Node): Node {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new Node();
+ instance.nodeInfo = NodeInfo.fromData(data.nodeInfo);
+ return instance;
+ }
+}
+
+export class NodeBrokerInfo {
+ host: string;
+ port: number;
+
+ static fromData(data: NodeBrokerInfo, target?: NodeBrokerInfo): NodeBrokerInfo {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new NodeBrokerInfo();
+ instance.host = data.host;
+ instance.port = data.port;
+ return instance;
+ }
+}
+
+export class NodeInfo {
+ nodeBrokerInfo: NodeBrokerInfo;
+ nodeControllerId: string;
+ nodeControllerPort: number;
+ nodeMetadata: NodeMetadata;
+ nodeResources: NodeResources;
+ supportedPipelineElementAppIds: string[];
+
+ static fromData(data: NodeInfo, target?: NodeInfo): NodeInfo {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new NodeInfo();
+ instance.nodeControllerId = data.nodeControllerId;
+ instance.nodeControllerPort = data.nodeControllerPort;
+ instance.nodeMetadata = NodeMetadata.fromData(data.nodeMetadata);
+ instance.nodeBrokerInfo = NodeBrokerInfo.fromData(data.nodeBrokerInfo);
+ instance.nodeResources = NodeResources.fromData(data.nodeResources);
+ instance.supportedPipelineElementAppIds = __getCopyArrayFn(__identity<string>())(data.supportedPipelineElementAppIds);
+ return instance;
+ }
+}
+
+export class NodeMetadata {
+ nodeAddress: string;
+ nodeLocationTags: string[];
+ nodeModel: string;
+ nodeType: string;
+
+ static fromData(data: NodeMetadata, target?: NodeMetadata): NodeMetadata {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new NodeMetadata();
+ instance.nodeAddress = data.nodeAddress;
+ instance.nodeModel = data.nodeModel;
+ instance.nodeType = data.nodeType;
+ instance.nodeLocationTags = __getCopyArrayFn(__identity<string>())(data.nodeLocationTags);
+ return instance;
+ }
+}
+
+export class NodeResources {
+ accessibleSensorActuatorResource: AccessibleSensorActuatorResource[];
+ hardwareResource: HardwareResource;
+ softwareResource: SoftwareResource;
+
+ static fromData(data: NodeResources, target?: NodeResources): NodeResources {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new NodeResources();
+ instance.hardwareResource = HardwareResource.fromData(data.hardwareResource);
+ instance.softwareResource = SoftwareResource.fromData(data.softwareResource);
+ instance.accessibleSensorActuatorResource = __getCopyArrayFn(AccessibleSensorActuatorResource.fromData)(data.accessibleSensorActuatorResource);
+ return instance;
+ }
+}
+
export class Notification {
additionalInformation: string;
description: string;
@@ -2056,6 +2289,31 @@ export class PipelineCategory {
}
}
+export class PipelineElementDockerContainer extends UnnamedStreamPipesEntity {
+ "@class": "org.apache.streampipes.model.node.PipelineElementDockerContainer";
+ containerName: string;
+ containerPorts: string[];
+ envVars: string[];
+ imageURI: string;
+ labels: { [index: string]: string };
+ serviceId: string;
+
+ static fromData(data: PipelineElementDockerContainer, target?: PipelineElementDockerContainer): PipelineElementDockerContainer {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new PipelineElementDockerContainer();
+ super.fromData(data, instance);
+ instance.imageURI = data.imageURI;
+ instance.containerName = data.containerName;
+ instance.serviceId = data.serviceId;
+ instance.containerPorts = __getCopyArrayFn(__identity<string>())(data.containerPorts);
+ instance.envVars = __getCopyArrayFn(__identity<string>())(data.envVars);
+ instance.labels = __getCopyObjectFn(__identity<string>())(data.labels);
+ return instance;
+ }
+}
+
export class PipelineElementRecommendation {
count: number;
description: string;
@@ -2464,6 +2722,23 @@ export class SimpleTopicDefinition extends TopicDefinition {
}
}
+export class SoftwareResource {
+ docker: Docker;
+ kernelVersion: string;
+ os: string;
+
+ static fromData(data: SoftwareResource, target?: SoftwareResource): SoftwareResource {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new SoftwareResource();
+ instance.os = data.os;
+ instance.kernelVersion = data.kernelVersion;
+ instance.docker = Docker.fromData(data.docker);
+ return instance;
+ }
+}
+
export class SpDataStream extends NamedStreamPipesEntity {
"@class": "org.apache.streampipes.model.SpDataStream" | "org.apache.streampipes.model.SpDataSet";
category: string[];
@@ -2528,6 +2803,21 @@ export class SpDataSet extends SpDataStream {
}
}
+export class SpDataStreamRelay extends NamedStreamPipesEntity {
+ "@class": "org.apache.streampipes.model.SpDataStreamRelay";
+ eventGrounding: EventGrounding;
+
+ static fromData(data: SpDataStreamRelay, target?: SpDataStreamRelay): SpDataStreamRelay {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new SpDataStreamRelay();
+ super.fromData(data, instance);
+ instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
+ return instance;
+ }
+}
+
export class SpecificAdapterSetDescription extends AdapterSetDescription {
"@class": "org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription";
[incubator-streampipes] 01/05: [STREAMPIPES-252] clean up comments
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6e129a1d437677d8ccd3b3efe352d8f8792a3bbe
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Sat Nov 28 13:43:33 2020 +0100
[STREAMPIPES-252] clean up comments
---
.../model/connect/adapter/AdapterDescription.java | 3 ---
.../manager/matching/DataSetGroundingSelector.java | 12 ------------
2 files changed, 15 deletions(-)
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 6be495e..37fa541 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
@@ -107,9 +107,6 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
tpJms.setTopicDefinition(new SimpleTopicDefinition("cc"));
tpMqtt.setTopicDefinition(new SimpleTopicDefinition("dd"));
this.eventGrounding.setTransportProtocols(Arrays.asList(tpKafka,tpJms,tpMqtt));
-// this.eventGrounding.setTransportFormats(Arrays.asList(Formats.jsonFormat()));
-
-
}
public AdapterDescription(String uri, String name, String description) {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
index a14bffc..cdbeee0 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
@@ -72,18 +72,6 @@ public class DataSetGroundingSelector {
outputGrounding.setTransportFormats(Collections
.singletonList(spDataSet.getSupportedGrounding().getTransportFormats().get(0)));
-// // TODO grounding negotiation
-// TransportProtocol protocol = new KafkaTransportProtocol(BackendConfig.INSTANCE.getKafkaHost(),
-// BackendConfig.INSTANCE.getKafkaPort(),
-// TopicGenerator.generateRandomTopic(),
-// BackendConfig.INSTANCE.getZookeeperHost(),
-// BackendConfig.INSTANCE.getZookeeperPort());
-// TransportFormat format = spDataSet.getSupportedGrounding().getTransportFormats().get(0);
-//
-// EventGrounding outputGrounding = new EventGrounding();
-// outputGrounding.setTransportProtocol(protocol);
-// outputGrounding.setTransportFormats(Arrays.asList(format));
-
return new DataSetModificationMessage(outputGrounding,RandomStringUtils.randomAlphanumeric(10));
}
[incubator-streampipes] 03/05: Merge branch 'dev' into
edge-extensions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 389b51b381fc9a5b4db2c06978a323d630c1a509
Merge: a37b412 67940fc
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Wed Dec 2 15:22:52 2020 +0100
Merge branch 'dev' into edge-extensions
.../streampipes/container/extensions/ExtensionsModelSubmitter.java | 1 +
1 file changed, 1 insertion(+)
[incubator-streampipes] 04/05: Merge branch 'dev' into
edge-extensions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit f6fef98db6b609d9b95e856ad39294b23488bf50
Merge: 389b51b 284ec2c
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Dec 3 15:35:05 2020 +0100
Merge branch 'dev' into edge-extensions
streampipes-wrapper-python/setup.py | 4 +--
.../streampipes/{submitter.py => instances.py} | 42 ++++++++++++----------
.../streampipes/submitter.py | 13 ++++++-
3 files changed, 38 insertions(+), 21 deletions(-)
[incubator-streampipes] 02/05: Merge branch 'dev' into
edge-extensions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit a37b412e536c8c8e089726709486954fdfc129b4
Merge: 6e129a1 b8f46b6
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Wed Dec 2 11:12:49 2020 +0100
Merge branch 'dev' into edge-extensions
pom.xml | 1 +
streampipes-backend/src/main/resources/shiro.ini | 1 +
streampipes-container-extensions/pom.xml | 58 ++++++++
.../extensions/ExtensionsModelSubmitter.java | 161 +++++++++++++++++++++
.../extensions/ExtensionsResourceConfig.java | 49 +++++++
.../src/main/resources/banner.txt | 6 +
.../standalone/init/StandaloneModelSubmitter.java | 2 +-
.../streampipes/container/init/ModelSubmitter.java | 6 +-
.../ExtensionsConfig.java} | 13 +-
.../messaging/kafka/SpKafkaConsumer.java | 43 ++++--
.../messaging/kafka/SpKafkaProducer.java | 18 ++-
.../kafka/config/AbstractConfigFactory.java | 2 +
.../kafka/config/ConsumerConfigFactory.java | 17 ++-
.../kafka/config/ProducerConfigFactory.java | 17 +++
.../storage/rdf4j/config/ConfigKeys.java | 12 +-
.../storage/rdf4j/config/Rdf4JConfig.java | 13 +-
.../streampipes/model/__init__.py | 2 +-
.../streampipes/utils/__init__.py | 2 +-
.../runtime-resolvable.service.ts | 2 +-
19 files changed, 382 insertions(+), 43 deletions(-)