This is an automated email from the ASF dual-hosted git repository. zehnder pushed a commit to branch STREAMPIPES-349 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 9f18861679eefd94a8cca6f608b01d49bea9b84b Merge: ef5be85 bd2735c Author: Philipp Zehnder <[email protected]> AuthorDate: Fri Jul 16 11:07:13 2021 +0200 Merge branch 'dev' into STREAMPIPES-349 README.md | 2 +- RELEASE_NOTES.md | 95 ++++- .../pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 9 +- .../archetype-resources/src/main/java/Init.java | 1 + .../pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 +- .../archetype-resources/src/main/java/Init.java | 1 + .../streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 9 +- .../archetype-resources/src/main/java/Init.java | 2 + .../streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 +- .../archetype-resources/src/main/java/Init.java | 2 + .../streampipes-archetype-pe-sources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 9 +- .../archetype-resources/src/main/java/Init.java | 3 +- .../__classNamePrefix__Stream.java | 2 +- docker-compose.yml | 1 - pom.xml | 2 +- streampipes-backend/pom.xml | 14 +- .../backend/StreamPipesBackendApplication.java | 117 ++++-- .../backend/StreamPipesResourceConfig.java | 16 +- streampipes-client/pom.xml | 20 +- .../streampipes/client/api/DataProcessorApi.java | 41 ++ .../apache/streampipes/client/api/DataSinkApi.java | 28 ++ .../streampipes/client/model/InputStreamIndex.java | 23 +- streampipes-code-generation/pom.xml | 10 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 4 +- streampipes-connect-container-master/pom.xml | 10 +- .../master/management/AdapterMasterManagement.java | 65 ++- .../management/WorkerAdministrationManagement.java | 4 +- .../master/management/WorkerRestClient.java | 123 ++---- .../master/rest/AbstractAdapterResource.java | 34 +- .../container/master/rest/AdapterResource.java | 93 ++-- .../master/rest/AdapterTemplateResource.java | 19 +- .../container/master/rest/DescriptionResource.java | 59 ++- .../container/master/rest/GuessResource.java | 32 +- .../master/rest/RuntimeResolvableResource.java | 8 +- .../container/master/rest/SourcesResource.java | 33 +- .../container/master/rest/UnitResource.java | 17 +- .../container/master/rest/WelcomePageMaster.java | 46 +- .../master/util/AdapterEncryptionService.java | 33 +- .../management}/AdapterMasterManagementTest.java | 31 +- .../AdapterTemplateMasterManagementTest.java | 14 +- .../management}/DescriptionManagementTest.java | 19 +- .../master/management/SourcesManagementTest.java | 0 .../management/UnitMasterManagementTest.java | 0 .../master/management/WorkerRestClientTest.java | 35 +- streampipes-connect-container-worker/pom.xml | 4 +- streampipes-connect-container/pom.xml | 12 +- streampipes-connect/pom.xml | 30 +- streampipes-container-base/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 4 +- streampipes-container-extensions/pom.xml | 12 +- streampipes-container-standalone/pom.xml | 6 +- streampipes-container/pom.xml | 12 +- .../api/InvocablePipelineElementResource.java | 13 + .../container/init/RunningInstances.java | 14 + streampipes-data-explorer/pom.xml | 12 +- streampipes-dataformat-cbor/pom.xml | 6 +- streampipes-dataformat-fst/pom.xml | 6 +- streampipes-dataformat-json/pom.xml | 6 +- streampipes-dataformat-smile/pom.xml | 6 +- streampipes-dataformat/pom.xml | 4 +- streampipes-logging/pom.xml | 2 +- streampipes-maven-plugin/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 4 +- streampipes-messaging-jms/pom.xml | 4 +- streampipes-messaging-kafka/pom.xml | 4 +- streampipes-messaging-mqtt/pom.xml | 4 +- streampipes-messaging/pom.xml | 4 +- streampipes-model-client/pom.xml | 4 +- streampipes-model-shared/pom.xml | 2 +- streampipes-model/pom.xml | 14 +- .../model/base/AbstractStreamPipesEntity.java | 9 + .../streampipes/model/canvas/CanvasPosition.java | 25 +- .../model/canvas/PipelineCanvasComment.java | 29 +- .../PipelineCanvasMetadata.java} | 64 +-- .../model/canvas/PipelineElementMetadata.java | 45 +- .../model/connect/adapter/AdapterDescription.java | 13 + .../connect/adapter/AdapterStreamDescription.java | 11 + .../model/dashboard/DashboardEntity.java | 1 - .../streampipes/model/dashboard/DashboardItem.java | 11 +- .../model/dashboard/DashboardWidgetModel.java | 47 +-- .../model/dashboard/VisualizablePipeline.java | 20 +- .../streampipes/model/pipeline/Pipeline.java | 22 + .../model/pipeline/PipelineHealthStatus.java | 21 +- .../model/preview/PipelinePreviewModel.java | 56 ++- .../quality/EventPropertyQualityRequirement.java | 10 + .../streampipes/model/runtime/SchemaInfo.java | 9 + .../streampipes/model/schema/EventProperty.java | 21 + .../streampipes/model/schema/EventSchema.java | 8 + .../staticproperty/StaticPropertyAlternative.java | 2 +- streampipes-performance-tests/pom.xml | 10 +- streampipes-pipeline-management/pom.xml | 36 +- .../manager/execution/http/GraphSubmitter.java | 9 +- .../manager/execution/http/PipelineExecutor.java | 63 ++- .../execution/http/PipelineStorageService.java | 88 ++-- .../streampipes/manager/file/FileManager.java | 29 ++ .../health/PipelineElementEndpointHealthCheck.java | 49 +++ .../manager/health/PipelineHealthCheck.java | 193 +++++++++ .../matching/PipelineVerificationHandler.java | 21 +- .../monitoring/pipeline/TopicInfoCollector.java | 5 +- .../streampipes/manager/operations/Operations.java | 20 +- .../manager/preview/ActivePipelinePreviews.java | 63 +++ .../manager/preview/PipelinePreview.java | 125 ++++++ .../streampipes/manager/secret/ISecretHandler.java | 17 +- .../manager/secret/SecretDecrypter.java | 34 +- .../manager/secret/SecretEncrypter.java} | 30 +- .../streampipes/manager/secret/SecretProvider.java | 37 +- .../streampipes/manager/secret/SecretService.java | 52 +++ .../streampipes/manager/secret/SecretVisitor.java | 118 ++++++ .../manager/setup/CouchDbInstallationStep.java | 1 - .../streampipes/manager/file/TestFileManager.java | 64 +++ streampipes-platform-services/pom.xml | 16 +- streampipes-rest-shared/pom.xml | 6 +- streampipes-rest/pom.xml | 24 +- .../rest/impl/AbstractRestResource.java | 10 - .../apache/streampipes/rest/impl/AutoComplete.java | 46 +- .../streampipes/rest/impl/OntologyContext.java | 75 ---- .../streampipes/rest/impl/OntologyKnowledge.java | 270 ------------ .../rest/impl/PipelineCanvasMetadataCache.java | 54 +++ .../rest/impl/PipelineCanvasMetadataResource.java | 106 +++++ .../rest/impl/PipelineElementPreview.java | 64 +++ .../streampipes/rest/impl/PipelineResource.java | 20 +- .../rest/impl/dashboard/VisualizablePipeline.java | 90 ++-- .../impl/nouser/PipelineElementImportNoUser.java | 12 +- .../rest/impl/nouser/PipelineNoUserResource.java | 2 +- .../rest/management/PipelineManagement.java | 5 +- streampipes-sdk/pom.xml | 8 +- .../sdk/extractor/AbstractParameterExtractor.java | 3 +- streampipes-serializers-json/pom.xml | 10 +- .../serializers/json/AdapterSerializer.java | 14 +- streampipes-serializers-jsonld/pom.xml | 10 +- streampipes-sources/pom.xml | 4 +- streampipes-storage-api/pom.xml | 6 +- .../streampipes/storage/api/IAdapterStorage.java | 2 +- .../streampipes/storage/api/INoSqlStorage.java | 8 +- ...ge.java => IPipelineCanvasMetadataStorage.java} | 11 +- .../streampipes/storage/api/ITripleStorage.java | 2 - streampipes-storage-couchdb/pom.xml | 12 +- .../storage/couchdb/CouchDbStorageManager.java | 20 +- .../storage/couchdb/impl/AdapterStorageImpl.java | 7 +- .../impl/PipelineCanvasMetadataStorageImpl.java | 69 +++ .../impl/VisualizablePipelineStorageImpl.java | 43 -- .../streampipes/storage/couchdb/utils/Utils.java | 113 ++--- streampipes-storage-management/pom.xml | 8 +- .../storage/management/StorageManager.java | 14 +- streampipes-storage-rdf4j/pom.xml | 12 +- .../streampipes/storage/Rdf4JStorageManager.java | 38 +- .../storage/rdf4j/config/Rdf4JConfig.java | 4 - .../rdf4j/filter/BackgroundKnowledgeFilter.java | 84 ---- .../streampipes/storage/rdf4j/filter/Filter.java | 15 +- .../rdf4j/impl/BackgroundKnowledgeStorageImpl.java | 467 --------------------- .../storage/rdf4j/impl/ContextStorageImpl.java | 131 ------ .../rdf4j/ontology/ClassHierarchyExecutor.java | 116 ----- .../rdf4j/ontology/ConceptUpdateExecutor.java | 52 --- .../rdf4j/ontology/InstanceUpdateExecutor.java | 51 --- .../rdf4j/ontology/PropertyUpdateExecutor.java | 48 --- .../storage/rdf4j/ontology/QueryExecutor.java | 62 --- .../storage/rdf4j/ontology/RangeQueryExecutor.java | 149 ------- .../storage/rdf4j/ontology/UpdateExecutor.java | 37 -- .../storage/rdf4j/sparql/QueryBuilder.java | 294 +------------ .../rdf4j/util/BackgroundKnowledgeUtils.java | 92 ---- streampipes-test-utils/pom.xml | 4 +- streampipes-user-management/pom.xml | 6 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 10 +- streampipes-wrapper-flink/pom.xml | 4 +- .../wrapper/flink/consumer/MqttFlinkConsumer.java | 2 - .../wrapper/flink/sink/MqttFlinkProducer.java | 2 - streampipes-wrapper-kafka-streams/pom.xml | 4 +- streampipes-wrapper-python/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 21 +- .../wrapper/siddhi/SiddhiQueryBuilder.java | 9 + .../wrapper/siddhi/constants/SiddhiConstants.java | 1 + .../wrapper/siddhi/query/OffsetClause.java | 26 +- .../wrapper/siddhi/query/SiddhiQuery.java | 15 + streampipes-wrapper-spark/pom.xml | 8 +- streampipes-wrapper-standalone/pom.xml | 4 +- streampipes-wrapper/pom.xml | 10 +- ui/deployment/rel/config.yml | 3 +- ui/src/app/add/add.component.ts | 22 +- .../endpoint-item/endpoint-item.component.html | 2 +- .../adapter-description.component.html | 15 +- .../adapter-description.component.ts | 10 - .../data-marketplace.component.html | 62 ++- .../data-marketplace/data-marketplace.component.ts | 16 +- .../existing-adapters.component.html | 126 ++++++ .../existing-adapters.component.scss} | 15 +- .../existing-adapters.component.ts | 96 +++++ ui/src/app/connect/connect.module.ts | 2 + .../delete-adapter-dialog.component.html | 52 +++ .../delete-adapter-dialog.component.ts | 64 +++ .../delete-pipeline-dialog.component.scss} | 18 +- .../connect/services/data-marketplace.service.ts | 37 +- ui/src/app/core-model/gen/streampipes-model.ts | 125 +++++- .../static-mapping-nary.component.ts | 17 +- .../static-mapping-unary.component.ts | 14 +- .../static-mapping/static-mapping.ts | 28 +- .../components/grid/dashboard-grid.component.ts | 2 - .../widget/dashboard-widget.component.css | 3 +- .../widget/dashboard-widget.component.html | 51 ++- .../widget/dashboard-widget.component.ts | 147 ++++--- .../widgets/status/status-widget.component.ts | 5 + ui/src/app/dashboard/dashboard.component.ts | 9 +- ui/src/app/dashboard/dashboard.module.ts | 4 + .../add-visualization-dialog.component.html | 5 +- .../add-visualization-dialog.component.ts | 66 +-- ui/src/app/dashboard/services/dashboard.service.ts | 19 +- .../{resize.service.ts => edit-mode.service.ts} | 14 +- .../services/refresh-dashboard.service.ts | 6 +- ...esize.service.ts => reload-pipeline.service.ts} | 14 +- ui/src/app/dashboard/services/resize.service.ts | 6 +- ...data-explorer-dashboard-overview.component.html | 4 +- ...data-explorer-dashboard-overview.component.scss | 6 +- .../data-explorer-dashboard-widget.component.html | 8 +- .../pipeline-assembly.component.html | 19 +- .../pipeline-assembly.component.scss | 10 + .../pipeline-assembly.component.ts | 77 +++- .../pipeline-element-options.component.html | 7 +- .../pipeline-element-preview.component.html | 27 +- .../pipeline-element-preview.component.scss} | 26 +- .../pipeline-element-preview.component.ts | 68 +++ ...pipeline-element-template-config.component.html | 16 +- .../components/pipeline/pipeline.component.html | 11 +- .../components/pipeline/pipeline.component.ts | 125 ++++-- .../save-pipeline/save-pipeline.component.html | 4 +- .../save-pipeline/save-pipeline.component.ts | 43 +- ui/src/app/editor/editor.component.html | 2 +- ui/src/app/editor/editor.component.scss | 4 +- ui/src/app/editor/editor.module.ts | 2 + ui/src/app/editor/services/editor.service.ts | 41 +- ui/src/app/editor/services/jsplumb.service.ts | 24 +- .../services/pipeline-positioning.service.ts | 76 +++- .../actions/pipeline-actions.component.html | 3 +- .../pipeline-overview.component.html | 19 + .../pipeline-overview.component.scss | 43 +- .../pipeline-overview.component.ts | 7 +- .../pipeline-notifications.component.html | 28 +- .../pipeline-notifications.component.scss} | 16 +- .../pipeline-notifications.component.ts | 53 +++ .../pipeline-status-dialog.component.html | 65 ++- .../pipeline-status-dialog.component.scss | 34 +- .../pipeline-status-dialog.component.ts | 68 ++- .../model/pipeline-model.ts} | 19 +- ui/src/app/pipelines/pipelines.component.html | 6 + ui/src/app/pipelines/pipelines.module.ts | 4 +- .../services/pipeline-operations.service.ts | 77 ++-- .../apis/pipeline-canvas-metadata.service.ts | 65 +++ .../app/platform-services/apis/pipeline.service.ts | 13 +- ui/src/app/platform-services/platform.module.ts | 2 + ui/src/scss/sp/pipeline-element-options.scss | 14 +- 255 files changed, 4095 insertions(+), 3849 deletions(-) diff --cc streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java index 1e66b44,eabd8fc..fca3daf --- a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java +++ b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java @@@ -48,87 -47,87 +48,77 @@@ import javax.ws.rs.ApplicationPath @ApplicationPath("/api") public class StreamPipesResourceConfig extends ResourceConfig { - public StreamPipesResourceConfig() { - register(Authentication.class); - register(AssetDashboard.class); - register(AutoComplete.class); - register(CategoryResource.class); - register(ConsulConfig.class); - register(ContainerProvidedOptions.class); - register(Couchdb.class); - register(DashboardWidget.class); - register(Dashboard.class); - register(DataLakeResourceV3.class); - register(DataLakeNoUserResourceV3.class); - register(DataStream.class); - register(Deployment.class); - register(FileServingResource.class); - register(InternalPipelineTemplates.class); - register(LabelResource.class); - register(MeasurementUnitResource.class); - register(Notification.class); - register(OntologyMeasurementUnit.class); - register(OntologyPipelineElement.class); - register(PipelineCanvasMetadataCache.class); - register(PipelineCanvasMetadataResource.class); - register(PipelineCache.class); - register(PipelineCategory.class); - register(PipelineElementAsset.class); - register(PipelineElementCategory.class); - register(PipelineElementFile.class); - register(PipelineElementImportNoUser.class); - register(PipelineElementImport.class); - register(PipelineElementPreview.class); - register(PipelineElementRuntimeInfo.class); - register(PipelineMonitoring.class); - register(PipelineNoUserResource.class); - register(PipelineTemplate.class); - register(PipelineResource.class); - register(RdfEndpoint.class); - register(SemanticEventConsumer.class); - register(SemanticEventProcessingAgent.class); - register(SemanticEventProducer.class); - register(Setup.class); - register(User.class); - register(Version.class); - register(PipelineElementAsset.class); - register(DataLakeDashboardResource.class); - register(DataLakeWidgetResource.class); - register(DataLakeResourceV3.class); - register(DataLakeNoUserResourceV3.class); - register(PipelineElementFile.class); - register(FileServingResource.class); - register(DashboardWidget.class); - register(Dashboard.class); - register(VirtualSensor.class); - register(Visualization.class); - register(VisualizablePipeline.class); + public StreamPipesResourceConfig() { + register(Authentication.class); + register(AssetDashboard.class); + register(AutoComplete.class); + register(CategoryResource.class); + register(ConsulConfig.class); + register(ContainerProvidedOptions.class); + register(Couchdb.class); + register(DashboardWidget.class); + register(Dashboard.class); + register(DataLakeResourceV3.class); + register(DataLakeNoUserResourceV3.class); + register(DataStream.class); + register(Deployment.class); + register(FileServingResource.class); + register(InternalPipelineTemplates.class); + register(LabelResource.class); + register(MeasurementUnitResource.class); + register(Notification.class); - register(OntologyContext.class); - register(OntologyKnowledge.class); + register(OntologyMeasurementUnit.class); + register(OntologyPipelineElement.class); ++ register(PipelineCanvasMetadataCache.class); ++ register(PipelineCanvasMetadataResource.class); + register(PipelineCache.class); + register(PipelineCategory.class); + register(PipelineElementAsset.class); + register(PipelineElementCategory.class); + register(PipelineElementFile.class); + register(PipelineElementImportNoUser.class); + register(PipelineElementImport.class); ++ register(PipelineElementPreview.class); + register(PipelineElementRuntimeInfo.class); + register(PipelineMonitoring.class); + register(PipelineNoUserResource.class); + register(PipelineTemplate.class); + register(PipelineResource.class); + register(RdfEndpoint.class); + register(SemanticEventConsumer.class); + register(SemanticEventProcessingAgent.class); + register(SemanticEventProducer.class); + register(Setup.class); + register(User.class); + register(Version.class); - register(PipelineElementAsset.class); + register(DataLakeDashboardResource.class); + register(DataLakeWidgetResource.class); - register(DataLakeResourceV3.class); + register(DataLakeNoUserResourceV3.class); - register(PipelineElementFile.class); + register(FileServingResource.class); + register(DashboardWidget.class); + register(Dashboard.class); + register(VirtualSensor.class); + register(Visualization.class); + register(VisualizablePipeline.class); - // Serializers - register(GsonWithIdProvider.class); - register(GsonWithoutIdProvider.class); - register(GsonClientModelProvider.class); - register(JsonLdProvider.class); - register(JacksonSerializationProvider.class); - register(MultiPartFeature.class); - - // Serializers - register(GsonWithIdProvider.class); - register(GsonWithoutIdProvider.class); - register(GsonClientModelProvider.class); - register(JsonLdProvider.class); - register(JacksonSerializationProvider.class); - register(MultiPartFeature.class); - - // Platform Services - register(PipelineElementTemplateResource.class); + // Platform Services + register(PipelineElementTemplateResource.class); + register(DataLakeResourceV4.class); - register(OpenApiResource.class); + register(OpenApiResource.class); - // Connect Master - register(WelcomePageMaster.class); - register(AdapterResource.class); - register(AdapterTemplateResource.class); - register(DescriptionResource.class); - register(SourcesResource.class); - register(GuessResource.class); + // Connect Master + register(WelcomePageMaster.class); + register(AdapterResource.class); + register(AdapterTemplateResource.class); + register(DescriptionResource.class); + register(SourcesResource.class); + register(GuessResource.class); // register(MultiPartFeature.class); - register(UnitResource.class); - register(WorkerAdministrationResource.class); - register(RuntimeResolvableResource.class); - } + register(UnitResource.class); + register(WorkerAdministrationResource.class); + register(RuntimeResolvableResource.class); + } }
