deleted 'remove latest api'

application/src/main/java/org/thingsboard/server/controller/TelemetryController.java

@@ -537,57 +537,6 @@ public class TelemetryController extends BaseController {
         });
     }
 
-    @ApiOperation(value = "Delete entity latest time-series data (deleteEntityLatestTimeseries)",
-            notes = "Delete latest time-series for selected entity based on entity id, entity type and keys. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Timeseries for the selected keys in the request was removed. " +
-                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED'."),
-            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys list is empty."),
-            @ApiResponse(code = 401, message = "User is not authorized to delete entity latest timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
-                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED' that includes an error stacktrace."),
-    })
-    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/{entityType}/{entityId}/timeseries/latest/delete", method = RequestMethod.DELETE)
-    @ResponseBody
-    public DeferredResult<ResponseEntity> deleteEntityLatestTimeseries(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
-                                                                       @PathVariable("entityType") String entityType,
-                                                                       @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
-                                                                       @PathVariable("entityId") String entityIdStr,
-                                                                       @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true)
-                                                                       @RequestParam(name = "keys") String keysStr,
-                                                                       @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
-                                                                       @RequestParam(name = "rewrite", defaultValue = "false") boolean rewrite) throws ThingsboardException {
-        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-        return deleteLatestTimeseries(entityId, keysStr, rewrite);
-    }
-
-    private DeferredResult<ResponseEntity> deleteLatestTimeseries(EntityId entityIdStr, String keysStr, boolean rewrite) throws ThingsboardException {
-        List<String> keys = toKeysList(keysStr);
-        if (keys.isEmpty()) {
-            return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
-        }
-        SecurityUser user = getCurrentUser();
-
-        return accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entityIdStr, (result, tenantId, entityId) ->
-                tsSubService.deleteLatestAndNotify(tenantId, entityId, keys, rewrite, new FutureCallback<>() {
-                    @Override
-                    public void onSuccess(@Nullable Void tmp) {
-                        logLatestTimeseriesDeleted(user, entityId, keys, null);
-                        result.setResult(new ResponseEntity<>(HttpStatus.OK));
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logLatestTimeseriesDeleted(user, entityId, keys, t);
-                        result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
-                    }
-                })
-        );
-    }
-
     @ApiOperation(value = "Delete device attributes (deleteDeviceAttributes)",
             notes = "Delete device attributes using provided Device Id, scope and a list of keys. " +
                     "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
@@ -880,11 +829,6 @@ public class TelemetryController extends BaseController {
                 toException(e), keys, startTs, endTs);
     }
 
-    private void logLatestTimeseriesDeleted(SecurityUser user, EntityId entityId, List<String> keys, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
-                toException(e), keys);
-    }
-
     private void logTelemetryUpdated(SecurityUser user, EntityId entityId, List<TsKvEntry> telemetry, Throwable e) {
         notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
                 toException(e), telemetry);

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

@@ -316,13 +316,6 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
     }
 
-    @Override
-    public void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys, rewrite);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
-    }
-
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)

application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java

@@ -46,50 +46,6 @@ public class TelemetryControllerTest extends AbstractControllerTest {
         doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
     }
 
-    @Test
-    public void testDeleteLatest() throws Exception {
-        loginTenantAdmin();
-        Device device = createDevice();
-
-        SingleEntityFilter filter = new SingleEntityFilter();
-        filter.setSingleEntity(device.getId());
-
-        getWsClient().subscribeLatestUpdate(List.of(new EntityKey(TIME_SERIES, "data")), filter);
-
-        getWsClient().registerWaitForUpdate(1);
-
-        long startTs = System.currentTimeMillis();
-
-        String testBody = "{\"data\": \"value\"}";
-        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", testBody, String.class, status().isOk());
-
-        long endTs = System.currentTimeMillis();
-
-        ObjectNode latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
-
-        Assert.assertNotNull(latest);
-        var data = latest.get("data");
-        Assert.assertNotNull(data);
-
-        Assert.assertEquals("value", data.get(0).get("value").asText());
-
-        ObjectNode timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
-
-        Assert.assertNotNull(timeseries);
-
-        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
-
-        doDeleteAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/latest/delete?keys=data", String.class);
-
-        latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
-
-        Assert.assertTrue(latest.get("data").get(0).get("value").isNull());
-
-        timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
-
-        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
-    }
-
     @Test
     public void testDeleteAllTelemetryWithLatest() throws Exception {
         loginTenantAdmin();

common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java

@@ -58,8 +58,6 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
-    ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite);
-
     ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);

dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java

@@ -46,7 +46,6 @@ import org.thingsboard.server.dao.service.Validator;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -252,37 +251,13 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     @Override
     public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys) {
-        return removeLatest(tenantId, entityId, keys, false);
-    }
-
-    @Override
-    public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite) {
         validate(entityId);
         List<ListenableFuture<TsKvLatestRemovingResult>> futures = Lists.newArrayListWithExpectedSize(keys.size());
-
-        ListenableFuture<List<TsKvEntry>> latestFuture;
-
-        if (rewrite) {
-            latestFuture = findLatest(tenantId, entityId, keys);
-        } else {
-            latestFuture = Futures.immediateFuture(null);
+        for (String key : keys) {
+            DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, 0, System.currentTimeMillis(), false);
+            futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
         }
-
-        return Futures.transformAsync(latestFuture, latest -> {
-            Map<String, Long> keyTsMap;
-            if (latest != null) {
-                keyTsMap = latest.stream().collect(Collectors.toMap(TsKvEntry::getKey, TsKvEntry::getTs));
-            } else {
-                keyTsMap = Collections.emptyMap();
-            }
-
-            for (String key : keys) {
-                long startTs = keyTsMap.getOrDefault(key, 0L);
-                DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, startTs, System.currentTimeMillis(), rewrite);
-                futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
-            }
-            return Futures.allAsList(futures);
-        }, MoreExecutors.directExecutor());
+        return Futures.allAsList(futures);
     }
 
     @Override

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java

@@ -71,6 +71,4 @@ public interface RuleEngineTelemetryService {
     void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback);
 
     void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback);
-
-    void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback);
 }