#15: Added Setup service

[skip ci]

Author: bednar

client/src/main/java/org/influxdata/client/internal/AbstractInfluxDBRestClient.java

@@ -36,26 +36,24 @@
 import org.influxdata.client.domain.User;
 import org.influxdata.client.service.AuthorizationsService;
 import org.influxdata.exceptions.NotFoundException;
+import org.influxdata.internal.AbstractRestClient;
 
-import com.google.gson.Gson;
 import retrofit2.Call;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/09/2018 12:00)
  */
-final class AuthorizationsApiImpl extends AbstractInfluxDBRestClient implements AuthorizationsApi {
+final class AuthorizationsApiImpl extends AbstractRestClient implements AuthorizationsApi {
 
     private static final Logger LOG = Logger.getLogger(AuthorizationsApiImpl.class.getName());
 
-    private final AuthorizationsService authorizationsService;
+    private final AuthorizationsService service;
 
-    AuthorizationsApiImpl(@Nonnull final InfluxDBService influxDBService,
-                          @Nonnull final AuthorizationsService authorizationsService,
-                          @Nonnull final Gson gson) {
+    AuthorizationsApiImpl(@Nonnull final AuthorizationsService service) {
 
-        super(influxDBService, gson);
+        Arguments.checkNotNull(service, "service");
 
-        this.authorizationsService = authorizationsService;
+        this.service = service;
     }
 
     @Nonnull
@@ -91,7 +89,7 @@ public Authorization createAuthorization(@Nonnull final Authorization authorizat
 
         Arguments.checkNotNull(authorization, "Authorization is required");
 
-        Call<Authorization> call = authorizationsService.authorizationsPost(authorization, null);
+        Call<Authorization> call = service.authorizationsPost(authorization, null);
 
         return execute(call);
     }
@@ -108,7 +106,7 @@ public Authorization findAuthorizationByID(@Nonnull final String authorizationID
 
         Arguments.checkNonEmpty(authorizationID, "authorizationID");
 
-        Call<Authorization> call = authorizationsService.authorizationsAuthIDGet(authorizationID, null);
+        Call<Authorization> call = service.authorizationsAuthIDGet(authorizationID, null);
 
         return execute(call, NotFoundException.class);
     }
@@ -140,7 +138,7 @@ public Authorization updateAuthorization(@Nonnull final Authorization authorizat
 
         Arguments.checkNotNull(authorization, "Authorization is required");
 
-        Call<Authorization> authorizationCall = authorizationsService
+        Call<Authorization> authorizationCall = service
                 .authorizationsAuthIDPatch(authorization.getId(), authorization, null);
 
         return execute(authorizationCall);
@@ -159,7 +157,7 @@ public void deleteAuthorization(@Nonnull final String authorizationID) {
 
         Arguments.checkNonEmpty(authorizationID, "authorizationID");
 
-        Call<Void> call = authorizationsService.authorizationsAuthIDDelete(authorizationID, null);
+        Call<Void> call = service.authorizationsAuthIDDelete(authorizationID, null);
         execute(call);
     }
 
@@ -195,7 +193,7 @@ public Authorization cloneAuthorization(@Nonnull final Authorization authorizati
     @Nonnull
     private List<Authorization> findAuthorizations(@Nullable final String userID, @Nullable final String userName) {
 
-        Call<Authorizations> authorizationsCall = authorizationsService.authorizationsGet(null, userID, userName);
+        Call<Authorizations> authorizationsCall = service.authorizationsGet(null, userID, userName);
 
         Authorizations authorizations = execute(authorizationsCall);
         LOG.log(Level.FINEST, "findAuthorizations found: {0}", authorizations);

client/src/main/java/org/influxdata/client/internal/AuthorizationsApiImpl.java

@@ -48,24 +48,22 @@
 import org.influxdata.client.domain.User;
 import org.influxdata.client.service.BucketsService;
 import org.influxdata.exceptions.NotFoundException;
+import org.influxdata.internal.AbstractRestClient;
 
-import com.google.gson.Gson;
 import retrofit2.Call;
 
 /**
  * @author Jakub Bednar (bednar@github) (13/09/2018 10:47)
  */
-final class BucketsApiImpl extends AbstractInfluxDBRestClient implements BucketsApi {
+final class BucketsApiImpl extends AbstractRestClient implements BucketsApi {
 
     private static final Logger LOG = Logger.getLogger(BucketsApiImpl.class.getName());
 
     private final BucketsService service;
 
-    BucketsApiImpl(@Nonnull final InfluxDBService influxDBService,
-                   @Nonnull final BucketsService service,
-                   @Nonnull final Gson gson) {
+    BucketsApiImpl(@Nonnull final BucketsService service) {
 
-        super(influxDBService, gson);
+        Arguments.checkNotNull(service, "service");
 
         this.service = service;
     }
@@ -417,7 +415,7 @@ public OperationLogs findBucketLogs(@Nonnull final String bucketID,
         Call<OperationLogs> call = service.bucketsBucketIDLogsGet(bucketID, null,
                 findOptions.getOffset(), findOptions.getLimit());
 
-        return getOperationLogEntries(call);
+        return execute(call);
     }
 
     @Nonnull

client/src/main/java/org/influxdata/client/internal/BucketsApiImpl.java

@@ -51,6 +51,7 @@
 import org.influxdata.client.service.LabelsService;
 import org.influxdata.client.service.OrganizationsService;
 import org.influxdata.client.service.ScraperTargetsService;
+import org.influxdata.client.service.SetupService;
 import org.influxdata.client.service.SourcesService;
 import org.influxdata.client.service.TasksService;
 import org.influxdata.client.service.TelegrafsService;
@@ -66,10 +67,13 @@
 public final class InfluxDBClientImpl extends AbstractInfluxDBClient<InfluxDBService> implements InfluxDBClient {
 
     private static final Logger LOG = Logger.getLogger(InfluxDBClientImpl.class.getName());
+    private final SetupService setupService;
 
     public InfluxDBClientImpl(@Nonnull final InfluxDBClientOptions options) {
 
         super(options, InfluxDBService.class);
+
+        setupService = retrofit.create(SetupService.class);
     }
 
     @Nonnull
@@ -96,55 +100,55 @@ public WriteApi getWriteApi(@Nonnull final WriteOptions writeOptions) {
     @Nonnull
     @Override
     public AuthorizationsApi getAuthorizationsApi() {
-        return new AuthorizationsApiImpl(influxDBService, retrofit.create(AuthorizationsService.class), gson);
+        return new AuthorizationsApiImpl(retrofit.create(AuthorizationsService.class));
     }
 
     @Nonnull
     @Override
     public BucketsApi getBucketsApi() {
-        return new BucketsApiImpl(influxDBService, retrofit.create(BucketsService.class), gson);
+        return new BucketsApiImpl(retrofit.create(BucketsService.class));
     }
 
     @Nonnull
     @Override
     public OrganizationsApi getOrganizationsApi() {
-        return new OrganizationsApiImpl(influxDBService, retrofit.create(OrganizationsService.class), gson);
+        return new OrganizationsApiImpl(retrofit.create(OrganizationsService.class));
     }
 
     @Nonnull
     @Override
     public SourcesApi getSourcesApi() {
-        return new SourcesApiImpl(influxDBService, retrofit.create(SourcesService.class), this, gson);
+        return new SourcesApiImpl(retrofit.create(SourcesService.class), this);
     }
 
     @Nonnull
     @Override
     public TasksApi getTasksApi() {
-        return new TasksApiImpl(influxDBService, retrofit.create(TasksService.class), gson);
+        return new TasksApiImpl(retrofit.create(TasksService.class));
     }
 
     @Nonnull
     @Override
     public UsersApi getUsersApi() {
-        return new UsersApiImpl(influxDBService, retrofit.create(UsersService.class), gson);
+        return new UsersApiImpl(retrofit.create(UsersService.class));
     }
 
     @Nonnull
     @Override
     public ScraperTargetsApi getScraperTargetsApi() {
-        return new ScraperTargetsApiImpl(influxDBService, retrofit.create(ScraperTargetsService.class), gson);
+        return new ScraperTargetsApiImpl(retrofit.create(ScraperTargetsService.class));
     }
 
     @Nonnull
     @Override
     public TelegrafsApi getTelegrafsApi() {
-        return new TelegrafsApiImpl(influxDBService, retrofit.create(TelegrafsService.class), gson);
+        return new TelegrafsApiImpl(retrofit.create(TelegrafsService.class));
     }
 
     @Nonnull
     @Override
     public LabelsApi getLabelsApi() {
-        return new LabelsApiImpl(influxDBService, retrofit.create(LabelsService.class), gson);
+        return new LabelsApiImpl(retrofit.create(LabelsService.class));
     }
 
     @Nonnull
@@ -173,9 +177,7 @@ public OnboardingResponse onBoarding(@Nonnull final OnboardingRequest onboarding
 
         Arguments.checkNotNull(onboarding, "onboarding");
 
-        String json = gson.toJson(onboarding);
-
-        Call<OnboardingResponse> call = influxDBService.setup(createBody(json));
+        Call<OnboardingResponse> call = setupService.setupPost(onboarding, null);
 
         return execute(call);
     }
@@ -184,7 +186,7 @@ public OnboardingResponse onBoarding(@Nonnull final OnboardingRequest onboarding
     @Override
     public Boolean isOnboardingAllowed() {
 
-        IsOnboarding isOnboarding = execute(influxDBService.setup());
+        IsOnboarding isOnboarding = execute(setupService.setupGet(null));
 
         return isOnboarding.isAllowed();
     }