Add DeleteService (#66)

Author: rolincova

client/src/main/java/com/influxdb/client/DeleteApi.java

@@ -24,7 +24,9 @@
 import java.time.OffsetDateTime;
 import javax.annotation.Nonnull;
 
+import com.influxdb.client.domain.Bucket;
 import com.influxdb.client.domain.DeletePredicateRequest;
+import com.influxdb.client.domain.Organization;
 
 /**
  * API to Delete time-series data from InfluxDB 2.0.
@@ -40,22 +42,37 @@ public interface DeleteApi {
      * @param stop time
      * @param predicate sql where like delete statement.
      * @param bucket The bucket from which data will be deleted.
-     * @param organization The organization name of the above bucket.
+     * @param org The organization name of the above bucket.
+     */
+    void delete(@Nonnull final OffsetDateTime start,
+                @Nonnull final OffsetDateTime stop,
+                @Nonnull final String predicate,
+                @Nonnull final Bucket bucket,
+                @Nonnull final Organization org);
+
+    /**
+     * Delete Time series data from InfluxDB.
+     *
+     * @param start time
+     * @param stop time
+     * @param predicate sql where like delete statement.
+     * @param bucket The bucket from which data will be deleted.
+     * @param org The organization name of the above bucket.
      */
     void delete(@Nonnull final OffsetDateTime start,
                 @Nonnull final OffsetDateTime stop,
                 @Nonnull final String predicate,
                 @Nonnull final String bucket,
-                @Nonnull final String organization);
+                @Nonnull final String org);
 
     /**
      * Delete Time series data from InfluxDB.
      *
      * @param predicate delete request.
      * @param bucket The bucket from which data will be deleted.
-     * @param organization The organization name of the above bucket.
+     * @param org The organization name of the above bucket.
      */
     void delete(@Nonnull final DeletePredicateRequest predicate,
                 @Nonnull final String bucket,
-                @Nonnull final String organization);
+                @Nonnull final String org);
 }

client/src/main/java/com/influxdb/client/internal/DeleteApiImpl.java

@@ -28,7 +28,9 @@
 
 import com.influxdb.Arguments;
 import com.influxdb.client.DeleteApi;
+import com.influxdb.client.domain.Bucket;
 import com.influxdb.client.domain.DeletePredicateRequest;
+import com.influxdb.client.domain.Organization;
 import com.influxdb.client.service.DefaultService;
 import com.influxdb.internal.AbstractRestClient;
 
@@ -50,46 +52,62 @@ public class DeleteApiImpl extends AbstractRestClient implements DeleteApi {
         this.service = service;
     }
 
+    @Override
+    public void delete(final @Nonnull OffsetDateTime start,
+                       final @Nonnull OffsetDateTime stop,
+                       final @Nonnull String predicate,
+                       final @Nonnull Bucket bucket,
+                       final @Nonnull Organization org) {
+
+        Arguments.checkNotNull(start, "Start is required");
+        Arguments.checkNotNull(stop, "Stop is required");
+        Arguments.checkNotNull(predicate, "Predicate is required");
+        Arguments.checkNotNull(bucket, "Bucket is required");
+        Arguments.checkNotNull(org, "Organization is required");
+
+        delete(start, stop, predicate, bucket.getId(), org.getId());
+    }
+
     @Override
     public void delete(final @Nonnull OffsetDateTime start,
                        final @Nonnull OffsetDateTime stop,
                        final @Nonnull String predicate,
                        final @Nonnull String bucket,
-                       final @Nonnull String organization) {
+                       final @Nonnull String org) {
 
         Arguments.checkNotNull(start, "Start is required");
         Arguments.checkNotNull(stop, "Stop is required");
         Arguments.checkNotNull(predicate, "Predicate is required");
         Arguments.checkNonEmpty(bucket, "Bucket is required");
-        Arguments.checkNonEmpty(organization, "Organization is required");
+        Arguments.checkNonEmpty(org, "Organization is required");
 
         DeletePredicateRequest request = new DeletePredicateRequest();
         request.setStart(start);
         request.setStop(stop);
         request.setPredicate(predicate);
 
-        delete(request, bucket, organization);
+        delete(request, bucket, org);
     }
 
     @Override
     public void delete(final @Nonnull DeletePredicateRequest predicate,
                        final @Nonnull String bucket,
-                       final @Nonnull String organization) {
+                       final @Nonnull String org) {
 
         Arguments.checkNotNull(predicate, "Predicate is required");
         Arguments.checkNonEmpty(bucket, "Bucket is required");
-        Arguments.checkNonEmpty(organization, "Organization is required");
+        Arguments.checkNonEmpty(org, "Organization is required");
 
         LOG.log(Level.FINEST,
                 "Deleting time-series data from InfluxDB (org={0}, bucket={1})...",
-                new Object[]{organization, bucket});
+                new Object[]{org, bucket});
 
-        Call<Void> call = service.deletePost(predicate, null, organization, bucket,
+        Call<Void> call = service.deletePost(predicate, null, org, bucket,
                 null, null);
 
         execute(call);
 
         LOG.log(Level.FINEST, "Data was deleted from InfluxDB: (org={0}, bucket={1})",
-                new Object[]{organization, bucket});
+                new Object[]{org, bucket});
     }
 }

client/src/test/java/com/influxdb/client/ITDeleteApi.java

@@ -36,6 +36,7 @@
 import com.influxdb.client.domain.WritePrecision;
 import com.influxdb.client.write.Point;
 import com.influxdb.query.FluxTable;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -124,7 +125,7 @@ void delete() {
         OffsetDateTime start = OffsetDateTime.ofInstant(Instant.ofEpochSecond(0, 1), ZoneId.of("UTC"));
         OffsetDateTime stop = OffsetDateTime.ofInstant(Instant.ofEpochSecond(0, 12), ZoneId.of("UTC"));
 
-        deleteApi.delete(start, stop, "", bucket.getName(), organization.getName());
+        deleteApi.delete(start, stop, "", bucket, organization);
 
         List<FluxTable> query2 = influxDBClient.getQueryApi().query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)", organization.getId());