You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/11 14:26:33 UTC
[incubator-streampipes] branch dev updated (a23865b -> 7ac34e6)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from a23865b Merge pull request #50 from obermeier/patch-1
add 0e89350 [STEAMPIPES-438] Remove adapter Id form backend
add 676ff84 [STREAMPIPES-438] Start to move restart of adapters to AdapterHealthCheck
add f326f39 Remove ConnectWorkerDescription from client
add c87cec6 Working on simplifying adapters
add 7c3d693 Remove protocol descriptions from connect interfaces
add 6ac9bb7 Remove adapter template from ui
add 9f283bb Remova REST endpoint for adapter templates
add a8717ec Remove old wrapper classes representing lists
add 5d85311 Remove DomainPropertyProbalilityList
add 843719d Remove old classes
add edccbb3 Remove auto stop of pipelines from adapter
add da36142 Replace ConnectWorkerContainer with lists of AdaperDescription
add a721058 Working on recovery for adapters
add 6207431 [STREAMPIPES-438] Harmonize Model Submitter
add af1cab9 [STREAMPIPES-438] Minor code refactoring
add 5897ade [STREAMPIPES-438] Fix data set adapters
add 3bdfe1d [STREAMPIPES-438] Remove data stream source id from backend
add 68d110d [STREAMPIPES-438] Fix store in datalake
add 3e4aec4 [STREAMPIPES-438] Harmonize Model Submitter
new 7ac34e6 Merge branch 'STREAMPIPES-438' into dev
The 1 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:
.../backend/StreamPipesResourceConfig.java | 1 -
.../master/health/AdapterHealthCheck.java | 129 +
.../master/management/AdapterMasterManagement.java | 206 +-
.../AdapterTemplateMasterManagement.java | 106 -
.../master/management/DescriptionManagement.java | 56 +-
.../master/management/SourcesManagement.java | 157 +-
.../master/management/UnitMasterManagement.java | 7 +-
.../management/WorkerAdministrationManagement.java | 73 +-
.../master/management/WorkerRestClient.java | 77 +-
.../master/management/WorkerUrlProvider.java | 61 +-
.../master/util/AdapterEncryptionService.java | 7 +-
.../connect/container/master/util/Utils.java | 29 -
.../connect/container/master/util/WorkerPaths.java | 36 +-
.../master/health/AdapterHealthCheckTest.java | 87 +
.../management/AdapterMasterManagementTest.java | 16 +-
.../AdapterTemplateMasterManagementTest.java | 58 -
.../management/DescriptionManagementTest.java | 10 +-
.../master/management/SourcesManagementTest.java | 78 +-
.../master/management/WorkerRestClientTest.java | 10 +-
.../init/AdapterServiceResourceProvider.java | 7 +-
.../worker/init/AdapterWorkerContainer.java | 64 -
.../init/ConnectWorkerDescriptionProvider.java | 75 +-
.../init/ConnectWorkerRegistrationService.java | 7 +-
.../worker/management/AdapterWorkerManagement.java | 87 +-
.../worker/management/GuessManagement.java | 8 -
.../management/HttpServerAdapterManagement.java | 3 +-
.../worker/management/MasterRestClient.java | 8 +-
...pterResource.java => AdapterAssetResource.java} | 28 +-
...kerResource.java => AdapterWorkerResource.java} | 30 +-
.../container/worker/rest/GuessResource.java | 5 +-
.../container/worker/rest/ProtocolResource.java | 75 -
.../container/worker/rest/WelcomePageWorker.java | 108 -
.../container/worker/utils/AdapterUtils.java | 28 +-
.../management/AdapterWorkerManagementTest.java | 26 +-
.../container/worker/utils/AdapterUtilsTest.java | 60 -
.../connect/container/worker/utils/Utils.java | 6 +-
.../connect/RunningAdapterInstances.java | 21 +-
.../adapter/guess/PropertyGuessResults.java | 40 -
.../connect/adapter/guess/PropertyGuesses.java | 54 -
.../connect/adapter/guess/SchemaGuesser.java | 101 +-
.../model/generic/GenericDataSetAdapter.java | 4 +-
.../model/generic/GenericDataStreamAdapter.java | 4 +-
.../streampipes/connect/adapter/guess/Mock.java | 26 -
.../connect/adapter/guess/SchemaGuesserTest.java | 132 -
.../extensions/ExtensionsModelSubmitter.java | 2 +-
.../standalone/init/StandaloneModelSubmitter.java | 1 +
.../container/util/ServiceDefinitionUtil.java | 2 +-
.../org/apache/streampipes/model/SpDataSet.java | 1 +
.../org/apache/streampipes/model/SpDataStream.java | 1 +
.../model/connect/adapter/AdapterDescription.java | 38 +-
.../connect/adapter/AdapterDescriptionList.java | 49 -
.../connect/adapter/AdapterSetDescription.java | 11 +-
.../connect/adapter/AdapterStreamDescription.java | 7 +-
.../adapter/GenericAdapterSetDescription.java | 2 +-
.../adapter/GenericAdapterStreamDescription.java | 1 -
.../model/connect/grounding/FormatDescription.java | 46 -
.../connect/grounding/FormatDescriptionList.java | 63 -
.../connect/grounding/ProtocolDescription.java | 2 -
.../connect/grounding/ProtocolDescriptionList.java | 58 -
.../connect/guess/DomainPropertyProbability.java | 53 -
.../guess/DomainPropertyProbabilityList.java | 56 -
.../model/connect/guess/GuessSchema.java | 30 +-
.../connect/worker/ConnectWorkerContainer.java | 95 -
streampipes-pipeline-management/pom.xml | 2 +-
.../manager/execution/http/GraphSubmitter.java | 2 +-
.../manager/execution/http/PipelineExecutor.java | 6 +-
.../manager/setup/CouchDbInstallationStep.java | 3 +-
.../apache/streampipes/rest/ResetManagement.java | 6 +-
.../streampipes/rest/impl/PipelineTemplate.java | 2 +-
.../rest/impl/connect/AdapterResource.java | 35 +-
.../rest/impl/connect/AdapterTemplateResource.java | 88 -
.../rest/impl/connect/DescriptionResource.java | 50 +-
.../rest/impl/connect/GuessResource.java | 3 +-
.../impl/connect/RuntimeResolvableResource.java | 4 +-
.../rest/impl/connect/SourcesResource.java | 54 +-
.../rest/impl/connect/WelcomePageMaster.java | 4 +-
.../impl/connect/WorkerAdministrationResource.java | 11 +-
.../builder/adapter/AdapterDescriptionBuilder.java | 9 +-
.../sdk/builder/adapter/GuessSchemaBuilder.java | 10 -
.../serializers/json/AdapterSerializer.java | 4 +-
.../svcdiscovery/api/model/SpServiceTagPrefix.java | 1 -
.../api/model/SpServiceUrlProvider.java | 3 +-
.../storage/api/IAdapterTemplateStorage.java | 36 -
.../api/IConnectWorkerContainerStorage.java | 35 -
.../streampipes/storage/api/INoSqlStorage.java | 4 +-
.../storage/couchdb/CouchDbStorageManager.java | 9 +-
...mpl.java => AdapterDescriptionStorageImpl.java} | 14 +-
...geImpl.java => AdapterInstanceStorageImpl.java} | 10 +-
.../couchdb/impl/AdapterTemplateStorageImpl.java | 70 -
.../impl/ConnectionWorkerContainerStorageImpl.java | 71 -
.../streampipes/storage/couchdb/utils/Utils.java | 8 +-
ui/cypress/tests/adapter/InfluxDbAdapter.ts | 4 +-
ui/cypress/tests/adapter/KafkaAdapter.ts | 3 +-
ui/cypress/tests/adapter/MqttAdapter.ts | 3 +-
ui/cypress/tests/adapter/MySQLDbAdapter.ts | 5 +-
ui/cypress/tests/adapter/machineDataSimulator.ts | 14 +-
ui/cypress/tests/adapter/persistInDataLake.ts | 16 +-
.../tests/pipelineElement/AllPipelineElements.ts | 1 -
.../adapter-description.component.html | 16 +-
.../adapter-description.component.ts | 78 +-
.../data-marketplace.component.html | 10 +-
.../data-marketplace/data-marketplace.component.ts | 373 +-
.../format-configuration.component.ts | 5 +-
.../start-adapter-configuration.component.html | 9 +-
.../start-adapter-configuration.component.ts | 15 +-
.../adapter-started-dialog.component.ts | 112 +-
.../adapter-upload-dialog.component.ts | 60 +-
.../connect/services/data-marketplace.service.ts | 146 +-
ui/src/app/connect/services/rest.service.ts | 85 +-
ui/src/app/core-model/gen/streampipes-model.ts | 4971 ++++++++++----------
110 files changed, 3531 insertions(+), 5678 deletions(-)
create mode 100644 streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/health/AdapterHealthCheck.java
delete mode 100644 streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterTemplateMasterManagement.java
delete mode 100644 streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/util/Utils.java
create mode 100644 streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/health/AdapterHealthCheckTest.java
delete mode 100644 streampipes-connect-container-master/src/test/java/org/apache/streampipes/connect/container/master/management/AdapterTemplateMasterManagementTest.java
delete mode 100644 streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/init/AdapterWorkerContainer.java
rename streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/{AdapterResource.java => AdapterAssetResource.java} (71%)
rename streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/{WorkerResource.java => AdapterWorkerResource.java} (87%)
delete mode 100644 streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/ProtocolResource.java
delete mode 100644 streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/WelcomePageWorker.java
delete mode 100644 streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/utils/AdapterUtilsTest.java
delete mode 100644 streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/guess/PropertyGuessResults.java
delete mode 100644 streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/guess/PropertyGuesses.java
delete mode 100644 streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/guess/Mock.java
delete mode 100644 streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/guess/SchemaGuesserTest.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionList.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescriptionList.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescriptionList.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbability.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbabilityList.java
delete mode 100644 streampipes-model/src/main/java/org/apache/streampipes/model/connect/worker/ConnectWorkerContainer.java
delete mode 100644 streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/connect/AdapterTemplateResource.java
delete mode 100644 streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/IAdapterTemplateStorage.java
delete mode 100644 streampipes-storage-api/src/main/java/org/apache/streampipes/storage/api/IConnectWorkerContainerStorage.java
copy streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/impl/{AdapterStorageImpl.java => AdapterDescriptionStorageImpl.java} (86%)
rename streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/impl/{AdapterStorageImpl.java => AdapterInstanceStorageImpl.java} (86%)
delete mode 100644 streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/impl/AdapterTemplateStorageImpl.java
delete mode 100644 streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/impl/ConnectionWorkerContainerStorageImpl.java
[incubator-streampipes] 01/01: Merge branch 'STREAMPIPES-438' into
dev
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 7ac34e68ecbc4aaba9e1b1554cd862297ebfba2e
Merge: a23865b 3e4aec4
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Mon Oct 11 16:26:24 2021 +0200
Merge branch 'STREAMPIPES-438' into dev
.../backend/StreamPipesResourceConfig.java | 1 -
.../master/health/AdapterHealthCheck.java | 129 +
.../master/management/AdapterMasterManagement.java | 206 +-
.../AdapterTemplateMasterManagement.java | 106 -
.../master/management/DescriptionManagement.java | 56 +-
.../master/management/SourcesManagement.java | 157 +-
.../master/management/UnitMasterManagement.java | 7 +-
.../management/WorkerAdministrationManagement.java | 73 +-
.../master/management/WorkerRestClient.java | 77 +-
.../master/management/WorkerUrlProvider.java | 61 +-
.../master/util/AdapterEncryptionService.java | 7 +-
.../connect/container/master/util/Utils.java | 29 -
.../connect/container/master/util/WorkerPaths.java | 36 +-
.../master/health/AdapterHealthCheckTest.java | 87 +
.../management/AdapterMasterManagementTest.java | 16 +-
.../AdapterTemplateMasterManagementTest.java | 58 -
.../management/DescriptionManagementTest.java | 10 +-
.../master/management/SourcesManagementTest.java | 78 +-
.../master/management/WorkerRestClientTest.java | 10 +-
.../init/AdapterServiceResourceProvider.java | 7 +-
.../worker/init/AdapterWorkerContainer.java | 64 -
.../init/ConnectWorkerDescriptionProvider.java | 75 +-
.../init/ConnectWorkerRegistrationService.java | 7 +-
.../worker/management/AdapterWorkerManagement.java | 87 +-
.../worker/management/GuessManagement.java | 8 -
.../management/HttpServerAdapterManagement.java | 3 +-
.../worker/management/MasterRestClient.java | 8 +-
...pterResource.java => AdapterAssetResource.java} | 28 +-
...kerResource.java => AdapterWorkerResource.java} | 30 +-
.../container/worker/rest/GuessResource.java | 5 +-
.../container/worker/rest/ProtocolResource.java | 75 -
.../container/worker/rest/WelcomePageWorker.java | 108 -
.../container/worker/utils/AdapterUtils.java | 28 +-
.../management/AdapterWorkerManagementTest.java | 26 +-
.../container/worker/utils/AdapterUtilsTest.java | 60 -
.../connect/container/worker/utils/Utils.java | 6 +-
.../connect/RunningAdapterInstances.java | 21 +-
.../adapter/guess/PropertyGuessResults.java | 40 -
.../connect/adapter/guess/PropertyGuesses.java | 54 -
.../connect/adapter/guess/SchemaGuesser.java | 101 +-
.../model/generic/GenericDataSetAdapter.java | 4 +-
.../model/generic/GenericDataStreamAdapter.java | 4 +-
.../streampipes/connect/adapter/guess/Mock.java | 26 -
.../connect/adapter/guess/SchemaGuesserTest.java | 132 -
.../extensions/ExtensionsModelSubmitter.java | 2 +-
.../standalone/init/StandaloneModelSubmitter.java | 1 +
.../container/util/ServiceDefinitionUtil.java | 2 +-
.../org/apache/streampipes/model/SpDataSet.java | 1 +
.../org/apache/streampipes/model/SpDataStream.java | 1 +
.../model/connect/adapter/AdapterDescription.java | 38 +-
.../connect/adapter/AdapterDescriptionList.java | 49 -
.../connect/adapter/AdapterSetDescription.java | 11 +-
.../connect/adapter/AdapterStreamDescription.java | 7 +-
.../adapter/GenericAdapterSetDescription.java | 2 +-
.../adapter/GenericAdapterStreamDescription.java | 1 -
.../model/connect/grounding/FormatDescription.java | 46 -
.../connect/grounding/FormatDescriptionList.java | 63 -
.../connect/grounding/ProtocolDescription.java | 2 -
.../connect/grounding/ProtocolDescriptionList.java | 58 -
.../connect/guess/DomainPropertyProbability.java | 53 -
.../guess/DomainPropertyProbabilityList.java | 56 -
.../model/connect/guess/GuessSchema.java | 30 +-
.../connect/worker/ConnectWorkerContainer.java | 95 -
streampipes-pipeline-management/pom.xml | 2 +-
.../manager/execution/http/GraphSubmitter.java | 2 +-
.../manager/execution/http/PipelineExecutor.java | 6 +-
.../manager/setup/CouchDbInstallationStep.java | 3 +-
.../apache/streampipes/rest/ResetManagement.java | 6 +-
.../streampipes/rest/impl/PipelineTemplate.java | 2 +-
.../rest/impl/connect/AdapterResource.java | 35 +-
.../rest/impl/connect/AdapterTemplateResource.java | 88 -
.../rest/impl/connect/DescriptionResource.java | 50 +-
.../rest/impl/connect/GuessResource.java | 3 +-
.../impl/connect/RuntimeResolvableResource.java | 4 +-
.../rest/impl/connect/SourcesResource.java | 54 +-
.../rest/impl/connect/WelcomePageMaster.java | 4 +-
.../impl/connect/WorkerAdministrationResource.java | 11 +-
.../builder/adapter/AdapterDescriptionBuilder.java | 9 +-
.../sdk/builder/adapter/GuessSchemaBuilder.java | 10 -
.../serializers/json/AdapterSerializer.java | 4 +-
.../svcdiscovery/api/model/SpServiceTagPrefix.java | 1 -
.../api/model/SpServiceUrlProvider.java | 3 +-
.../storage/api/IAdapterTemplateStorage.java | 36 -
.../api/IConnectWorkerContainerStorage.java | 35 -
.../streampipes/storage/api/INoSqlStorage.java | 4 +-
.../storage/couchdb/CouchDbStorageManager.java | 9 +-
...mpl.java => AdapterDescriptionStorageImpl.java} | 14 +-
...geImpl.java => AdapterInstanceStorageImpl.java} | 10 +-
.../couchdb/impl/AdapterTemplateStorageImpl.java | 70 -
.../impl/ConnectionWorkerContainerStorageImpl.java | 71 -
.../streampipes/storage/couchdb/utils/Utils.java | 8 +-
ui/cypress/tests/adapter/InfluxDbAdapter.ts | 4 +-
ui/cypress/tests/adapter/KafkaAdapter.ts | 3 +-
ui/cypress/tests/adapter/MqttAdapter.ts | 3 +-
ui/cypress/tests/adapter/MySQLDbAdapter.ts | 5 +-
ui/cypress/tests/adapter/machineDataSimulator.ts | 14 +-
ui/cypress/tests/adapter/persistInDataLake.ts | 16 +-
.../tests/pipelineElement/AllPipelineElements.ts | 1 -
.../adapter-description.component.html | 16 +-
.../adapter-description.component.ts | 78 +-
.../data-marketplace.component.html | 10 +-
.../data-marketplace/data-marketplace.component.ts | 373 +-
.../format-configuration.component.ts | 5 +-
.../start-adapter-configuration.component.html | 9 +-
.../start-adapter-configuration.component.ts | 15 +-
.../adapter-started-dialog.component.ts | 112 +-
.../adapter-upload-dialog.component.ts | 60 +-
.../connect/services/data-marketplace.service.ts | 146 +-
ui/src/app/connect/services/rest.service.ts | 85 +-
ui/src/app/core-model/gen/streampipes-model.ts | 4971 ++++++++++----------
110 files changed, 3531 insertions(+), 5678 deletions(-)