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/11/20 09:03:03 UTC
[incubator-streampipes] 01/03: Merge branch 'dev' into
edge-extensions
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 fb0521e35575b245c24cadf48dde58ce528f29d2
Merge: 505c4c5 1040204
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Nov 17 20:45:55 2020 +0100
Merge branch 'dev' into edge-extensions
.github/workflows/build.yml | 38 +-
.gitlab-ci.yml | 2 +-
.../all_pipeline_elements_jvm.xml | 1 +
.idea/runConfigurations/backend.xml | 1 +
.idea/runConfigurations/sinks_internal_jvm.xml | 2 +-
Jenkinsfile | 6 +-
.../main/resources/archetype-resources/Dockerfile | 2 +-
.../archetype-resources/src/main/java/Init.java | 1 +
.../main/resources/archetype-resources/Dockerfile | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 5 +
.../archetype-resources/src/main/java/Init.java | 1 +
.../main/resources/archetype-resources/Dockerfile | 2 +-
.../archetype-resources/src/main/java/Init.java | 1 +
.../main/resources/archetype-resources/Dockerfile | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 5 +
.../archetype-resources/src/main/java/Init.java | 1 +
.../main/resources/archetype-resources/Dockerfile | 2 +-
docker-compose.yml | 4 +-
pom.xml | 1 +
streampipes-backend/Dockerfile | 2 +-
.../backend/StreamPipesResourceConfig.java | 2 +
streampipes-backend/src/main/resources/shiro.ini | 7 +
.../commons/exceptions/SpException.java | 2 +-
.../streampipes/config/backend/BackendConfig.java | 5 +-
.../config/backend/BackendConfigKeys.java | 2 +
.../config/backend/MessagingSettings.java | 33 +-
.../streampipes/config/backend/SpProtocol.java | 10 +-
streampipes-connect-container-master/Dockerfile | 2 +-
.../streampipes/connect/adapter/Adapter.java | 60 ++-
.../connect/adapter/GroundingService.java | 36 +-
.../elements/SendToBrokerAdapterSink.java | 4 +-
...ink.java => SendToBrokerReplayAdapterSink.java} | 22 +-
.../elements/SendToJmsAdapterSink.java | 10 +-
.../elements/SendToKafkaAdapterSink.java | 6 +-
.../elements/SendToMqttAdapterSink.java | 14 +-
.../TransformValueAdapterPipelineElement.java | 7 +-
.../value/CorrectionValueTransformationRule.java | 93 ++++
.../transform/value/ValueEventTransformer.java | 38 +-
.../connect/adapter/GroundingServiceTest.java | 128 +++--
.../messaging/jms/ActiveMQPublisher.java | 15 +-
.../streampipes/messaging/jms/ActiveMQUtils.java | 12 +-
.../streampipes/messaging/mqtt/MqttConsumer.java | 13 +-
.../apache/streampipes/model/client/Category.java | 3 +-
.../rules/TransformationRuleDescription.java | 10 +-
...rrectionValueTransformationRuleDescription.java | 80 +++
.../value/ValueTransformationRuleDescription.java | 1 +
.../streampipes/model/labeling/Category.java | 67 +++
.../apache/streampipes/model/labeling/Label.java | 73 +++
.../org/apache/streampipes/model/util/Cloner.java | 9 +-
streampipes-pipeline-management/pom.xml | 5 +
.../matching/PipelineVerificationHandler.java | 3 +
.../runtime/PipelineElementRuntimeInfoFetcher.java | 28 +-
.../manager/setup/CouchDbInstallationStep.java | 24 +
.../org/apache/streampipes/rest/api/ICategory.java | 28 +-
.../org/apache/streampipes/rest/api/ILabel.java | 31 +-
.../streampipes/rest/impl/CategoryResource.java | 116 ++++
.../streampipes/rest/impl/LabelResource.java | 144 +++++
.../rest/impl/datalake/DataLakeManagementV3.java | 4 +-
.../rest/impl/datalake/DataLakeResourceV3.java | 9 +-
.../sdk/extractor/AbstractParameterExtractor.java | 39 ++
.../apache/streampipes/sdk/helpers/Protocols.java | 21 +-
.../sdk/helpers/SupportedProtocols.java | 10 +
.../apache/streampipes/sdk/utils/Datatypes.java | 8 +
.../serializers/json/GsonSerializer.java | 8 +-
.../jsonld/CustomAnnotationProvider.java | 7 +-
.../streampipes/storage/api/ICategoryStorage.java | 27 +-
.../streampipes/storage/api/ILabelStorage.java | 31 +-
.../streampipes/storage/api/INoSqlStorage.java | 5 +
.../storage/couchdb/CouchDbStorageManager.java | 6 +
.../storage/couchdb/impl/CategoryStorageImpl.java | 57 ++
.../storage/couchdb/impl/LabelStorageImpl.java | 76 +++
.../streampipes/storage/couchdb/utils/Utils.java | 12 +
.../apache/streampipes/vocabulary/StreamPipes.java | 4 +-
streampipes-wrapper-distributed/pom.xml | 5 +
.../distributed/runtime/DistributedRuntime.java | 21 +-
.../wrapper/flink/FlinkDataProcessorRuntime.java | 10 +-
.../streampipes/wrapper/flink/FlinkRuntime.java | 22 +-
.../{JmsConsumer.java => JmsFlinkConsumer.java} | 6 +-
.../{JmsConsumer.java => MqttFlinkConsumer.java} | 26 +-
...FlinkJmsProducer.java => JmsFlinkProducer.java} | 4 +-
...linkJmsProducer.java => MqttFlinkProducer.java} | 14 +-
streampipes-wrapper-siddhi/pom.xml | 6 +
.../wrapper/siddhi/constants/SiddhiConstants.java | 55 ++
.../siddhi/constants/SiddhiStreamSelector.java | 17 +-
.../wrapper/siddhi/engine/SiddhiEngine.java | 127 +++++
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 274 +---------
...Callback.java => SiddhiStatementGenerator.java} | 9 +-
.../siddhi/engine/StreamPipesSiddhiProcessor.java | 57 ++
.../engine/{ => callback}/SiddhiDebugCallback.java | 2 +-
.../callback/SiddhiOutputStreamCallback.java | 54 ++
.../SiddhiOutputStreamDebugCallback.java} | 24 +-
.../engine/generator/EventTypeGenerator.java | 77 +++
.../engine/generator/InputStreamNameGenerator.java | 33 +-
.../engine/generator/SiddhiAppGenerator.java | 86 +++
.../generator/SiddhiInvocationConfigGenerator.java | 65 +++
.../wrapper/siddhi/model/EventPropertyDef.java | 26 +-
.../siddhi/model/SiddhiProcessorParams.java | 100 ++++
.../siddhi/query/AbstractQueryGenerator.java | 20 +-
.../wrapper/siddhi/query/FromClause.java | 48 ++
.../wrapper/siddhi/query/SelectClause.java | 78 +++
.../wrapper/siddhi/query/SiddhiStatement.java | 28 +-
.../siddhi/query/expression/EqualsExpression.java | 16 +-
.../siddhi/query/expression/Expression.java | 63 +++
.../siddhi/query/expression/Expressions.java | 157 ++++++
.../query/expression/GreaterEqualsExpression.java | 16 +-
.../query/expression/GreaterThanExpression.java | 16 +-
.../query/expression/LesserEqualsExpression.java | 16 +-
.../query/expression/LesserThanExpression.java | 16 +-
.../query/expression/PropertyExpression.java | 48 ++
.../query/expression/PropertyExpressionBase.java | 6 +-
.../query/expression/PropertyRenameExpression.java | 30 +-
.../query/expression/RelationalOperator.java | 22 +-
.../expression/RelationalOperatorExpression.java | 34 +-
.../query/expression/SequenceExpression.java | 24 +-
.../siddhi/query/expression/SiddhiTimeUnit.java | 18 +-
.../siddhi/query/expression/StreamExpression.java | 58 ++
.../query/expression/StreamFilterExpression.java | 57 ++
.../siddhi/query/expression/WithinExpression.java | 29 +-
.../expression/list/CollectListExpression.java | 31 +-
.../expression/list/ContainsListExpression.java | 52 ++
.../query/expression/math/MathAddExpression.java | 10 +-
.../expression/math/MathDivideExpression.java | 10 +-
.../query/expression/math/MathExpression.java | 44 ++
.../expression/math/MathMultiplyExpression.java | 10 +-
.../siddhi/query/expression/math/MathOperator.java | 23 +-
.../expression/math/MathSubtractExpression.java | 10 +-
.../query/expression/pattern/EveryExpression.java | 26 +-
.../expression/pattern/PatternCountExpression.java | 54 ++
.../expression/pattern/PatternCountOperator.java | 9 +-
.../expression/pattern/PatternExpression.java | 60 +++
.../expression/window/BatchWindowExpression.java | 15 +-
.../expression/window/TimeWindowExpression.java | 29 +-
.../query/expression/window/WindowExpression.java | 28 +-
.../wrapper/siddhi/utils/SiddhiUtils.java | 85 +++
.../wrapper/standalone/ProcessorParams.java | 27 +-
.../streampipes/wrapper/standalone/SinkParams.java | 19 +-
.../standalone/StreamPipesDataProcessor.java | 35 ++
.../wrapper/standalone/StreamPipesDataSink.java | 29 +-
ui/package.json | 34 +-
.../data-marketplace/data-marketplace.component.ts | 24 +-
.../event-schema/event-schema.component.ts | 3 +-
ui/src/app/connect/connect.module.ts | 4 +-
.../edit-correction-value.component.css} | 4 +-
.../edit-correction-value.component.html | 39 ++
.../edit-correction-value.component.ts | 55 ++
.../edit-event-property-primitive.component.html | 1 +
.../edit-event-property-primitive.component.ts | 9 +-
.../edit-event-property.component.html | 11 +-
.../edit-event-property.component.ts | 29 +-
.../services/transformation-rule.service.ts | 41 ++
ui/src/app/core-model/coco/Annotation.ts | 2 +
ui/src/app/core-model/coco/Category.ts | 10 +-
ui/src/app/core-model/gen/streampipes-model.ts | 104 ++--
.../datalake/datalake-rest.service.ts | 6 +-
.../semantic-type/semantic-type-utils.service.ts | 5 +
ui/src/app/core-ui/core-ui.module.ts | 118 ++--
.../image-annotations.component.html | 16 +-
.../image-annotations.component.ts | 21 +-
.../image-labels/image-labels.component.html | 39 --
.../image-labels/image-labels.component.ts | 73 ---
.../image-categorize.component.html | 5 +-
.../image-categorize/image-categorize.component.ts | 4 +-
.../image-labeling/image-labeling.component.html | 5 +-
.../image-labeling/image-labeling.component.ts | 45 +-
.../image/services/BrushLabeling.service.ts | 5 +-
.../core-ui/image/services/CocoFormat.service.ts | 22 +-
.../image/services/PolygonLabeling.service.ts | 7 +-
.../image/services/ReactLabeling.service.ts | 9 +-
.../configure-labels.component.css} | 4 +-
.../configure-labels.component.html | 66 +++
.../configure-labels/configure-labels.component.ts | 120 +++++
.../label-list-item/label-list-item.component.css} | 4 +-
.../label-list-item.component.html} | 27 +-
.../label-list-item/label-list-item.component.ts | 59 ++
.../select-label/select-label.component.css} | 0
.../select-label/select-label.component.html | 43 ++
.../select-label/select-label.component.ts | 81 +++
.../app/core-ui/labels/services/label.service.ts | 94 ++++
.../label-selection/label-selection.component.html | 32 --
.../label-selection/label-selection.component.ts | 61 ---
.../change-chartmode/change-chartmode.dialog.css | 29 -
.../change-chartmode/change-chartmode.dialog.ts | 35 --
.../dialogs/labeling/labeling.dialog.css | 36 --
.../dialogs/labeling/labeling.dialog.html | 36 --
.../dialogs/labeling/labeling.dialog.ts | 52 --
.../labeling-tool/labeling-tool.module.ts | 90 ----
.../filter/display-recommended.pipe.ts | 2 +-
.../static-mapping-unary.component.ts | 2 -
.../static-mapping/static-mapping.ts | 1 +
...data-explorer-dashboard-overview.component.html | 7 +-
.../data-explorer-dashboard-overview.component.ts | 7 +
.../data-explorer-dashboard-widget.component.html | 2 +-
.../data-explorer-dashboard-widget.component.ts | 2 +
.../widgets/base/base-data-explorer-widget.ts | 14 +-
.../point-selection-info.component.css | 0
.../point-selection-info.component.html | 0
.../point-selection-info.component.ts | 2 +-
.../line-chart/line-chart-widget.component.css | 5 +-
.../line-chart/line-chart-widget.component.html | 35 +-
.../line-chart/line-chart-widget.component.ts | 596 ++++++++++-----------
.../widgets/line-chart}/services/color.service.ts | 0
ui/src/app/data-explorer/data-explorer.module.ts | 96 ++--
ui/src/app/services/property-selector.service.ts | 3 +-
203 files changed, 4492 insertions(+), 1975 deletions(-)
diff --cc .github/workflows/build.yml
index 213fdd6,2dc00ac..e91b6be
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@@ -85,30 -85,11 +85,30 @@@ jobs
IMG_NAME_ARM32V7: ${{ env.DOCKERHUB_APACHE_REPO }}/streampipes-connect-container:arm32v7-${{ env.MVN_VERSION }}
IMG_NAME_ARM64V8: ${{ env.DOCKERHUB_APACHE_REPO }}/streampipes-connect-container:arm64v8-${{ env.MVN_VERSION }}
run: |
- docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_DEFAULT -t $IMG_NAME_DEFAULT -t $IMG_NAME_AMD64 -f Dockerfile .
- docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_ARM32V7 -t $IMG_NAME_ARM32V7 -f arm.Dockerfile .
- docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_ARM64V8 -t $IMG_NAME_ARM64V8 -f aarch64.Dockerfile .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_DEFAULT -t $IMG_NAME_DEFAULT -t $IMG_NAME_AMD64 -f Dockerfile .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_ARM32V7 -t $IMG_NAME_ARM32V7 -f arm.Dockerfile .
+ docker build --pull --build-arg BASE_IMAGE=$BASE_IMG_JRE_ARM64V8 -t $IMG_NAME_ARM64V8 -f aarch64.Dockerfile .
docker push $IMG_NAME_DEFAULT
docker push $IMG_NAME_AMD64
+ docker push $IMG_NAME_ARM32V7
+ docker push $IMG_NAME_ARM64V8
+ docker manifest create $IMG_NAME_DEFAULT $IMG_NAME_AMD64 $IMG_NAME_ARM32V7 $IMG_NAME_ARM64V8
+ docker manifest annotate $IMG_NAME_DEFAULT $IMG_NAME_ARM32V7 --os linux --arch arm
+ docker manifest annotate $IMG_NAME_DEFAULT $IMG_NAME_ARM64V8 --os linux --arch arm64
+ docker manifest push $IMG_NAME_DEFAULT
+ - name: Build and Push Docker Node Controller Image
+ working-directory: ./streampipes-node-controller-container
+ env:
+ IMG_NAME_DEFAULT: ${{ env.DOCKERHUB_APACHE_REPO }}/node-controller:${{ env.MVN_VERSION }}
+ IMG_NAME_AMD64: ${{ env.DOCKERHUB_APACHE_REPO }}/node-controller:amd64-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM32V7: ${{ env.DOCKERHUB_APACHE_REPO }}/node-controller:arm32v7-${{ env.MVN_VERSION }}
+ IMG_NAME_ARM64V8: ${{ env.DOCKERHUB_APACHE_REPO }}/node-controller:arm64v8-${{ env.MVN_VERSION }}
+ run: |
+ docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_DEFAULT -t $IMG_NAME_DEFAULT -t $IMG_NAME_AMD64 -f Dockerfile .
+ docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_ARM32V7 -t $IMG_NAME_ARM32V7 -f arm.Dockerfile .
+ docker build --pull --build-arg BASE_IMG=$BASE_IMG_JRE_ARM64V8 -t $IMG_NAME_ARM64V8 -f aarch64.Dockerfile .
+ docker push $IMG_NAME_DEFAULT
+ docker push $IMG_NAME_AMD64
docker push $IMG_NAME_ARM32V7
docker push $IMG_NAME_ARM64V8
docker manifest create $IMG_NAME_DEFAULT $IMG_NAME_AMD64 $IMG_NAME_ARM32V7 $IMG_NAME_ARM64V8
diff --cc streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
index c1e7a77,c1f5e5b..178ebf7
--- 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,9 -18,9 +18,10 @@@
package org.apache.streampipes.model.util;
+ import org.apache.streampipes.model.grounding.*;
import org.apache.streampipes.model.output.*;
import org.apache.streampipes.model.staticproperty.*;
+import org.apache.streampipes.model.grounding.MqttTransportProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.streampipes.model.ApplicationLink;
diff --cc streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/runtime/PipelineElementRuntimeInfoFetcher.java
index 48ba076,a40ac03..93bb623
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/runtime/PipelineElementRuntimeInfoFetcher.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/runtime/PipelineElementRuntimeInfoFetcher.java
@@@ -17,7 -17,8 +17,6 @@@
*/
package org.apache.streampipes.manager.runtime;
--import com.google.inject.internal.cglib.core.$LocalVariablesSorter;
-import org.apache.streampipes.config.backend.BackendConfig;
import org.apache.streampipes.messaging.kafka.SpKafkaConsumer;
import org.apache.streampipes.messaging.mqtt.MqttConsumer;
import org.apache.streampipes.model.grounding.MqttTransportProtocol;