You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ho...@apache.org on 2026/08/17 10:36:21 UTC
(streampipes) 02/03: Merge branch '4734-align-backend-internal-dataset-terminology' into 4735-update-rest-endpoints-to-dataset-naming
This is an automated email from the ASF dual-hosted git repository.
JHoelli pushed a commit to branch 4735-update-rest-endpoints-to-dataset-naming
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 53b8cd824c6a06400b8159deb34c32969b13a4b7
Merge: 0e7d12da21 470fef166d
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Mon Aug 17 08:53:50 2026 +0000
Merge branch '4734-align-backend-internal-dataset-terminology' into 4735-update-rest-endpoints-to-dataset-naming
.../streampipes/client/api/IDatasetMeasureApi.java | 14 +--
.../client/api/IDatasetResourceApi.java | 2 +-
.../streampipes/client/api/DatasetMeasureApi.java | 16 ++--
.../streampipes/client/api/DatasetResourceApi.java | 2 +-
.../client/serializer/SpQuerySerializer.java | 4 +-
.../management/compact/PersistPipelineHandler.java | 20 ++--
.../dataexplorer/api/IDataExplorerManager.java | 16 ++--
.../api/IDataExplorerQueryManagement.java | 14 +--
.../api/IDataExplorerSchemaManagement.java | 12 +--
.../api/IDataLakeMeasurementSanitizer.java | 6 +-
.../dataexplorer/api/IDataLakeQueryBuilder.java | 8 +-
.../export/ConfiguredCsvOutputWriter.java | 10 +-
.../export/ConfiguredExcelOutputWriter.java | 10 +-
.../export/ConfiguredJsonOutputWriter.java | 6 +-
.../export/ConfiguredOutputWriter.java | 8 +-
.../export/ConfiguredOutputWriterFactory.java | 6 +-
.../export/TestConfiguredCsvOutputWriter.java | 4 +-
.../export/TestConfiguredJsonOutputWriter.java | 2 +-
.../influx/DataExplorerInfluxQueryExecutor.java | 10 +-
.../influx/DataExplorerManagerInflux.java | 22 ++---
.../influx/DataExplorerQueryManagementInflux.java | 32 +++----
...Builder.java => DatasetInfluxQueryBuilder.java} | 56 +++++------
...x.java => DatasetMeasurementCounterInflux.java} | 18 ++--
.../dataexplorer/influx/DeleteDataQuery.java | 6 +-
.../influx/TimeSeriesStorageInflux.java | 6 +-
...java => DatasetMeasurementSanitizerInflux.java} | 12 +--
...ilderTest.java => DatasetQueryBuilderTest.java} | 10 +-
.../dataexplorer/influx/SelectQueryParamsTest.java | 56 +++++------
.../influx/TimeSeriesStorageInfluxTest.java | 4 +-
... => DatasetMeasurementSanitizerInfluxTest.java} | 16 ++--
.../utils/ProvidedQueryParameterBuilder.java | 4 +-
.../iotdb/DataExplorerIotDbQueryExecutor.java | 6 +-
.../iotdb/DataExplorerManagerIotDb.java | 22 ++---
.../iotdb/DataExplorerQueryManagementIotDb.java | 4 +-
...Db.java => DatasetMeasurementCounterIotDb.java} | 16 ++--
.../dataexplorer/iotdb/TimeSeriesStorageIotDb.java | 4 +-
....java => DatasetMeasurementSanitizerIotDb.java} | 12 +--
...a => DatasetMeasurementSanitizerIotDbTest.java} | 12 +--
.../dataexplorer/AutoAggregationHandler.java | 12 +--
.../dataexplorer/DataExplorerSchemaManagement.java | 72 +++++++-------
...tizer.java => DatasetMeasurementSanitizer.java} | 48 +++++-----
.../streampipes/dataexplorer/ImageStore.java | 4 +-
.../streampipes/dataexplorer/ImageStoreUtils.java | 4 +-
.../dataexplorer/QueryResultProvider.java | 6 +-
.../dataexplorer/StreamedQueryResultProvider.java | 12 +--
.../dataexplorer/TimeSeriesStorage.java | 6 +-
.../streampipes/dataexplorer/TimeSeriesStore.java | 4 +-
.../param/ProvidedRestQueryParamConverter.java | 6 +-
.../param/model/OrderByClauseParams.java | 2 +-
.../param/model/SelectClauseParams.java | 2 +-
.../dataexplorer/param/model/SelectColumn.java | 2 +-
.../param/model/WhereClauseParams.java | 8 +-
.../query/DataExplorerQueryExecutor.java | 10 +-
...Counter.java => DatasetMeasurementCounter.java} | 32 +++----
.../dataexplorer/AutoAggregationHandlerTest.java | 8 +-
.../DataExplorerSchemaManagementTest.java | 66 ++++++-------
.../param/WhereStatementParamsTest.java | 2 +-
...est.java => DatasetMeasurementCounterTest.java} | 20 ++--
...java => DatasetMeasurementCounterTestImpl.java} | 10 +-
...xportManager.java => DatasetExportManager.java} | 78 +++++++--------
.../export/dataimport/ImportGenerator.java | 6 +-
.../export/dataimport/PerformImportGenerator.java | 14 +--
.../export/dataimport/PreviewImportGenerator.java | 6 +-
.../streampipes/export/resolver/ChartResolver.java | 2 +-
.../export/resolver/MeasurementResolver.java | 24 ++---
.../jvm/InternalSinksExtensionModuleExports.java | 12 +--
.../DatasetDimensionProvider.java} | 4 +-
.../DataLakeSink.java => dataset/DatasetSink.java} | 30 +++---
.../migrations/DatasetSinkMigrationV1.java} | 12 +--
.../migrations/DatasetSinkMigrationV2.java} | 14 +--
.../migrations/DatasetSinkMigrationV1Test.java} | 14 +--
.../migrations/DatasetSinkMigrationV2Test.java} | 12 +--
.../model/dashboard/CompositeDashboardModel.java | 6 +-
.../model/dashboard/DashboardEntity.java | 2 +-
.../{datalake => dataset}/AggregationFunction.java | 2 +-
.../{datalake => dataset}/ChartSummaryDto.java | 2 +-
.../CriticalMeasurementFieldChange.java | 2 +-
.../{datalake => dataset}/CustomMapSerializer.java | 2 +-
.../DataExplorerWidgetHealthStatus.java | 2 +-
.../DataExplorerWidgetModel.java | 2 +-
.../DataLakeQueryOrdering.java | 2 +-
.../{datalake => dataset}/DataRetentionConfig.java | 2 +-
.../model/{datalake => dataset}/DataSeries.java | 2 +-
.../{datalake => dataset}/DataSeriesBuilder.java | 2 +-
.../DatasetMeasure.java} | 20 ++--
.../DatasetMeasureSchemaUpdateStrategy.java} | 12 +--
.../{datalake => dataset}/DatasetSummaryDto.java | 2 +-
.../model/{datalake => dataset}/ExportConfig.java | 2 +-
.../{datalake => dataset}/FilterCondition.java | 2 +-
.../FilterExpressionCondition.java | 2 +-
.../FilterExpressionGroup.java | 2 +-
.../FilterExpressionLogicalOperator.java | 2 +-
.../FilterExpressionNode.java | 2 +-
.../MeasurementUpdateInfo.java | 2 +-
.../{datalake => dataset}/RetentionAction.java | 2 +-
.../RetentionExportConfig.java | 2 +-
.../{datalake => dataset}/RetentionInterval.java | 2 +-
.../model/{datalake => dataset}/RetentionLog.java | 2 +-
.../{datalake => dataset}/RetentionTimeConfig.java | 2 +-
.../model/{datalake => dataset}/SpQueryResult.java | 2 +-
.../SpQueryResultBuilder.java | 2 +-
.../model/{datalake => dataset}/SpQueryStatus.java | 2 +-
.../importer/CsvImportColumn.java | 2 +-
.../importer/CsvImportConfiguration.java | 2 +-
.../importer/CsvImportJobStartResult.java | 2 +-
.../importer/CsvImportJobState.java | 2 +-
.../importer/CsvImportJobStatus.java | 2 +-
.../importer/CsvImportPreviewRequest.java | 2 +-
.../importer/CsvImportPreviewResult.java | 2 +-
.../importer/CsvImportRequest.java | 2 +-
.../importer/CsvImportResult.java | 2 +-
.../importer/CsvImportSchemaIssue.java | 2 +-
.../importer/CsvImportSchemaIssueType.java | 2 +-
.../importer/CsvImportSchemaValidationRequest.java | 2 +-
.../importer/CsvImportSchemaValidationResult.java | 2 +-
.../importer/CsvImportTarget.java | 2 +-
.../importer/CsvImportTargetMode.java | 2 +-
.../importer/CsvImportValidationMessage.java | 2 +-
.../param/ProvidedRestQueryParams.java | 2 +-
.../param/SupportedRestQueryParams.java | 2 +-
.../DataSeriesBuilderTest.java | 2 +-
.../DatasetMeasureTest.java} | 20 ++--
.../SpQueryResultBuilderTest.java | 2 +-
.../v2/pipeline/MeasurementChangeDetector.java | 2 +-
.../pipeline/MeasurementChangeValidationStep.java | 4 +-
...nManager.java => DatasetPermissionManager.java} | 14 +--
.../update/ChartSchemaUpdateCoordinator.java | 26 ++---
.../update/MeasurementUpdateManagement.java | 8 +-
.../pipeline/update/MeasurementUpdateUtils.java | 12 +--
.../manager/setup/CouchDbInstallationStep.java | 4 +-
.../setup/tasks/AddAssetManagementViewTask.java | 6 +-
...iewTask.java => AddDatasetMeasureViewTask.java} | 12 +--
.../tasks/AddDefaultPipelineTemplatesTask.java | 4 +-
...te.java => PersistDatasetPipelineTemplate.java} | 30 +++---
.../MeasurementChangeValidationStepTest.java | 10 +-
.../update/ChartSchemaUpdateCoordinatorTest.java | 10 +-
.../update/MeasurementUpdateManagementTest.java | 14 +--
.../update/PipelineUpdateCoordinatorTest.java | 6 +-
.../resource/management/ChartResourceManager.java | 4 +-
.../management/DashboardResourceManager.java | 14 +--
...ger.java => DatasetMeasureResourceManager.java} | 16 ++--
.../resource/management/SpResourceManager.java | 10 +-
streampipes-rest/AGENTS.md | 2 +-
.../apache/streampipes/rest/ResetManagement.java | 18 ++--
.../streampipes/rest/impl/PipelineResource.java | 2 +-
.../rest/impl/dataset/AbstractDatasetResource.java | 6 +-
.../rest/impl/dataset/DatasetDataWriter.java | 24 ++---
.../rest/impl/dataset/DatasetMeasureResource.java | 18 ++--
.../rest/impl/dataset/DatasetResource.java | 76 +++++++--------
.../rest/impl/dataset/DatasetWidgetResource.java | 4 +-
.../dataset/KioskDashboardDatasetResource.java | 6 +-
.../impl/dataset/PersistedDatasetResource.java | 16 ++--
.../dataset/importer/CsvDatasetImportService.java | 36 +++----
.../dataset/importer/CsvImportColumnMapper.java | 2 +-
.../impl/dataset/importer/CsvImportJobManager.java | 12 +--
.../impl/dataset/importer/CsvImportParser.java | 14 +--
.../importer/CsvImportValidationException.java | 2 +-
.../importer/CsvImportValidationService.java | 24 ++---
.../dataset/importer/DatasetImportResource.java | 22 ++---
.../DatasetDataWriterTest.java} | 10 +-
.../DatasetLatestEventsBenchmarkTest.java} | 14 +--
.../DatasetResourceTest.java} | 20 ++--
.../importer/CsvDatasetImportServiceTest.java} | 106 ++++++++++-----------
.../importer/CsvImportParserTest.java | 8 +-
.../importer/CsvImportValidationServiceTest.java | 20 ++--
.../ExtensionServiceRequestConfiguration.java | 4 +-
.../core/migrations/AvailableMigrations.java | 8 +-
...on.java => AddDatasetMeasureViewMigration.java} | 12 +--
.../v099/CreateDatasetPermissionMigration.java | 16 ++--
...ataLakeScheduler.java => DatasetScheduler.java} | 22 ++---
.../service/core/storage/CachedChartStorage.java | 2 +-
...orage.java => CachedDatasetMeasureStorage.java} | 26 ++---
.../core/storage/StorageApiConfiguration.java | 20 ++--
.../src/main/resources/application.properties | 2 +-
.../core/storage/CachedChartStorageTest.java | 2 +-
...t.java => CachedDatasetMeasureStorageTest.java} | 20 ++--
.../core/storage/StorageApiConfigurationTest.java | 6 +-
.../storage/api/explorer/IChartStorage.java | 2 +-
...ureStorage.java => IDatasetMeasureStorage.java} | 6 +-
.../couchdb/impl/explorer/ChartStorageImpl.java | 2 +-
...sureStorage.java => DatasetMeasureStorage.java} | 18 ++--
181 files changed, 1020 insertions(+), 1020 deletions(-)
diff --cc streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetMeasureResource.java
index dba7ef232e,7a91e7efad..5c46bd2cbd
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetMeasureResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetMeasureResource.java
@@@ -66,10 -66,10 +66,10 @@@ public class DatasetMeasureResource ext
@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
@PreAuthorize("this.hasWriteAuthority()")
- public ResponseEntity<?> addDataset(@RequestBody DataLakeMeasure datasetMeasure) {
- public ResponseEntity<?> addDataset(@RequestBody DatasetMeasure measure) {
++ public ResponseEntity<?> addDataset(@RequestBody DatasetMeasure datasetMeasure) {
try {
- DataLakeMeasure result = this.datasetMeasureManagement.createOrUpdateMeasurement(
+ DatasetMeasure result = this.datasetMeasureManagement.createOrUpdateMeasurement(
- measure,
+ datasetMeasure,
getAuthenticatedUserSid()
);
return ok(result);
diff --cc streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetResource.java
index 01777c3321,2b7bb5a5f5..dd4e0212ba
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/DatasetResource.java
@@@ -68,32 -68,32 +68,32 @@@ import java.util.List
import java.util.Map;
import java.util.stream.Collectors;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_AGGREGATION_FUNCTION;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_AUTO_AGGREGATE;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_COLUMNS;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_COUNT_ONLY;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_CSV_DELIMITER;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_END_DATE;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_FILTER;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_FILTER_EXPRESSION;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_FORMAT;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_GROUP_BY;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_HEADER_COLUMN_NAME;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_LIMIT;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_MAXIMUM_AMOUNT_OF_EVENTS;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_MISSING_VALUE_BEHAVIOUR;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_OFFSET;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_ORDER;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_PAGE;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_START_DATE;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_TIME_INTERVAL;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_XLSX_START_ROW;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_XLSX_TEMPLATE_ID;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.QP_XLSX_USE_TEMPLATE;
- import static org.apache.streampipes.model.datalake.param.SupportedRestQueryParams.SUPPORTED_PARAMS;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_AGGREGATION_FUNCTION;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_AUTO_AGGREGATE;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_COLUMNS;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_COUNT_ONLY;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_CSV_DELIMITER;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_END_DATE;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_FILTER;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_FILTER_EXPRESSION;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_FORMAT;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_GROUP_BY;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_HEADER_COLUMN_NAME;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_LIMIT;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_MAXIMUM_AMOUNT_OF_EVENTS;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_MISSING_VALUE_BEHAVIOUR;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_OFFSET;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_ORDER;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_PAGE;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_START_DATE;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_TIME_INTERVAL;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_XLSX_START_ROW;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_XLSX_TEMPLATE_ID;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.QP_XLSX_USE_TEMPLATE;
+ import static org.apache.streampipes.model.dataset.param.SupportedRestQueryParams.SUPPORTED_PARAMS;
@RestController
-@RequestMapping("/api/v4/datalake")
+@RequestMapping("/api/v4/dataset")
public class DatasetResource extends AbstractDatasetResource {
private static final Logger LOG = LoggerFactory.getLogger(DatasetResource.class);
diff --cc streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/PersistedDatasetResource.java
index 1c7260365b,1799d7f473..41da32823f
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/PersistedDatasetResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/dataset/PersistedDatasetResource.java
@@@ -38,13 -38,13 +38,13 @@@ import java.util.ArrayList
import java.util.List;
@RestController
-@RequestMapping("/api/v3/datalake/pipelines")
-public class PersistedDataStreamResource extends AbstractPipelineExtractionResource<DatasetMeasure> {
+@RequestMapping("/api/v3/dataset/pipelines")
- public class PersistedDatasetResource extends AbstractPipelineExtractionResource<DataLakeMeasure> {
++public class PersistedDatasetResource extends AbstractPipelineExtractionResource<DatasetMeasure> {
private static final String DATASET_APP_ID = "org.apache.streampipes.sinks.internal.jvm.datalake";
-- private static final String MeasureFieldInternalName = "db_measurement";
++ private static final String MEASURE_FIELD_INTERNAL_NAME = "db_measurement";
- public PersistedDataStreamResource(SpResourceManager resourceManager) {
+ public PersistedDatasetResource(SpResourceManager resourceManager) {
super(resourceManager);
}
@@@ -63,12 -63,12 +63,12 @@@
}
@Override
- protected DataLakeMeasure convert(Pipeline pipeline, DataSinkInvocation sink) {
+ protected DatasetMeasure convert(Pipeline pipeline, DataSinkInvocation sink) {
-- var measureName = extractFieldValue(sink, MeasureFieldInternalName);
++ var measureName = extractFieldValue(sink, MEASURE_FIELD_INTERNAL_NAME);
var sanitizedMeasureName = new MeasureNameSanitizer().sanitize(measureName);
- DataLakeMeasure measure = new DataLakeMeasure();
+ DatasetMeasure measure = new DatasetMeasure();
measure.setEventSchema(sink.getInputStreams().get(0).getEventSchema());
measure.setPipelineId(pipeline.getPipelineId());
measure.setPipelineName(pipeline.getName());