Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3401: Suggested Changes #3402

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

3401: Suggested Changes #3402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f30a496
measurementID to measureName
RohitGavale Jan 5, 2025
215a33d
Suggested Changes
RohitGavale Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ...ampipes-platform-services/src/main/java/org/apache/streampipes/ps/DataLakeResourceV4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,20 @@ public DataLakeResourceV4(IDataExplorerQueryManagement dataExplorerQueryManageme
.getSchemaManagement();
}

@DeleteMapping(path = "/measurements/{measurementID}")
@DeleteMapping(path = "/measurements/{measureName}")
@Operation(summary = "Remove data from a single measurement series with given id", tags = {"Data Lake"},
responses = {
@ApiResponse(responseCode = "200", description = "Data from measurement series successfully removed"),
@ApiResponse(responseCode = "400", description = "Measurement series with given id not found")})
public ResponseEntity<?> deleteData(
@Parameter(in = ParameterIn.PATH, description = "the id of the measurement series", required = true)
@PathVariable("measurementID") String measurementID
@PathVariable("measureName") String measureName
, @Parameter(in = ParameterIn.QUERY, description = "start date for slicing operation")
@RequestParam(value = "startDate", required = false) Long startDate
, @Parameter(in = ParameterIn.QUERY, description = "end date for slicing operation")
@RequestParam(value = "endDate", required = false) Long endDate) {

if (this.dataExplorerQueryManagement.deleteData(measurementID, startDate, endDate)){
if (this.dataExplorerQueryManagement.deleteData(measureName, startDate, endDate)){
return ok();
} else {
return ResponseEntity
Expand All @@ -121,7 +121,7 @@ public ResponseEntity<?> deleteData(
}
}

@DeleteMapping(path = "/measurements/{measurementID}/drop")
@DeleteMapping(path = "/measurements/{measureName}/drop")
@Operation(summary = "Drop a single measurement series with given id from Data Lake and "
+ "remove related event property",
tags = {
Expand All @@ -135,12 +135,12 @@ public ResponseEntity<?> deleteData(
description = "Measurement series with given id or related event property not found")})
public ResponseEntity<?> dropMeasurementSeries(
@Parameter(in = ParameterIn.PATH, description = "the id of the measurement series", required = true)
@PathVariable("measurementID") String measurementID) {
@PathVariable("measureName") String measureName) {

boolean isSuccessDataLake = this.dataExplorerQueryManagement.deleteData(measurementID);
boolean isSuccessDataLake = this.dataExplorerQueryManagement.deleteData(measureName);

if (isSuccessDataLake) {
boolean isSuccessEventProperty = this.dataExplorerSchemaManagement.deleteMeasurementByName(measurementID);
boolean isSuccessEventProperty = this.dataExplorerSchemaManagement.deleteMeasurementByName(measureName);
if (isSuccessEventProperty) {
return ok();
} else {
Expand All @@ -167,15 +167,15 @@ public ResponseEntity<List<DataLakeMeasure>> getAll() {
return ok(allMeasurements);
}

@GetMapping(path = "/measurements/{measurementId}/tags", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Map<String, Object>> getTagValues(@PathVariable("measurementId") String measurementId,
@GetMapping(path = "/measurements/{measureName}/tags", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Map<String, Object>> getTagValues(@PathVariable("measureName") String measureName,
@RequestParam("fields") String fields) {
Map<String, Object> tagValues = dataExplorerQueryManagement.getTagValues(measurementId, fields);
Map<String, Object> tagValues = dataExplorerQueryManagement.getTagValues(measureName, fields);
return ok(tagValues);
}


@GetMapping(path = "/measurements/{measurementID}", produces = MediaType.APPLICATION_JSON_VALUE)
@GetMapping(path = "/measurements/{measureName}", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get data from a single measurement series by a given id", tags = {"Data Lake"},
responses = {
@ApiResponse(
Expand All @@ -186,7 +186,7 @@ public ResponseEntity<Map<String, Object>> getTagValues(@PathVariable("measureme
description = "requested data", content = @Content(schema = @Schema(implementation = DataSeries.class)))})
public ResponseEntity<?> getData(
@Parameter(in = ParameterIn.PATH, description = "the id of the measurement series", required = true)
@PathVariable("measurementID") String measurementID
@PathVariable("measureName") String measureName
, @Parameter(in = ParameterIn.QUERY, description = "the columns to be selected (comma-separated)")
@RequestParam(value = QP_COLUMNS, required = false) String columns
, @Parameter(in = ParameterIn.QUERY, description = "start date for slicing operation")
Expand Down Expand Up @@ -237,7 +237,7 @@ public ResponseEntity<?> getData(
if (!(checkProvidedQueryParams(queryParams))) {
return badRequest();
} else {
ProvidedRestQueryParams sanitizedParams = populate(measurementID, queryParams);
ProvidedRestQueryParams sanitizedParams = populate(measureName, queryParams);
try {
SpQueryResult result =
this.dataExplorerQueryManagement.getData(sanitizedParams, isIgnoreMissingValues(missingValueBehaviour));
Expand All @@ -262,7 +262,7 @@ public ResponseEntity<List<SpQueryResult>> getData(@RequestBody List<Map<String,
return ok(results);
}

@GetMapping(path = "/measurements/{measurementID}/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@GetMapping(path = "/measurements/{measureName}/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@Operation(summary = "Download data from a single measurement series by a given id", tags = {"Data Lake"},
responses = {
@ApiResponse(
Expand All @@ -273,7 +273,7 @@ public ResponseEntity<List<SpQueryResult>> getData(@RequestBody List<Map<String,
description = "requested data", content = @Content(schema = @Schema(implementation = DataSeries.class)))})
public ResponseEntity<StreamingResponseBody> downloadData(
@Parameter(in = ParameterIn.PATH, description = "the id of the measurement series", required = true)
@PathVariable("measurementID") String measurementID
@PathVariable("measureName") String measureName
, @Parameter(in = ParameterIn.QUERY, description = "the columns to be selected (comma-separated)")
@RequestParam(value = QP_COLUMNS, required = false) String columns
, @Parameter(in = ParameterIn.QUERY, description = "start date for slicing operation")
Expand Down Expand Up @@ -321,7 +321,7 @@ public ResponseEntity<StreamingResponseBody> downloadData(
if (!(checkProvidedQueryParams(queryParams))) {
throw new SpMessageException(HttpStatus.BAD_REQUEST, Notifications.error("Wrong query parameters provided"));
} else {
ProvidedRestQueryParams sanitizedParams = populate(measurementID, queryParams);
ProvidedRestQueryParams sanitizedParams = populate(measureName, queryParams);
if (format == null) {
format = "csv";
}
Expand Down Expand Up @@ -356,11 +356,11 @@ private boolean checkProvidedQueryParams(Map<String, String> providedParams) {
return SUPPORTED_PARAMS.containsAll(providedParams.keySet());
}

private ProvidedRestQueryParams populate(String measurementId, Map<String, String> rawParams) {
private ProvidedRestQueryParams populate(String measureName, Map<String, String> rawParams) {
Map<String, String> queryParamMap = new HashMap<>();
rawParams.forEach((key, value) -> queryParamMap.put(key, String.join(",", value)));

return new ProvidedRestQueryParams(measurementId, queryParamMap);
return new ProvidedRestQueryParams(measureName, queryParamMap);
}

// Checks if the parameter for missing value behaviour is set
Expand Down
Loading