+ * Use this method to create an authorization, which generates an API token with permissions to `read` or `write` + * to a specific resource or `type` of resource. The response contains the new authorization + * with the generated API token. + *
+ * + * @param request The authorization to create. + * @return Newly created authorization + */ + @Nonnull + Authorization createAuthorization(@Nonnull final AuthorizationPostRequest request); + /** * Updates the status of the authorization. Useful for setting an authorization to inactive or active. * @@ -79,6 +96,17 @@ Authorization createAuthorization(@Nonnull final String orgID, @Nonnull Authorization updateAuthorization(@Nonnull final Authorization authorization); + /** + * Update an authorization to be active or inactive. + * + * @param authorizationID The ID of the authorization to update. + * @param request Authorization to update + * @return The active or inactive authorization + */ + @Nonnull + Authorization updateAuthorization(@Nonnull final String authorizationID, + @Nonnull final AuthorizationUpdateRequest request); + /** * Delete an authorization. * diff --git a/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java b/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java index 8bc3832e162..c3624065d56 100644 --- a/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java +++ b/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java @@ -64,8 +64,8 @@ public interface InfluxQLQueryApi { * Executes an InfluxQL query against the legacy endpoint. * The value extractor is called for each resulting column to convert the string value returned by query into a * custom type. - * - *+ * Example: *
* InfluxQLQueryResult result = influxQLQueryApi.query(
* new InfluxQLQuery("SELECT FIRST(\"free\") FROM \"influxql\"", DATABASE_NAME)
diff --git a/client/src/main/java/com/influxdb/client/internal/AuthorizationsApiImpl.java b/client/src/main/java/com/influxdb/client/internal/AuthorizationsApiImpl.java
index 634fcfc0f20..f658bc6a4ad 100644
--- a/client/src/main/java/com/influxdb/client/internal/AuthorizationsApiImpl.java
+++ b/client/src/main/java/com/influxdb/client/internal/AuthorizationsApiImpl.java
@@ -30,6 +30,7 @@
import com.influxdb.client.AuthorizationsApi;
import com.influxdb.client.domain.Authorization;
import com.influxdb.client.domain.AuthorizationPostRequest;
+import com.influxdb.client.domain.AuthorizationUpdateRequest;
import com.influxdb.client.domain.Authorizations;
import com.influxdb.client.domain.Organization;
import com.influxdb.client.domain.Permission;
@@ -96,6 +97,15 @@ public Authorization createAuthorization(@Nonnull final Authorization authorizat
.permissions(authorization.getPermissions())
.description(authorization.getDescription());
+ return createAuthorization(request);
+ }
+
+ @Override
+ @Nonnull
+ public Authorization createAuthorization(@Nonnull final AuthorizationPostRequest request) {
+
+ Arguments.checkNotNull(request, "AuthorizationPostRequest is required");
+
Call call = service.postAuthorizations(request, null);
return execute(call);
@@ -160,8 +170,18 @@ public Authorization updateAuthorization(@Nonnull final Authorization authorizat
Arguments.checkNotNull(authorization, "Authorization is required");
- Call authorizationCall = service
- .patchAuthorizationsID(authorization.getId(), authorization, null);
+ return updateAuthorization(authorization.getId(), authorization);
+ }
+
+ @Override
+ @Nonnull
+ public Authorization updateAuthorization(@Nonnull final String authorizationID,
+ @Nonnull final AuthorizationUpdateRequest request) {
+
+ Arguments.checkNonEmpty(authorizationID, "authorizationID");
+ Arguments.checkNotNull(authorizationID, "AuthorizationUpdateRequest");
+
+ Call authorizationCall = service.patchAuthorizationsID(authorizationID, request, null);
return execute(authorizationCall);
}
diff --git a/client/src/main/java/com/influxdb/client/write/Point.java b/client/src/main/java/com/influxdb/client/write/Point.java
index 394d288982f..cc0d38c4d25 100644
--- a/client/src/main/java/com/influxdb/client/write/Point.java
+++ b/client/src/main/java/com/influxdb/client/write/Point.java
@@ -253,6 +253,14 @@ public Point time(@Nullable final Long time, @Nonnull final WritePrecision preci
return time((Number) time, precision);
}
+ /**
+ * @return the data point timestamp
+ */
+ @Nullable
+ public Number getTime() {
+ return time;
+ }
+
/**
* @return the data point precision
*/
diff --git a/client/src/test/java/com/influxdb/client/FindOptionsTest.java b/client/src/test/java/com/influxdb/client/FindOptionsTest.java
index 919652f4cda..694a2c23edc 100644
--- a/client/src/test/java/com/influxdb/client/FindOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/FindOptionsTest.java
@@ -23,13 +23,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (18/03/2019 11:53)
*/
-@RunWith(JUnitPlatform.class)
class FindOptionsTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
index 04fd513ea9f..34de5771a45 100644
--- a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
+++ b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (26/08/2021 6:24)
*/
-@RunWith(JUnitPlatform.class)
class GeneratedCodeTest {
@Test
void adapterCanBeInstantiateWithoutParameters() {
diff --git a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
index 681332e0070..496e35f874d 100644
--- a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
@@ -22,6 +22,7 @@
package com.influxdb.client;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@@ -29,6 +30,8 @@
import javax.annotation.Nonnull;
import com.influxdb.client.domain.Authorization;
+import com.influxdb.client.domain.AuthorizationPostRequest;
+import com.influxdb.client.domain.AuthorizationUpdateRequest;
import com.influxdb.client.domain.Bucket;
import com.influxdb.client.domain.Organization;
import com.influxdb.client.domain.Permission;
@@ -39,13 +42,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (17/09/2018 12:02)
*/
-@RunWith(JUnitPlatform.class)
class ITAuthorizationsApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITAuthorizationsApi.class.getName());
@@ -203,6 +203,34 @@ void createAuthorizationBucket() {
Assertions.assertThat(authorization.getPermissions().get(1).getAction()).isEqualTo(Permission.ActionEnum.WRITE);
}
+ @Test
+ void createAuthorizationRequest() {
+
+ PermissionResource checks = new PermissionResource();
+ checks.setOrgID(organization.getId());
+ checks.setType(PermissionResource.TYPE_CHECKS);
+
+ Permission read = new Permission();
+ read.setResource(checks);
+ read.setAction(Permission.ActionEnum.READ);
+
+ Permission write = new Permission();
+ write.setResource(checks);
+ write.setAction(Permission.ActionEnum.WRITE);
+
+ AuthorizationPostRequest request = new AuthorizationPostRequest();
+ request
+ .orgID(organization.getId())
+ .permissions(Arrays.asList(read, write))
+ .description("Created by AuthorizationPostRequest");
+
+ Authorization authorization = authorizationsApi.createAuthorization(request);
+
+ Assertions.assertThat(authorization.getPermissions()).hasSize(2);
+ Assertions.assertThat(authorization.getDescription()).isEqualTo("Created by AuthorizationPostRequest");
+ Assertions.assertThat(authorization.getToken()).isNotBlank();
+ }
+
@Test
void findAuthorizationsByID() {
@@ -307,6 +335,29 @@ void updateAuthorizationStatus() {
Assertions.assertThat(authorization.getStatus()).isEqualTo(Authorization.StatusEnum.ACTIVE);
}
+ @Test
+ void updateAuthorizationRequest() {
+
+ PermissionResource user = new PermissionResource();
+ user.setOrgID(organization.getId());
+ user.setType(PermissionResource.TYPE_USERS);
+
+ Permission read = new Permission();
+ read.setAction(Permission.ActionEnum.READ);
+ read.setResource(user);
+
+ Authorization authorization = authorizationsApi.createAuthorization(organization, Collections.singletonList(read));
+ Assertions.assertThat(authorization.getStatus()).isEqualTo(Authorization.StatusEnum.ACTIVE);
+
+ AuthorizationUpdateRequest request = new AuthorizationUpdateRequest()
+ .status(AuthorizationUpdateRequest.StatusEnum.INACTIVE)
+ .description("Updated description");
+ authorization = authorizationsApi.updateAuthorization(authorization.getId(), request);
+
+ Assertions.assertThat(authorization.getStatus()).isEqualTo(Authorization.StatusEnum.INACTIVE);
+ Assertions.assertThat(authorization.getDescription()).isEqualTo("Updated description");
+ }
+
@Test
void deleteAuthorization() {
diff --git a/client/src/test/java/com/influxdb/client/ITBackpressure.java b/client/src/test/java/com/influxdb/client/ITBackpressure.java
index 04a1c7b13bc..e3159c83047 100644
--- a/client/src/test/java/com/influxdb/client/ITBackpressure.java
+++ b/client/src/test/java/com/influxdb/client/ITBackpressure.java
@@ -53,13 +53,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (24/01/2020 09:40)
*/
-@RunWith(JUnitPlatform.class)
@EnabledIfSystemProperty(named = "clientBackpressure", matches = "true")
class ITBackpressure extends AbstractITWrite {
diff --git a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
index 8b15a40805e..e4f169c7b58 100644
--- a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
+++ b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
@@ -28,18 +28,16 @@
import com.influxdb.client.benchmark.BenchmarkOptions;
import com.influxdb.client.benchmark.ClientBenchmark;
import com.influxdb.client.domain.Bucket;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* Client benchmark test
*/
-@RunWith(JUnitPlatform.class)
class ITBenchmarkTest extends AbstractITClientTest {
private BucketsApi bucketsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITBucketsApi.java b/client/src/test/java/com/influxdb/client/ITBucketsApi.java
index 7d90fa1421d..01421ba52ed 100644
--- a/client/src/test/java/com/influxdb/client/ITBucketsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITBucketsApi.java
@@ -42,13 +42,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (13/09/2018 10:49)
*/
-@RunWith(JUnitPlatform.class)
class ITBucketsApi extends AbstractITClientTest {
private Organization organization;
diff --git a/client/src/test/java/com/influxdb/client/ITChecksApi.java b/client/src/test/java/com/influxdb/client/ITChecksApi.java
index c1354de77aa..9251ecd814f 100644
--- a/client/src/test/java/com/influxdb/client/ITChecksApi.java
+++ b/client/src/test/java/com/influxdb/client/ITChecksApi.java
@@ -48,13 +48,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (18/09/2019 08:30)
*/
-@RunWith(JUnitPlatform.class)
class ITChecksApi extends AbstractITClientTest {
private ChecksApi checksApi;
diff --git a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
index de7abd8f558..8545f487275 100644
--- a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
@@ -45,13 +45,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (01/04/2019 10:58)
*/
-@RunWith(JUnitPlatform.class)
class ITDashboardsApi extends AbstractITClientTest {
private DashboardsApi dashboardsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITDeleteApi.java b/client/src/test/java/com/influxdb/client/ITDeleteApi.java
index 56c47580ac0..8d940a955b1 100644
--- a/client/src/test/java/com/influxdb/client/ITDeleteApi.java
+++ b/client/src/test/java/com/influxdb/client/ITDeleteApi.java
@@ -39,13 +39,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Pavlina Rolincova (rolincova@github) (30/10/2019).
*/
-@RunWith(JUnitPlatform.class)
class ITDeleteApi extends AbstractITClientTest {
private DeleteApi deleteApi;
diff --git a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
index 18133689022..96e35b94d55 100644
--- a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
+++ b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
@@ -26,7 +26,6 @@
import java.time.ZoneOffset;
import java.util.List;
-import com.influxdb.LogLevel;
import com.influxdb.client.domain.HealthCheck;
import com.influxdb.client.domain.OnboardingRequest;
import com.influxdb.client.domain.OnboardingResponse;
@@ -41,13 +40,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (20/11/2018 07:37)
*/
-@RunWith(JUnitPlatform.class)
class ITInfluxDBClient extends AbstractITClientTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
index 38f341a8e10..45dcda1a58f 100644
--- a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
+++ b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
@@ -37,14 +37,11 @@
import org.assertj.core.api.ListAssert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import static org.assertj.core.api.InstanceOfAssertFactories.BIG_DECIMAL;
import static org.assertj.core.api.InstanceOfAssertFactories.INSTANT;
import static org.assertj.core.api.InstanceOfAssertFactories.list;
-@RunWith(JUnitPlatform.class)
class ITInfluxQLQueryApi extends AbstractITClientTest {
private static final String DATABASE_NAME = "my-database";
@@ -136,6 +133,29 @@ void testSelectAll() {
});
}
+ @Test
+ void testInfluxDB18() {
+ // create database
+ String db = "testing_database";
+ influxDBQuery("CREATE DATABASE " + db, db);
+
+ // connect to InfluxDB 1.8
+ influxDBClient.close();
+ influxDBClient = InfluxDBClientFactory.createV1(getInfluxDbUrl(), "username", "password".toCharArray(),
+ db, "autogen");
+ influxQLQueryApi = influxDBClient.getInfluxQLQueryApi();
+
+ // test query to InfluxDB 1.8
+ InfluxQLQueryResult result = influxQLQueryApi.query(new InfluxQLQuery("SHOW DATABASES", db));
+ assertSingleSeriesRecords(result)
+ .map(record -> record.getValueByKey("name"))
+ .contains(db);
+
+
+ // drop database
+ influxDBQuery("DROP DATABASE " + db, db);
+ }
+
private ListAssert assertSingleSeriesRecords(InfluxQLQueryResult result) {
return Assertions.assertThat(result)
.extracting(InfluxQLQueryResult::getResults, list(InfluxQLQueryResult.Result.class))
diff --git a/client/src/test/java/com/influxdb/client/ITLabelsApi.java b/client/src/test/java/com/influxdb/client/ITLabelsApi.java
index 16cb6ca7ea0..4e2f6516e2a 100644
--- a/client/src/test/java/com/influxdb/client/ITLabelsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITLabelsApi.java
@@ -33,13 +33,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (28/01/2019 10:52)
*/
-@RunWith(JUnitPlatform.class)
class ITLabelsApi extends AbstractITClientTest {
private LabelsApi labelsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
index b73b7988659..60c4aa6f61d 100644
--- a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
+++ b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
@@ -45,13 +45,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (25/09/2019 09:41)
*/
-@RunWith(JUnitPlatform.class)
class ITMonitoringAlerting extends AbstractITClientTest {
private MockServerExtension mockServerExtension;
diff --git a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
index 79fe2475082..4bb7ff06dff 100644
--- a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
@@ -44,13 +44,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (10/09/2019 08:50)
*/
-@RunWith(JUnitPlatform.class)
class ITNotificationEndpointsApi extends AbstractITClientTest {
private NotificationEndpointsApi notificationEndpointsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
index ed50b969b9e..a6780b3afeb 100644
--- a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
@@ -54,13 +54,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (24/09/2019 09:34)
*/
-@RunWith(JUnitPlatform.class)
class ITNotificationRulesApi extends AbstractITClientTest {
private NotificationRulesApi notificationRulesApi;
diff --git a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
index 6d4b97b17bb..5a8a4637c98 100644
--- a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
@@ -41,13 +41,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (12/09/2018 09:51)
*/
-@RunWith(JUnitPlatform.class)
class ITOrganizationsApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITOrganizationsApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITQueryService.java b/client/src/test/java/com/influxdb/client/ITQueryService.java
index 2a8027b39d0..1c7d50c28e7 100644
--- a/client/src/test/java/com/influxdb/client/ITQueryService.java
+++ b/client/src/test/java/com/influxdb/client/ITQueryService.java
@@ -43,13 +43,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (08/04/2019 09:41)
*/
-@RunWith(JUnitPlatform.class)
class ITQueryService extends AbstractITClientTest {
private QueryService queryService;
diff --git a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
index 35f6a4de10a..605d1d33d9f 100644
--- a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
@@ -38,13 +38,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (22/01/2019 08:23)
*/
-@RunWith(JUnitPlatform.class)
class ITScraperTargetsApi extends AbstractITClientTest {
private ScraperTargetsApi scraperTargetsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITSourcesApi.java b/client/src/test/java/com/influxdb/client/ITSourcesApi.java
index 14acd8f404f..f6f00f89b6a 100644
--- a/client/src/test/java/com/influxdb/client/ITSourcesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITSourcesApi.java
@@ -36,13 +36,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (18/09/2018 09:42)
*/
-@RunWith(JUnitPlatform.class)
class ITSourcesApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITSourcesApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java
index 487a592f167..9f399eb4604 100644
--- a/client/src/test/java/com/influxdb/client/ITTasksApi.java
+++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java
@@ -52,13 +52,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (05/09/2018 15:54)
*/
-@RunWith(JUnitPlatform.class)
class ITTasksApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITTasksApi.class.getName());
@@ -688,7 +685,12 @@ void cancelRunNotExist() throws InterruptedException {
List runs = tasksApi.getRuns(task);
- Assertions.assertThatThrownBy(() -> tasksApi.cancelRun(runs.get(0)))
+ Run run = runs.stream()
+ .filter(it -> it.getStatus().equals(Run.StatusEnum.SUCCESS))
+ .findFirst()
+ .get();
+
+ Assertions.assertThatThrownBy(() -> tasksApi.cancelRun(run))
.isInstanceOf(NotFoundException.class)
.hasMessage("HTTP status code: 404; Message: failed to cancel run: run not found");
}
diff --git a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
index 87d868f48e0..d70a11e35b6 100644
--- a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
@@ -43,13 +43,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (28/02/2019 10:31)
*/
-@RunWith(JUnitPlatform.class)
class ITTelegrafsApi extends AbstractITClientTest {
private TelegrafsApi telegrafsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITUsersApi.java b/client/src/test/java/com/influxdb/client/ITUsersApi.java
index 50ecf32fb83..1456cd2ae69 100644
--- a/client/src/test/java/com/influxdb/client/ITUsersApi.java
+++ b/client/src/test/java/com/influxdb/client/ITUsersApi.java
@@ -34,13 +34,10 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (11/09/2018 11:26)
*/
-@RunWith(JUnitPlatform.class)
class ITUsersApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITUsersApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITVariablesApi.java b/client/src/test/java/com/influxdb/client/ITVariablesApi.java
index 541debb582d..0fce637383d 100644
--- a/client/src/test/java/com/influxdb/client/ITVariablesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITVariablesApi.java
@@ -40,13 +40,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (27/03/2019 09:46)
*/
-@RunWith(JUnitPlatform.class)
class ITVariablesApi extends AbstractITClientTest {
private VariablesApi variablesApi;
diff --git a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
index 149141b30dc..d9910f221eb 100644
--- a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
+++ b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
@@ -34,13 +34,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (16/07/2019 07:13)
*/
-@RunWith(JUnitPlatform.class)
class ITWriteApiBlocking extends AbstractITWrite {
@Test
diff --git a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
index c05d04680e6..51835c7cccf 100644
--- a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
+++ b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
@@ -49,13 +49,10 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/09/2018 13:39)
*/
-@RunWith(JUnitPlatform.class)
class ITWriteQueryApi extends AbstractITClientTest {
private static final Logger LOG = Logger.getLogger(ITWriteQueryApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
index f801a8bca88..93837557ffb 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
@@ -32,14 +32,11 @@
import okhttp3.OkHttpClient;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import retrofit2.Retrofit;
/**
* @author Jakub Bednar (bednar@github) (05/09/2018 10:59)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDBClientFactoryTest extends AbstractTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
index 1b7f05befaa..5c18f75c3ee 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
@@ -30,13 +30,10 @@
import okhttp3.Protocol;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (05/09/2018 10:38)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDBClientOptionsTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
index dd1c7fea6be..ee163c12c9a 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
@@ -49,13 +49,10 @@
import okhttp3.mockwebserver.RecordedRequest;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (05/09/2018 14:00)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDBClientTest extends AbstractInfluxDBClientTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
index 656b48d9b6f..306aaefbd6a 100644
--- a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
+++ b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
@@ -34,10 +34,7 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
class InvokableScriptsApiTest extends AbstractInfluxDBClientTest {
static final String SUCCESS_DATA = ",result,table,_start,_stop,_time,_value,_field,_measurement,host,value\n"
diff --git a/client/src/test/java/com/influxdb/client/JSONTest.java b/client/src/test/java/com/influxdb/client/JSONTest.java
new file mode 100644
index 00000000000..34d9f6e8137
--- /dev/null
+++ b/client/src/test/java/com/influxdb/client/JSONTest.java
@@ -0,0 +1,63 @@
+/*
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.influxdb.client;
+
+import com.influxdb.client.domain.CheckStatusLevel;
+import com.influxdb.client.domain.Threshold;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import com.google.gson.annotations.SerializedName;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class JSONTest {
+ @Test
+ public void serializeUnknownDiscriminator() {
+ DummyThreshold dummyThreshold = new DummyThreshold();
+ dummyThreshold.setLevel(CheckStatusLevel.OK);
+
+ Gson gson = JSON.createGson().create();
+ String json = gson.toJson(dummyThreshold);
+ Assertions.assertThat(json).isEqualTo("{\"type\":\"dummy\",\"value\":15,\"level\":\"OK\"}");
+ }
+
+ @Test
+ public void deSerializeUnknownDiscriminator() {
+ Gson gson = JSON.createGson().create();
+ Assertions.assertThatThrownBy(() -> {
+ gson.fromJson("{\"type\":\"not_registered\",\"value\":16,\"level\":\"OK\"}", Threshold.class);
+ })
+ .isInstanceOf(JsonParseException.class)
+ .hasMessage("Cannot find model: 'not_registered' for discriminator: "
+ + "'class com.influxdb.client.domain.Threshold'. The discriminator wasn't registered.");
+ }
+
+ @SuppressWarnings("unused")
+ public static class DummyThreshold extends Threshold {
+ @SerializedName("type")
+ private String type = "dummy";
+
+ @SerializedName("value")
+ private Integer value = 15;
+ }
+}
diff --git a/client/src/test/java/com/influxdb/client/QueryApiTest.java b/client/src/test/java/com/influxdb/client/QueryApiTest.java
index 446dfb58910..a6e6e04e6b9 100644
--- a/client/src/test/java/com/influxdb/client/QueryApiTest.java
+++ b/client/src/test/java/com/influxdb/client/QueryApiTest.java
@@ -26,22 +26,20 @@
import java.util.HashMap;
import java.util.Map;
-import com.google.gson.Gson;
import com.influxdb.client.domain.Dialect;
import com.influxdb.client.domain.Query;
-import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT;
import com.influxdb.client.internal.AbstractInfluxDBClientTest;
+import com.google.gson.Gson;
import okhttp3.mockwebserver.RecordedRequest;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
+
+import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT;
/**
* @author Jakub Bednar (bednar@github) (07/05/2019 09:17)
*/
-@RunWith(JUnitPlatform.class)
class QueryApiTest extends AbstractInfluxDBClientTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
index af60b115c3b..dc8ed2b20fc 100644
--- a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
@@ -33,13 +33,10 @@
import okhttp3.mockwebserver.RecordedRequest;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (12/11/2020 10:25)
*/
-@RunWith(JUnitPlatform.class)
class WriteApiBlockingTest extends AbstractInfluxDBClientTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java
index 9c3456e2c1a..59cf9ad3819 100644
--- a/client/src/test/java/com/influxdb/client/WriteApiTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java
@@ -54,13 +54,10 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (21/09/2018 11:36)
*/
-@RunWith(JUnitPlatform.class)
class WriteApiTest extends AbstractInfluxDBClientTest {
private WriteApi writeApi;
diff --git a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
index 90a60e2b5db..5afe2c8735e 100644
--- a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
@@ -25,13 +25,10 @@
import io.reactivex.rxjava3.schedulers.Schedulers;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (21/09/2018 10:35)
*/
-@RunWith(JUnitPlatform.class)
class WriteOptionsTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
index d4a128c42b1..eef94b7aa48 100644
--- a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
@@ -37,13 +37,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (12/10/2018 12:50)
*/
-@RunWith(JUnitPlatform.class)
class AuthenticateInterceptorTest extends AbstractMockServerTest {
private String influxDB_URL;
diff --git a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
index 4ac8660486a..7630b83abcd 100644
--- a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
@@ -36,13 +36,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (15/10/2018 11:27)
*/
-@RunWith(JUnitPlatform.class)
class GzipInterceptorTest extends AbstractMockServerTest {
private String url;
diff --git a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
index da7c30433d4..c26b77031b3 100644
--- a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
@@ -31,13 +31,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (15/10/2018 13:36)
*/
-@RunWith(JUnitPlatform.class)
class MeasurementMapperTest {
private MeasurementMapper mapper;
diff --git a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
index 6b6fda5ecb7..68694dbd7b7 100644
--- a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
@@ -39,15 +39,12 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import retrofit2.HttpException;
import retrofit2.Response;
/**
* @author Jakub Bednar (29/09/2020 11:21)
*/
-@RunWith(JUnitPlatform.class)
class RetryAttemptTest {
private final WriteOptions DEFAULT = WriteOptions.builder().build();
@@ -68,7 +65,7 @@ public void throwableType() {
retry = new RetryAttempt(new ConnectException("Failed to connect to localhost/127.0.0.1:59368"), 1, DEFAULT);
Assertions.assertThat(retry.isRetry()).isTrue();
- Assertions.assertThat(retry.getRetryInterval()).isGreaterThan(5_000L);
+ Assertions.assertThat(retry.getRetryInterval()).isGreaterThanOrEqualTo(5_000L);
Assertions.assertThat(retry.getRetryInterval()).isLessThan(10_000L);
retry = new RetryAttempt(new ProtocolException(), 1, DEFAULT);
diff --git a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
index f8f3871e980..b135d46ce56 100644
--- a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
@@ -31,13 +31,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (28/01/2020 14:47)
*/
-@RunWith(JUnitPlatform.class)
class WaitToConditionTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
index 2baa20984d6..5cf5613c315 100644
--- a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
@@ -13,15 +13,12 @@
import io.reactivex.rxjava3.subscribers.TestSubscriber;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import static io.reactivex.rxjava3.core.BackpressureOverflowStrategy.DROP_OLDEST;
/**
* @author Jakub Bednar (bednar@github) (29/06/2022 07:54)
*/
-@RunWith(JUnitPlatform.class)
class BackpressureBatchesBufferStrategyTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
index 46eb49f34b3..4d9b248df8a 100644
--- a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
@@ -13,13 +13,10 @@
import io.reactivex.rxjava3.schedulers.TestScheduler;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2022 07:40)
*/
-@RunWith(JUnitPlatform.class)
class FlowableBufferTimedFlushableTest {
@Test
diff --git a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
index 3054a851fd7..f8a0aae8216 100644
--- a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
+++ b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
@@ -26,13 +26,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (28/06/2019 09:35)
*/
-@RunWith(JUnitPlatform.class)
class PointSettingsTest {
private PointSettings defaults;
diff --git a/client/src/test/java/com/influxdb/client/write/PointTest.java b/client/src/test/java/com/influxdb/client/write/PointTest.java
index 5b7adcc300f..e93827055e5 100644
--- a/client/src/test/java/com/influxdb/client/write/PointTest.java
+++ b/client/src/test/java/com/influxdb/client/write/PointTest.java
@@ -30,13 +30,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (11/10/2018 12:57)
*/
-@RunWith(JUnitPlatform.class)
class PointTest {
@Test
@@ -293,6 +290,19 @@ void timeInstantNull() {
Assertions.assertThat(point.toLineProtocol()).isEqualTo("h2o,location=europe level=2i");
}
+ @Test
+ void timeGetTime() {
+
+ Instant time = Instant.parse("2022-06-12T10:26:03.800123456Z");
+
+ Point point = Point.measurement("h2o")
+ .addTag("location", "europe")
+ .addField("level", 2)
+ .time(time, WritePrecision.NS);
+
+ Assertions.assertThat(point.getTime()).isEqualTo(BigInteger.valueOf(1655029563800123456L));
+ }
+
@Test
void defaultTags() {
diff --git a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
index 749e3c2a972..48432edcca1 100644
--- a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
+++ b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
@@ -28,10 +28,7 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
class WriteParametersTest {
private InfluxDBClientOptions.Builder optionsBuilder;
diff --git a/examples/README.md b/examples/README.md
index 4a544e30a20..c6724a74369 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -16,6 +16,8 @@ This directory contains Java, Kotlin and Scala examples.
### Others
- [InvokableScripts.java](src/main/java/example/InvokableScripts.java) - How to use Invokable scripts Cloud API to create custom endpoints that query data
- [InfluxDBEnterpriseExample.java](src/main/java/example/InfluxDBEnterpriseExample.java) - How to use `consistency` parameter for InfluxDB Enterprise
+- [RecordRowExample.java](src/main/java/example/RecordRowExample.java) - How to use `FluxRecord.getRow()` (List) instead of `FluxRecord.getValues()` (Map),
+ in case of duplicity column names
## Kotlin
diff --git a/examples/pom.xml b/examples/pom.xml
index ad99856aa23..ba35522f11c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -27,12 +27,12 @@
influxdb-client
com.influxdb
- 6.5.0
+ 6.7.0
true
- 6.5.0
+ 6.7.0
4.0.0
diff --git a/examples/src/main/java/example/RecordRowExample.java b/examples/src/main/java/example/RecordRowExample.java
new file mode 100644
index 00000000000..a714299061c
--- /dev/null
+++ b/examples/src/main/java/example/RecordRowExample.java
@@ -0,0 +1,81 @@
+/*
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package example;
+
+import com.influxdb.client.InfluxDBClient;
+import com.influxdb.client.InfluxDBClientFactory;
+import com.influxdb.client.QueryApi;
+import com.influxdb.client.WriteApiBlocking;
+import com.influxdb.client.domain.WritePrecision;
+import com.influxdb.query.FluxRecord;
+import com.influxdb.query.FluxTable;
+
+import java.util.List;
+
+public class RecordRowExample {
+
+ public static void main(final String[] args) throws Exception {
+
+ final char[] token = "my-token".toCharArray();
+ final String org = "my-org";
+ final String bucket = "my-bucket";
+
+ try (InfluxDBClient client = InfluxDBClientFactory.create("http://localhost:9999", token, org, bucket)) {
+ //
+ // Prepare Data
+ //
+ WriteApiBlocking writeApi = client.getWriteApiBlocking();
+ for (int i = 1; i <= 5; i++)
+ writeApi.writeRecord(WritePrecision.NS, String.format("point,table=my-table result=%d", i));
+
+ //
+ // Query data
+ //
+ String fluxQuery = String.format("from(bucket: \"%s\")\n", bucket)
+ + " |> range(start: -1m)"
+ + " |> filter(fn: (r) => (r[\"_measurement\"] == \"point\"))"
+ + " |> pivot(rowKey:[\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")";
+
+ QueryApi queryApi = client.getQueryApi();
+
+ //
+ // Query data
+ //
+ List tables = queryApi.query(fluxQuery);
+ System.out.println("--------------------------------- FluxRecord.getValues() --------------------------------");
+ for (FluxTable fluxTable : tables) {
+ List records = fluxTable.getRecords();
+ for (FluxRecord fluxRecord : records) {
+ System.out.println(fluxRecord.getValues());
+ }
+ }
+
+ System.out.println("---------------------------------- FluxRecord.getRow() ----------------------------------");
+ for (FluxTable fluxTable : tables) {
+ List records = fluxTable.getRecords();
+ for (FluxRecord fluxRecord : records) {
+ System.out.println(fluxRecord.getRow());
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/flux-dsl/README.md b/flux-dsl/README.md
index 08e0000cbf6..e72c5e94770 100644
--- a/flux-dsl/README.md
+++ b/flux-dsl/README.md
@@ -1097,14 +1097,14 @@ The latest version for Maven dependency:
com.influxdb
flux-dsl
- 6.5.0
+ 6.7.0
```
Or when using with Gradle:
```groovy
dependencies {
- implementation "com.influxdb:flux-dsl:6.5.0"
+ implementation "com.influxdb:flux-dsl:6.7.0"
}
```
diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml
index 0b2b9d5feef..e1d9e3d76f8 100644
--- a/flux-dsl/pom.xml
+++ b/flux-dsl/pom.xml
@@ -28,7 +28,7 @@
influxdb-client
com.influxdb
- 6.5.0
+ 6.7.0
flux-dsl
@@ -66,7 +66,7 @@
scm:git:git@github.com:influxdata/influxdb-client-java.git
scm:git:git@github.com:influxdata/influxdb-client-java.git
https://github.com/influxdata/influxdb-client-java/tree/master
- v6.5.0
+ v6.7.0
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
index eb559e1089b..2d4ebcd175e 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
@@ -37,8 +37,8 @@
/**
* A container holding a list of {@link Expression}s.
- *
- * Example
+ *
+ * Example
*
* VariableAssignment a = Flux.from("test1").asVariable("a");
* VariableAssignment b = Flux.from("test2").asVariable("b");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
index 225a10e0ddb..18339c9365e 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
@@ -98,7 +98,8 @@
*
* Flux Specification
*
- * The functions:
+ *
+ * The functions:
*
* - {@link AggregateWindow}
* - {@link FromFlux}
@@ -205,7 +206,8 @@ public static FromFlux from(@Nonnull final String bucket, @Nonnull final String[
/**
* Applies an aggregate or selector function to fixed windows of time.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link AggregateWindow#withEvery(Long, ChronoUnit)}
* - {@link AggregateWindow#withEvery(String)}
@@ -226,7 +228,8 @@ public final AggregateWindow aggregateWindow() {
/**
* Applies an aggregate or selector function to fixed windows of time.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link AggregateWindow#withEvery(Long, ChronoUnit)}
* - {@link AggregateWindow#withEvery(String)}
@@ -279,7 +282,8 @@ public static ArrayFromFlux arrayFrom(@Nonnull final Map... rows
/**
* Join two time series together on time and the list of tags.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link JoinFlux#withTable(String, Flux)}
* - {@link JoinFlux#withOn(String)}
@@ -327,7 +331,8 @@ public static JoinFlux join(@Nonnull final String name1,
/**
* It will return a table containing only columns that are specified.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link KeepFlux#withColumns(String[])}
* - {@link KeepFlux#withFunction(String)}
@@ -423,7 +428,8 @@ public final CountFlux count(@Nonnull final String column) {
/**
* Covariance computes the covariance between two columns.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link CovarianceFlux#withColumns(String[])}
* - {@link CovarianceFlux#withColumns(Collection)}
@@ -546,7 +552,8 @@ public final CovarianceFlux covariance(@Nonnull final String[] columns,
/**
* Computes a running sum for non null records in the table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link CumulativeSumFlux#withColumns(String[])}
* - {@link CumulativeSumFlux#withColumns(Collection)}
@@ -587,7 +594,8 @@ public final CumulativeSumFlux cumulativeSum(@Nonnull final Collection c
/**
* Computes the time based difference between subsequent non null records.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DerivativeFlux#withUnit(Long, ChronoUnit)}
* - {@link DerivativeFlux#withNonNegative(boolean)}
@@ -620,7 +628,8 @@ public final DerivativeFlux derivative(@Nonnull final Long duration, @Nonnull fi
/**
* Difference computes the difference between subsequent non null records.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DifferenceFlux#withNonNegative(boolean)}
* - {@link DifferenceFlux#withColumns(String[])}
@@ -697,7 +706,8 @@ public final DifferenceFlux difference(@Nonnull final String[] columns, final bo
/**
* Distinct produces the unique values for a given column.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DistinctFlux#withColumn(String)}
* - {@link DistinctFlux#withPropertyNamed(String)}
@@ -726,7 +736,8 @@ public final DistinctFlux distinct(@Nonnull final String column) {
/**
* Drop will exclude specified columns from a table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DropFlux#withColumns(String[])}
* - {@link DropFlux#withFunction(String)}
@@ -779,7 +790,8 @@ public final DropFlux drop(@Nonnull final String function) {
/**
* Duplicate will duplicate a specified column in a table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DuplicateFlux#withAs(String)}
* - {@link DuplicateFlux#withColumn(String)} (String)}
@@ -798,7 +810,8 @@ public final DuplicateFlux duplicate() {
/**
* Duplicate will duplicate a specified column in a table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link DuplicateFlux#withAs(String)}
* - {@link DuplicateFlux#withColumn(String)} (String)}
@@ -819,7 +832,8 @@ public final DuplicateFlux duplicate(@Nonnull final String column, @Nonnull fina
/**
* Replaces all null values in input tables with a non-null value.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link FillFlux#withUsePrevious(Boolean)}
* - {@link FillFlux#withColumn(String)}
@@ -847,7 +861,8 @@ public final FillFlux fill(@Nonnull final Object value) {
/**
* Returns the first result of the query.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link FilterFlux#withRestrictions(Restrictions)}
* - {@link FilterFlux#withPropertyNamed(String)}
@@ -889,7 +904,8 @@ public final FirstFlux first() {
/**
* Groups results by a user-specified set of tags.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link GroupFlux#withBy(String[])}
* - {@link GroupFlux#withBy(Collection)}
@@ -989,7 +1005,8 @@ public final GroupFlux groupExcept(@Nonnull final String[] except) {
/**
* For each aggregate column, it outputs the area under the curve of non null records.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link IntegralFlux#withUnit(Long, ChronoUnit)}
* - {@link IntegralFlux#withPropertyNamed(String)}
@@ -1024,7 +1041,8 @@ public final IntegralFlux integral(@Nonnull final Long duration, @Nonnull final
* The `interpolate.linear` function inserts rows at regular intervals using linear interpolation to determine
* values for inserted rows.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link InterpolateLinearFlux#withEvery(long, ChronoUnit)}
* - {@link InterpolateLinearFlux#withPropertyNamed(String)}
@@ -1079,7 +1097,8 @@ public final LastFlux last(@Nonnull final String column) {
/**
* Restricts the number of rows returned in the results.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link LimitFlux#withN(int)}
* - {@link LimitFlux#withPropertyNamed(String)}
@@ -1123,7 +1142,8 @@ public final LimitFlux limit(final int numberOfResults, final int offset) {
/**
* Applies a function to each row of the table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link MapFlux#withFunction(String)}
* - {@link MapFlux#withPropertyNamed(String)}
@@ -1216,7 +1236,8 @@ public final MinFlux min(@Nonnull final String column) {
/**
* Quantile is both an aggregate operation and a selector operation depending on selected options.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link QuantileFlux#withColumn(String)}
* - {@link QuantileFlux#withQuantile(Float)}
@@ -1311,7 +1332,8 @@ public final QuantileFlux quantile(@Nonnull final String column,
* Pivot collects values stored vertically (column-wise) in a table
* and aligns them horizontally (row-wise) into logical sets.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link PivotFlux#withRowKey(String[])}
* - {@link PivotFlux#withRowKey(Collection)}
@@ -1367,7 +1389,8 @@ public final PivotFlux pivot(@Nonnull final Collection rowKey,
/**
* Filters the results by time boundaries.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link RangeFlux#withStart(Instant)}
* - {@link RangeFlux#withStart(Long, ChronoUnit)}
@@ -1472,7 +1495,8 @@ public final RangeFlux range(final Long start) {
/**
* Reduce aggregates records in each table according to the reducer.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link ReduceFlux#withFunction(String)}
* - {@link ReduceFlux#withIdentity(String)}
@@ -1498,7 +1522,8 @@ public final ReduceFlux reduce(@Nonnull final String function, @Nonnull final St
/**
* Rename will rename specified columns in a table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link RenameFlux#withColumns(Map)}
* - {@link RenameFlux#withFunction(String)}
@@ -1540,7 +1565,8 @@ public final RenameFlux rename(@Nonnull final String function) {
/**
* Sample values from a table.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link SampleFlux#withN(int)}
* - {@link SampleFlux#withPos(int)}
@@ -1592,7 +1618,8 @@ public final SampleFlux sample(final int n, final int pos) {
/**
* Assigns a static value to each record.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link SetFlux#withKeyValue(String, String)}
* - {@link SetFlux#withPropertyNamed(String)}
@@ -1622,7 +1649,8 @@ public final SetFlux set(@Nonnull final String key, @Nonnull final String value)
/**
* Shift add a fixed duration to time columns.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link TimeShiftFlux#withDuration(Long, ChronoUnit)}
* - {@link TimeShiftFlux#withColumns(String[])}
@@ -1851,7 +1879,8 @@ public final SumFlux sum(@Nonnull final String column) {
/**
* Caps the number of records in output tables.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link TailFlux#withN(int)}
* - {@link TailFlux#withPropertyNamed(String)}
@@ -1895,7 +1924,8 @@ public final TailFlux tail(final int numberOfResults, final int offset) {
/**
* To operation takes data from a stream and writes it to a bucket.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link ToFlux#withBucket(String)}
* - {@link ToFlux#withBucketID(String)}
@@ -2169,7 +2199,8 @@ public static UnionFlux union(@Nonnull final Flux... tables) {
/**
* Groups the results by a given time range.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link WindowFlux#withEvery(Long, ChronoUnit)}
* - {@link WindowFlux#withPeriod(Long, ChronoUnit)}
@@ -2351,7 +2382,8 @@ public final WindowFlux window(@Nonnull final Long every,
/**
* Yield a query results to yielded results.
*
- * The parameters had to be defined by:
+ *
+ * The parameters had to be defined by:
*
* - {@link YieldFlux#withName(String)}
* - {@link YieldFlux#withPropertyNamed(String)}
@@ -2421,7 +2453,8 @@ public final F function(@Nonnull final Clas
/**
* Creates a piped function call.
*
- * Example Definition
+ *
+ * Example Definition
*
* public static class MultByXFunction extends AbstractFunctionFlux<MultByXFunction.MultByXFunctionCall> {
*
@@ -2447,7 +2480,8 @@ public final F function(@Nonnull final Clas
* }
* }
*
- * Example Usage
+ *
+ * Example Usage
*
* MultByXFunction multByX = new MultByXFunction();
*
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
index d6c58b824f7..a69645aa121 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
@@ -30,8 +30,8 @@
/**
* Hold the variable name and expression of an assignment.
- *
- * Example
+ *
+ * Example
*
* VariableAssignment a = Flux.from("test1").asVariable("a");
* VariableAssignment b = Flux.from("test2").asVariable("b");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
index 54196d15e94..281ab745920 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
@@ -30,7 +30,8 @@
/**
* Base class defining a function invocation.
*
- * Example
+ *
+ * Example
*
* public static class MyCustomFunctionCall extends AbstractFunctionCallFlux {
* public MyCustomFunctionCall(@Nonnull String name) {
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
index 103228c3c9a..a42b966b0a2 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
@@ -45,7 +45,8 @@
* The function definition describes the implementation of a function.
* A concrete call to this function can be created via the {@link #invoke()} method.
*
- * Example Definition
+ *
+ * Example Definition
*
* public static class MyCustomFunction extends AbstractFunctionFlux<MyCustomFunction.MyCustomFunctionCall> {
*
@@ -71,7 +72,8 @@
* }
* }
*
- * Example Usage
+ *
+ * Example Usage
*
* MyCustomFunction fun = new MyCustomFunction();
*
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
index 5df700d43a8..f44514bea2f 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
@@ -31,7 +31,8 @@
* Applies an aggregate or selector function (any function with a column parameter) to fixed windows of time.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - every - The duration of windows. [duration]
* - fn - The aggregate function used in the operation. [function]
@@ -46,7 +47,8 @@
* Defaults to true. [boolean]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
index 377125470d3..a86b3aaf31c 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
@@ -30,7 +30,8 @@
* The columns() function lists the column labels of input tables.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* column -
@@ -38,7 +39,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
index 075b1e83020..043f72255be 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
@@ -29,12 +29,14 @@
/**
* Counts the number of results. See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column to aggregate [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
index bf555ea515b..8ec553d9d0d 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
@@ -31,7 +31,8 @@
* Covariance is an aggregate operation. Covariance computes the covariance between two columns.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* columns - List of columns on which to compute the covariance.
@@ -44,7 +45,8 @@
*
- valueDst - The column into which the result will be placed. Defaults to _value` [string].
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
index e29470c923d..4d9b4825187 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
@@ -32,12 +32,14 @@
* The output table schema will be the same as the input table.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - columns - a list of columns on which to operate [array of strings]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
index f49d0e09d74..bfbe09890bd 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
@@ -32,7 +32,8 @@
* Computes the time based difference between subsequent non null records.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - unit - The time duration to use for the result [duration]
* - nonNegative - Indicates if the derivative is allowed to be negative [boolean].
@@ -40,7 +41,8 @@
* - timeColumn - The source column for the time values. Defaults to `_time` [string].
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
index fff04485690..39dc986da5a 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
@@ -31,7 +31,8 @@
* Difference computes the difference between subsequent non null records.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* nonNegative - Indicates if the derivative is allowed to be negative.
@@ -44,7 +45,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
index 3d206830f29..4f1cc763848 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
@@ -30,14 +30,16 @@
* Distinct produces the unique values for a given column.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* column - The column on which to track unique values [string]
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
index b677efe74bd..e9dbf154388 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
@@ -31,7 +31,8 @@
* Drop will exclude specified columns from a table.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* columns - The list of columns which should be excluded from the resulting table.
@@ -43,7 +44,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
index b2c61c50366..86d89133496 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
@@ -30,7 +30,8 @@
* Duplicate will duplicate a specified column in a table.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* column - The column to duplicate. [string]
@@ -40,7 +41,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
index a0d262b3eaa..67e1f4a9c9d 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
@@ -30,7 +30,8 @@
/**
* The custom Flux expression.
*
- * Example
+ *
+ * Example
*
* Flux.from("telegraf")
* .expression("map(fn: (r) => r._value * r._value)")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
index 11b0e4f7a78..64a8b754981 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
@@ -30,7 +30,8 @@
* Replaces all null values in input tables with a non-null value.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
index d783b9ba274..cce3f86688b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
@@ -31,7 +31,8 @@
* Filters the results using an expression.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* fn - Function to when filtering the records. The function must accept a single parameter
@@ -40,7 +41,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Restrictions restriction = Restrictions.and(
* Restrictions.measurement().equal("mem"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
index 95cbe224483..9dd0b2542da 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
@@ -29,7 +29,8 @@
* Returns the first result of the query.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
index ec5b2ac7a09..98ad7c30758 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
@@ -32,13 +32,15 @@
* From produces a stream of tables from the specified bucket.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - bucket - The name of the bucket to query [string]
* - hosts - array of strings from(bucket:"telegraf", hosts:["host1", "host2"])
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux.from("telegraf");
*
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
index de8008d8cd7..99ed11860f4 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
@@ -31,13 +31,15 @@
* Groups results by a user-specified set of tags.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - columns - List of columns used to calculate the new group key. Default [] [array of strings]
* - mode - The grouping mode, can be one of by or except. The default is by [string].
*
*
- * Example
+ *
+ * Example
*
* Flux.from("telegraf")
* .range(-30L, ChronoUnit.MINUTES)
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
index 5e928ae8ec8..1dc4ae023c3 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
@@ -32,12 +32,14 @@
* The curve is defined as function where the domain is the record times and the range is the record values.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - unit - Time duration to use when computing the integral [duration]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
index 99dbee38480..add6512e173 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
@@ -30,7 +30,8 @@
/**
* Inserts rows at regular intervals using linear interpolation to determine values for inserted rows.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
index f5e5f04eb2e..4ba8a9bbf41 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
@@ -36,7 +36,8 @@
* Join two time series together on time and the list of on keys.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - tables - Map of tables to join. Currently only two tables are allowed. [map of tables]
* - on - List of tag keys that when equal produces a result set. [array of strings]
@@ -44,7 +45,8 @@
* method - An optional parameter that specifies the type of join to be performed.
*
*
- * Example
+ *
+ * Example
*
* Flux cpu = Flux.from("telegraf")
* .filter(Restrictions.and(Restrictions.measurement().equal("cpu"), Restrictions.field().equal("usage_user")))
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
index 25b2dcd8433..4ce31e8d57a 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
@@ -32,7 +32,8 @@
* Only columns in the group key that are also specified in keep will be kept in the resulting group key.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* columns - The list of columns that should be included in the resulting table.
@@ -44,7 +45,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
index 4a17a8891b5..aebbbcdac96 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
@@ -30,12 +30,14 @@
* Returns the last result of the query.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column used to verify the existence of a value [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
index 9964ad98d18..6996a1e55de 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
@@ -30,13 +30,15 @@
* Restricts the number of rows returned in the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - n - The maximum number of records to output [int].
* - offset - The number of records to skip per table [int]. Default to 0.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
index 1209d36d1dd..da1cf12e536 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
@@ -30,7 +30,8 @@
* Applies a function to each row of the table.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* fn - The function to apply to each row.
@@ -38,7 +39,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Restrictions restriction = Restrictions.and(
* Restrictions.measurement().equal("cpu"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
index e578f050747..d95c58f0997 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
@@ -30,12 +30,14 @@
* Returns the max value within the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column to use to calculate the maximum value [string]. Default is _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
index 8fdb6f99d96..c95dc0fc5c5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
@@ -30,12 +30,14 @@
* Returns the mean of the within the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column to use to compute the mean [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
index 97ac32f430e..a1d6edec507 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
@@ -30,12 +30,14 @@
* Returns the min value within the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column to use to calculate the minimum value [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
index f041f4df992..3b552b34357 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
@@ -32,7 +32,8 @@
* into logical sets.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - rowKey - List of columns used to uniquely identify a row for the output. [array of strings]
* - columnKey -
@@ -41,7 +42,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux.from("telegraf")
* .pivot()
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
index b5fb4ddfbb7..884562d8f1b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
@@ -32,7 +32,8 @@
* as a float.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - column to aggregate. Defaults to _value. [string]
* - quantile - value between 0 and 1 indicating the desired quantile. [float]
@@ -43,7 +44,8 @@
* [float]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
index a894fdc1aec..7cd2b0fc465 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
@@ -32,7 +32,8 @@
* Filters the results by time boundaries.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - start - Specifies the oldest time to be included in the results [duration or timestamp]
* -
@@ -41,7 +42,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
index e5d24dd0438..a02ec8a3f21 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
@@ -30,7 +30,8 @@
* Reduce aggregates records in each table according to the reducer.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* fn -
@@ -39,7 +40,8 @@
*
- identity - an initial value to use when creating a reducer ['a]
*
*
- * Example
+ *
+ * Example
*
* Restrictions restriction = Restrictions.and(
* Restrictions.measurement().equal("cpu"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
index c6598c360c8..5cbc5cbdcf5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
@@ -32,7 +32,8 @@
* the column name in the group key will be updated.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* columns - The map of columns to rename and their corresponding new names. Cannot be used with fn.
@@ -44,7 +45,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Map<String, String> map = new HashMap<>();
* map.put("host", "server");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
index c64b1cdb814..4089ebecc31 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
@@ -29,7 +29,8 @@
* Sample values from a table.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - n - Sample every Nth element [int]
* -
@@ -38,7 +39,8 @@
*
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux.from("telegraf")
* .filter(and(measurement().equal("cpu"), field().equal("usage_system")))
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
index 0f588bcddad..d0f5cebd203 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
@@ -30,13 +30,15 @@
* Assigns a static value to each record.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - key - Label for the column to set [string].
* - value - Value for the column to set [string]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
index b81246c8de2..26999bffd13 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
@@ -30,12 +30,14 @@
* Skew of the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column on which to operate [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
index 8ad89795429..2e1c80447a1 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
@@ -31,7 +31,8 @@
* Sorts the results by the specified columns Default sort is ascending.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* -
* columns - List of columns used to sort; precedence from left to right.
@@ -40,7 +41,8 @@
*
- desc - Sort results descending. Default false [bool]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
index 0393f6d61e3..e27503ec0f2 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
@@ -30,12 +30,14 @@
* Difference between min and max values.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column on which to operate [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
index 4d9eadb8ac6..ec60b145c94 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
@@ -30,12 +30,14 @@
* Standard Deviation of the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column on which to operate [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
index 9857bd31da0..5d6df9d64c6 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
@@ -30,12 +30,14 @@
* Sum of the results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - column - The column on which to operate [string]. Default to _value.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
index e5d5d4e0a11..7154934f3c4 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
@@ -30,13 +30,15 @@
* Tail caps the number of records in output tables to a fixed size n.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - n - The maximum number of records to output [int].
* - offset - The number of records to skip per table [int]. Default to 0.
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
index 1538b52eac9..397d9050fbd 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
@@ -32,14 +32,16 @@
* Shift add a fixed duration to time columns.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - duration - The amount to add to each time value [duration]
* - columns - The list of all columns that should be shifted.
* Defaults `["_start", "_stop", "_time"]` [array of strings].
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
index 50d1645bc19..dd77de514e5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a bool.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
index 28f7239fd73..d956ea84616 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a duration.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
index 61cd8935c09..9c3a463487b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a float.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
index 24a0d696662..7e0d015d833 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
@@ -31,7 +31,8 @@
* The To operation takes data from a stream and writes it to a bucket.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - bucket - The bucket to which data will be written. [string]
* - bucketID - The bucket to which data will be written. [string]
@@ -44,7 +45,8 @@
* - fieldFn - Function that takes a record from the input table and returns an object.
*
*
- * Examples
+ *
+ * Examples
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
index 08293d0f9a5..e81cc05e8ae 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a int.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
index a6660c748ed..f74508eb39c 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a string.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
index 3deb96821c0..a1f10b34c16 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a time.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
index 75d6f4e2ee3..bb60f3cab12 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
@@ -29,7 +29,8 @@
* Convert a value to a duration.
* See SPEC.
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
index 5f60ada1c7f..c414465b0d5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
@@ -30,12 +30,14 @@
/**
* Truncates all input time values in the _time to a specified unit..
*
- * Options
+ *
+ * Options
*
* - unit - Unit of time to truncate to. [unit].
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
index d620290ee38..edfa80b3d41 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
@@ -32,7 +32,8 @@
* Groups the results by a given time range.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - every - Duration of time between windows. Defaults to period's value. [duration]
*
- period - Duration of the windowed partition. Defaults to every's value. [duration]
@@ -44,7 +45,8 @@
*
- stopColumn - Name of the column containing the window stop time. Defaults to _stop. [string]
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
index d743d8ffb0e..b4d4d97b159 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
@@ -30,12 +30,14 @@
* Yield a query results to yielded results.
* See SPEC.
*
- * Options
+ *
+ * Options
*
* - name - The unique name to give to yielded results [string].
*
*
- * Example
+ *
+ * Example
*
* Flux flux = Flux
* .from("telegraf")
diff --git a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
index 32b19d47736..e80c2d065b0 100644
--- a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
+++ b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (02/07/2018 13:55)
*/
-@RunWith(JUnitPlatform.class)
class CustomFunction {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
index 3ff93c25f7a..e2a2a14de1f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
@@ -27,12 +27,10 @@
import com.influxdb.query.dsl.functions.AbstractFunctionCallFlux;
import com.influxdb.query.dsl.functions.AbstractFunctionFlux;
import com.influxdb.query.dsl.functions.FreestyleExpression;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
public class AbstractFunctionFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
index 52e36be28a0..d2668ee3fb0 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (22/06/2018 10:27)
*/
-@RunWith(JUnitPlatform.class)
class FluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
index 3f1255d297f..2fd06b8cf91 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
@@ -24,15 +24,13 @@
import java.time.temporal.ChronoUnit;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (13/05/2020 15:07)
*/
-@RunWith(JUnitPlatform.class)
class AggregateWindowTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
index b1597eff672..86667429e8e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
@@ -25,12 +25,10 @@
import java.util.Map;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
class ArrayFromFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
index f4839f854de..7c40776ba3b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (19/04/2022 09:49)
*/
-@RunWith(JUnitPlatform.class)
class ColumnsFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
index e0d9e9a66f0..fe5ddfda3da 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (22/06/2018 12:04)
*/
-@RunWith(JUnitPlatform.class)
class CountFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
index d2b6c4340a5..c1cd5097a20 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (17/07/2018 13:51)
*/
-@RunWith(JUnitPlatform.class)
class CovarianceFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
index 7959c270704..e280f6af781 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (10/10/2018 07:45)
*/
-@RunWith(JUnitPlatform.class)
class CumulativeSumFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
index 7d7714f6a35..56b169c80a7 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (03/07/2018 15:05)
*/
-@RunWith(JUnitPlatform.class)
class DerivativeFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
index 6f3a05a8d28..6f0f1a4460d 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (17/07/2018 12:57)
*/
-@RunWith(JUnitPlatform.class)
class DifferenceFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
index 38906c79f4e..1eb4863eabe 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (17/07/2018 12:15)
*/
-@RunWith(JUnitPlatform.class)
class DistinctFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
index c93f5c257c3..ddbd7564020 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (02/08/2018 11:09)
*/
-@RunWith(JUnitPlatform.class)
class DropFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
index 7fa9ddac276..9c9ded62ebe 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (09/10/2018 13:27)
*/
-@RunWith(JUnitPlatform.class)
class DuplicateFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
index 3f860fb6c0c..91e399f5d22 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (27/06/2018 11:30)
*/
-@RunWith(JUnitPlatform.class)
class ExpressionFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
index 60d9564fa76..34252c0a34e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
@@ -24,15 +24,13 @@
import java.time.Instant;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (09/10/2018 13:27)
*/
-@RunWith(JUnitPlatform.class)
class FillFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
index 20e34d54821..ec37da8ce14 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
@@ -30,13 +30,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (28/06/2018 11:46)
*/
-@RunWith(JUnitPlatform.class)
class FilterFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
index 33914413f8b..92c4b88d70c 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
@@ -21,19 +21,14 @@
*/
package com.influxdb.query.dsl.functions;
-import java.util.HashMap;
-
import com.influxdb.query.dsl.Flux;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 09:40)
*/
-@RunWith(JUnitPlatform.class)
class FirstFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
index 5714f888383..b2ef3fcb9d4 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (22/06/2018 12:04)
*/
-@RunWith(JUnitPlatform.class)
class FromFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
index 20de5543e0a..2c1e59e27d3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 15:16)
*/
-@RunWith(JUnitPlatform.class)
class GroupFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
index e329d1d4175..beb8c3b6cc0 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (03/07/2018 12:48)
*/
-@RunWith(JUnitPlatform.class)
class IntegralFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
index 4d06d88eab6..99f75067ca3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
@@ -24,12 +24,10 @@
import java.time.temporal.ChronoUnit;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
class InterpolateLinearTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
index 37fc144dafa..79f54c84f88 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
@@ -31,13 +31,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (19/07/2018 12:59)
*/
-@RunWith(JUnitPlatform.class)
class JoinFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
index 39c456e49e5..23306daa548 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (02/08/2018 11:43)
*/
-@RunWith(JUnitPlatform.class)
class KeepFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
index bf0862be2ce..f0acb686c82 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 09:47)
*/
-@RunWith(JUnitPlatform.class)
class LastFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
index e4aaf094709..89a5b3af4ac 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 11:55)
*/
-@RunWith(JUnitPlatform.class)
class LimitFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
index 819121bdfa1..37872b8b67a 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
@@ -30,13 +30,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (17/07/2018 07:58)
*/
-@RunWith(JUnitPlatform.class)
class MapFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
index 5be1e192d54..9c6539382d2 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 09:52)
*/
-@RunWith(JUnitPlatform.class)
class MaxFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
index 64d7bc65612..224d1df3842 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 09:58)
*/
-@RunWith(JUnitPlatform.class)
class MeanFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
index 4bd74e29eb1..e23405d7332 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 10:03)
*/
-@RunWith(JUnitPlatform.class)
class MinFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
index 12961805140..ae7749d25c3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (10/10/2018 06:59)
*/
-@RunWith(JUnitPlatform.class)
class PivotFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
index 3866e7bb5a5..6677d1c5693 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
@@ -21,19 +21,14 @@
*/
package com.influxdb.query.dsl.functions;
-import java.util.Arrays;
-
import com.influxdb.query.dsl.Flux;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (10/10/2018 12:38)
*/
-@RunWith(JUnitPlatform.class)
class QuantileFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
index d55ec958b40..f3a19431305 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (26/06/2018 07:23)
*/
-@RunWith(JUnitPlatform.class)
class RangeFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
index 373291072ae..5dc3458c7e5 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (24/02/2020 13:26)
*/
-@RunWith(JUnitPlatform.class)
class ReduceFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
index 45744c9f236..06eacf29980 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (02/08/2018 12:01)
*/
-@RunWith(JUnitPlatform.class)
class RenameFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
index 3f759616c11..a69e35e0226 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2018 07:37)
*/
-@RunWith(JUnitPlatform.class)
class SampleFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
index 04175b7fc0d..6d866ec312a 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2018 09:32)
*/
-@RunWith(JUnitPlatform.class)
class SetFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
index fc251ee789b..cd534a47363 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 10:08)
*/
-@RunWith(JUnitPlatform.class)
class SkewFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
index 82a8b004732..e1ad00ad03b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 13:54)
*/
-@RunWith(JUnitPlatform.class)
class SortFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
index 62febe4140e..450aa738102 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 10:13)
*/
-@RunWith(JUnitPlatform.class)
class SpreadFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
index c30c3d7e9b2..13d9e8704e5 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 10:18)
*/
-@RunWith(JUnitPlatform.class)
class StddevFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
index 347acc1ac15..a76203b8ba4 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 10:22)
*/
-@RunWith(JUnitPlatform.class)
class SumFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
index a2627c2fdc0..abcf2f0d344 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
@@ -27,13 +27,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (14/12/2020 10:24)
*/
-@RunWith(JUnitPlatform.class)
class TailFluxTest
{
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
index db26fc574da..19d89c61a45 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
@@ -29,13 +29,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2018 10:46)
*/
-@RunWith(JUnitPlatform.class)
class TimeShiftFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
index 432894fde1b..8a62544f66b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 16:01)
*/
-@RunWith(JUnitPlatform.class)
class ToBoolFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
index 6d9903974fa..a50e628339c 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (26/06/2018 06:30)
*/
-@RunWith(JUnitPlatform.class)
class ToDurationFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
index 473b8267e56..c45fb08f82b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 16:09)
*/
-@RunWith(JUnitPlatform.class)
class ToFloatFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
index 2bc8c74c415..31a47c9b36f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
@@ -28,13 +28,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (10/10/2018 09:35)
*/
-@RunWith(JUnitPlatform.class)
class ToFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
index ce9917184d9..cf5d6a12343 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (25/06/2018 16:09)
*/
-@RunWith(JUnitPlatform.class)
class ToIntFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
index 09890ac9bd0..f94d6870272 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (26/06/2018 06:35)
*/
-@RunWith(JUnitPlatform.class)
class ToStringFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
index 8afe019e7ba..22f3cedaf4e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (26/06/2018 06:39)
*/
-@RunWith(JUnitPlatform.class)
class ToTimeFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
index 7b7ba7fb914..2a7bfe6f9de 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (26/06/2018 06:43)
*/
-@RunWith(JUnitPlatform.class)
class ToUIntFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
index 1c60b7de7b6..b18f114deb2 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
@@ -24,13 +24,11 @@
import java.time.temporal.ChronoUnit;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-@RunWith(JUnitPlatform.class)
class TruncateTimeColumnTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
index ea2824ee53f..3622e0607dc 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
@@ -23,15 +23,13 @@
import com.influxdb.query.dsl.Expressions;
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2018 10:03)
*/
-@RunWith(JUnitPlatform.class)
class UnionFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
index 01f0ef72238..9c198d66b9f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
@@ -30,13 +30,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (27/06/2018 12:42)
*/
-@RunWith(JUnitPlatform.class)
class WindowFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
index 50568da1dd2..ae889eae567 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (29/06/2018 10:03)
*/
-@RunWith(JUnitPlatform.class)
class YieldFluxTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
index 4a31ce13b58..16b847591d3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
@@ -25,13 +25,10 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
* @author Jakub Bednar (bednar@github) (09/10/2018 12:24)
*/
-@RunWith(JUnitPlatform.class)
class TimeIntervalTest {
@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
index e0151c5b433..7a700535602 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
@@ -21,19 +21,17 @@
*/
package com.influxdb.query.dsl.functions.restriction;
+import java.util.HashMap;
+import java.util.Map;
+
import com.influxdb.query.dsl.Flux;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* @author Jakub Bednar (bednar@github) (09/10/2018 10:33)
*/
-@RunWith(JUnitPlatform.class)
class RestrictionsTest {
@Test
diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml
index 5747fb9c31d..75794c88494 100644
--- a/karaf/karaf-assembly/pom.xml
+++ b/karaf/karaf-assembly/pom.xml
@@ -28,7 +28,7 @@
influxdb-karaf
com.influxdb
- 6.5.0
+ 6.7.0
influxdb-karaf-assembly
diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml
index 6a3823c5353..3c6b219546d 100644
--- a/karaf/karaf-features/pom.xml
+++ b/karaf/karaf-features/pom.xml
@@ -28,7 +28,7 @@
influxdb-karaf
com.influxdb
- 6.5.0
+ 6.7.0
influxdb-karaf-features
diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml
index 08a81d4ea4c..43c58e7fb65 100644
--- a/karaf/karaf-kar/pom.xml
+++ b/karaf/karaf-kar/pom.xml
@@ -28,7 +28,7 @@
influxdb-karaf
com.influxdb
- 6.5.0
+ 6.7.0
influxdb-karaf-kar
@@ -75,7 +75,7 @@
${project.groupId}
influxdb-karaf-features
- 6.5.0
+ 6.7.0
features
xml
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 4ae29aae98d..21ee7cf3be9 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -28,7 +28,7 @@
influxdb-client
com.influxdb
- 6.5.0
+ 6.7.0
influxdb-karaf
@@ -67,12 +67,12 @@
scm:git:git@github.com:influxdata/influxdb-client-java.git
scm:git:git@github.com:influxdata/influxdb-client-java.git
https://github.com/influxdata/influxdb-client-java/tree/master
- v6.5.0
+ v6.7.0
- 4.4.1
+ 4.4.2
diff --git a/pom.xml b/pom.xml
index 7ef686753fd..be0c5cd31fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
com.influxdb
influxdb-client
- 6.5.0
+ 6.7.0
pom
@@ -87,7 +87,7 @@
scm:git:git@github.com:influxdata/influxdb-client-java.git
scm:git:git@github.com:influxdata/influxdb-client-java.git
http://github.com/influxdata/influxdb-client-java/tree/master
- v6.5.0
+ v6.7.0
@@ -111,7 +111,7 @@
2.9.0
4.10.0
3.2.0
- 2.9.1
+ 2.10
3.1.5
3.0.0-M7
@@ -119,12 +119,13 @@
3.2.0
0.8.8
3.12.1
- 4.7.1
+ 4.7.2
- 1.7.10
- 5.9.0
+ 2.6.20
+ 1.7.20
+ 5.9.1
1.6.4
- 4.7.0
+ 4.8.1
@@ -155,7 +156,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.2.2
+ 3.3.0
@@ -239,6 +240,48 @@
${project.organization.name}
+
+
+ LICENSE_NAME
+ APPROVE
+ The MIT License (MIT)
+
+
+ LICENSE_NAME
+ APPROVE
+ The MIT License
+
+
+ LICENSE_NAME
+ APPROVE
+ Apache-2.0
+
+
+ LICENSE_URL
+ APPROVE
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+ LICENSE_URL
+ APPROVE
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+ LICENSE_URL
+ APPROVE
+ https://www.apache.org/licenses/LICENSE-2.0
+
+
+ LICENSE_URL
+ APPROVE
+ http://opensource.org/licenses/BSD-3-Clause
+
+
+ LICENSE_URL
+ APPROVE
+ https://www.eclipse.org/legal/epl-v20.html
+
+
@@ -254,6 +297,13 @@
org.apache.maven.plugins
maven-surefire-plugin
${plugin.surefire.version}
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit-jupiter.version}
+
+
@@ -268,6 +318,13 @@
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit-jupiter.version}
+
+
@@ -360,7 +417,7 @@
com.mycila
license-maven-plugin
- 4.1
+ 4.2.rc2
@@ -372,7 +429,7 @@
org.codehaus.mojo
versions-maven-plugin
- 2.11.0
+ 2.13.0
@@ -463,7 +520,7 @@
org.codehaus.mojo
versions-maven-plugin
- 2.7
+ 2.13.0
@@ -481,38 +538,38 @@
com.influxdb
influxdb-client-test
- 6.5.0
+ 6.7.0
test
com.influxdb
influxdb-client-core
- 6.5.0
+ 6.7.0
com.influxdb
influxdb-client-utils
- 6.5.0
+ 6.7.0
com.influxdb
influxdb-client-java
- 6.5.0
+ 6.7.0
com.influxdb
influxdb-client-reactive
- 6.5.0
+ 6.7.0
com.influxdb
influxdb-client-flux
- 6.5.0
+ 6.7.0
@@ -587,18 +644,6 @@
${dependency.gson.version}
-
- io.gsonfire
- gson-fire
- 1.8.5
-
-
- com.google.code.gson
- gson
-
-
-
-
io.reactivex.rxjava3
rxjava
@@ -623,12 +668,6 @@
${junit-jupiter.version}
-
- org.junit.platform
- junit-platform-runner
- 1.9.0
-
-
org.hamcrest
hamcrest
diff --git a/scripts/publish-site.sh b/scripts/publish-site.sh
index 6266ac1dba8..974b73ba839 100755
--- a/scripts/publish-site.sh
+++ b/scripts/publish-site.sh
@@ -22,39 +22,43 @@
#!/usr/bin/env bash
+# mvn site site:stage -DskipTests
+#
+# docker run -it --rm \
+# -v "${PWD}":/code \
+# -v ~/.ssh:/root/.ssh \
+# -v ~/.gitconfig:/root/.gitconfig \
+# -w /code \
+# bitnami/git /code/scripts/publish-site.sh
+
set -e
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
-# Generate Site
-cd "${SCRIPT_PATH}"/..
-mvn clean site site:stage -DskipTests
-# Copy Kotlin doc
-cp -R "${SCRIPT_PATH}"/../client-kotlin/target/dokka/ "${SCRIPT_PATH}"/../target/staging/influxdb-client-kotlin/dokka/
-
-# Copy site
-rm -rf "${HOME}"/site/*
-cp -R "${SCRIPT_PATH}"/../target/staging/ "${HOME}"/site
-
-# Clone GitHub pages
-echo "Clone: gh-pages"
-cd "${HOME}"
+echo
+echo "Clone GitHub pages ..."
+echo
rm -rf "${HOME}"/gh-pages
-git clone --branch=gh-pages git@github.com:influxdata/influxdb-client-java.git "${HOME}"/gh-pages
+git clone --depth 1 --branch=gh-pages git@github.com:influxdata/influxdb-client-java.git "${HOME}"/gh-pages
-echo "Copy site"
-# Push Site
+echo
+echo "Copy generated site to ${HOME}/gh-pages ..."
+echo
+# remove current content
rm -rf "${HOME}"/gh-pages/*
-cd "${HOME}"/gh-pages
-ls
-cp -Rf "${HOME}"/site/* ./
-ls
+cp -R "${SCRIPT_PATH}"/../client-kotlin/target/dokka/ "${SCRIPT_PATH}"/../target/staging/influxdb-client-kotlin/dokka/
+cp -Rf --verbose "${SCRIPT_PATH}"/../target/staging/* "${HOME}"/gh-pages
+echo
echo "Copy CircleCI"
-cp -R "${SCRIPT_PATH}"/../.circleci/ "${HOME}"/gh-pages/
+echo
+mkdir -p "${HOME}"/gh-pages/.circleci/
+cp "${SCRIPT_PATH}"/../.circleci/config.yml "${HOME}"/gh-pages/.circleci/config.yml
-
-echo "Commit"
+echo
+echo "Push generated site to GitHub ..."
+echo
+cd "${HOME}"/gh-pages
git add -f .
git commit -m "Pushed the latest Maven site to GitHub pages [skip CI]"
git push -fq origin gh-pages > /dev/null
diff --git a/spring/README.md b/spring/README.md
index 0230254902f..a2d9dae369c 100644
--- a/spring/README.md
+++ b/spring/README.md
@@ -99,13 +99,13 @@ The latest version for Maven dependency:
com.influxdb
influxdb-spring
- 6.5.0
+ 6.7.0
```
Or when using with Gradle:
```groovy
dependencies {
- implementation "com.influxdb:influxdb-spring:6.5.0"
+ implementation "com.influxdb:influxdb-spring:6.7.0"
}
```
diff --git a/spring/pom.xml b/spring/pom.xml
index a550d2e1fb8..e468c5bc52d 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -26,12 +26,12 @@
influxdb-client
com.influxdb
- 6.5.0
+ 6.7.0
4.0.0
influxdb-spring
- 6.5.0
+ 6.7.0
jar
Spring Integration for InfluxDB 2.x
@@ -68,13 +68,13 @@
scm:git:git@github.com:influxdata/influxdb-client-java.git
scm:git:git@github.com:influxdata/influxdb-client-java.git
https://github.com/influxdata/influxdb-client-java/tree/master
- v6.5.0
+ v6.7.0
- 1.9.3
- 2.7.3
- 5.3.22
+ 1.9.5
+ 2.7.5
+ 5.3.23
@@ -153,12 +153,6 @@
test
-
- org.junit.platform
- junit-platform-runner
- test
-
-
org.assertj
assertj-core
diff --git a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
index 1fc74551d69..d57fe38e515 100644
--- a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
+++ b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
@@ -24,8 +24,6 @@
import com.influxdb.client.InfluxDBClient;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -40,7 +38,6 @@
*
* @author Jakub Bednar (bednar@github) (07/05/2019 14:59)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDB2HealthIndicatorAutoConfigurationTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
index d0f81029c73..0d2e2069af2 100644
--- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
+++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
@@ -26,8 +26,6 @@
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -36,7 +34,6 @@
*
* @author Jakub Bednar (bednar@github) (07/05/2019 12:59)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDB2AutoConfigurationReactiveTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
index c38b212e2dc..b38810bf447 100644
--- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
+++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
@@ -31,8 +31,6 @@
import okhttp3.Protocol;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -46,7 +44,6 @@
*
* @author Jakub Bednar (bednar@github) (07/05/2019 12:59)
*/
-@RunWith(JUnitPlatform.class)
class InfluxDB2AutoConfigurationTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: