Skip to content

Commit

Permalink
cli open api update (#348)
Browse files Browse the repository at this point in the history
* cli open api update > update the cli to use the new class names after polishing of OpenAPI

* cli open api update > fix openapi.yaml
  • Loading branch information
DC2-DanielKrueger authored Jul 14, 2023
1 parent b61291a commit abdfee9
Show file tree
Hide file tree
Showing 34 changed files with 379 additions and 106 deletions.
325 changes: 297 additions & 28 deletions specs/hivemq-openapi.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.commands.hivemq.datagovernance.PolicyDefinitionOptions;
import com.hivemq.cli.hivemq.policies.CreatePolicyTask;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.tinylog.Logger;
Expand Down Expand Up @@ -66,7 +66,7 @@ public CreatePolicyCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final PoliciesApi policiesApi =
final DataGovernanceHubPoliciesApi policiesApi =
hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

final String definition = definitionOptions.getDefinition();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.DataGovernanceOptions;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.hivemq.policies.DeletePolicyTask;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.tinylog.Logger;
Expand Down Expand Up @@ -60,7 +60,7 @@ public DeletePolicyCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final PoliciesApi policiesApi =
final DataGovernanceHubPoliciesApi policiesApi =
hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (policyId.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.DataGovernanceOptions;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.hivemq.policies.GetPolicyTask;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -67,7 +67,7 @@ public GetPolicyCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final PoliciesApi policiesApi =
final DataGovernanceHubPoliciesApi policiesApi =
hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (policyId.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.DataGovernanceOptions;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.hivemq.policies.ListPoliciesTask;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -71,7 +71,7 @@ public ListPoliciesCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final PoliciesApi policiesApi =
final DataGovernanceHubPoliciesApi policiesApi =
hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (limit != null && limit < 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.SchemaDefinitionOptions;
import com.hivemq.cli.converters.SchemaTypeConverter;
import com.hivemq.cli.hivemq.schemas.CreateSchemaTask;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -98,7 +98,7 @@ public CreateSchemaCommand(
public @NotNull Integer call() throws IOException {
Logger.trace("Command {}", this);

final SchemasApi schemasApi =
final DataGovernanceHubSchemasApi schemasApi =
hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (schemaType.equals("PROTOBUF") && messageType == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.DataGovernanceOptions;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.hivemq.schemas.DeleteSchemaTask;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.tinylog.Logger;
Expand Down Expand Up @@ -60,7 +60,7 @@ public DeleteSchemaCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final SchemasApi schemasApi =
final DataGovernanceHubSchemasApi schemasApi =
hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (schemaId.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.DataGovernanceOptions;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.hivemq.schemas.GetSchemaTask;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -68,7 +68,7 @@ public GetSchemaCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final SchemasApi schemasApi =
final DataGovernanceHubSchemasApi schemasApi =
hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (schemaId.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.converters.SchemaTypeConverter;
import com.hivemq.cli.hivemq.schemas.ListSchemasTask;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.rest.HiveMQRestService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -79,7 +79,7 @@ public ListSchemasCommand(
public @NotNull Integer call() {
Logger.trace("Command {}", this);

final SchemasApi schemasApi =
final DataGovernanceHubSchemasApi schemasApi =
hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());

if (limit != null && limit < 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
import com.google.gson.JsonSyntaxException;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.openapi.hivemq.Policy;
import org.jetbrains.annotations.NotNull;

public class CreatePolicyTask {
private final @NotNull OutputFormatter outputFormatter;
private final @NotNull PoliciesApi policiesApi;
private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
private final @NotNull Gson gson;
private final @NotNull String definition;

public CreatePolicyTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull PoliciesApi policiesApi,
final @NotNull DataGovernanceHubPoliciesApi policiesApi,
final @NotNull Gson gson,
final @NotNull String definition) {
this.outputFormatter = outputFormatter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import org.jetbrains.annotations.NotNull;

public class DeletePolicyTask {
private final @NotNull OutputFormatter outputFormatter;
private final @NotNull PoliciesApi policiesApi;
private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
private final @NotNull String policyId;

public DeletePolicyTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull PoliciesApi policiesApi,
final @NotNull DataGovernanceHubPoliciesApi policiesApi,
final @NotNull String policyId) {
this.outputFormatter = outputFormatter;
this.policiesApi = policiesApi;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.openapi.hivemq.Policy;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class GetPolicyTask {
private final @NotNull OutputFormatter outputFormatter;
private final @NotNull PoliciesApi policiesApi;
private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
private final @NotNull String policyId;
private final @Nullable String @Nullable [] fields;

public GetPolicyTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull PoliciesApi policiesApi,
final @NotNull DataGovernanceHubPoliciesApi policiesApi,
final @NotNull String policyId,
final @Nullable String @Nullable [] fields) {
this.outputFormatter = outputFormatter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.openapi.hivemq.PaginationCursor;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.Policy;
import com.hivemq.cli.openapi.hivemq.PolicyList;
import org.jetbrains.annotations.NotNull;
Expand All @@ -36,7 +36,7 @@ public class ListPoliciesTask {
private static final @NotNull Pattern CURSOR_PATTERN = Pattern.compile("cursor=([^&]*)");

private final @NotNull OutputFormatter outputFormatter;
private final @NotNull PoliciesApi policiesApi;
private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
private final @Nullable String topic;
private final @Nullable String @Nullable [] policyIds;
private final @Nullable String @Nullable [] schemaIds;
Expand All @@ -45,7 +45,7 @@ public class ListPoliciesTask {

public ListPoliciesTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull PoliciesApi policiesApi,
final @NotNull DataGovernanceHubPoliciesApi policiesApi,
final @Nullable String topic,
final @Nullable String @Nullable [] policyIds,
final @Nullable String @Nullable [] schemaIds,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import com.google.gson.JsonPrimitive;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.openapi.hivemq.Schema;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand All @@ -34,7 +34,7 @@
public class CreateSchemaTask {

private final @NotNull OutputFormatter outputFormatter;
private final @NotNull SchemasApi schemasApi;
private final @NotNull DataGovernanceHubSchemasApi schemasApi;
private final @NotNull String schemaId;
private final @NotNull String schemaType;
private final @Nullable String messageType;
Expand All @@ -44,7 +44,7 @@ public class CreateSchemaTask {

public CreateSchemaTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull SchemasApi schemasApi,
final @NotNull DataGovernanceHubSchemasApi schemasApi,
final @NotNull String schemaId,
final @NotNull String schemaType,
final @Nullable String messageType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import org.jetbrains.annotations.NotNull;

public class DeleteSchemaTask {
private final @NotNull OutputFormatter outputFormatter;
private final @NotNull SchemasApi schemasApi;
private final @NotNull DataGovernanceHubSchemasApi schemasApi;
private final @NotNull String schemaId;

public DeleteSchemaTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull SchemasApi schemasApi,
final @NotNull DataGovernanceHubSchemasApi schemasApi,
final @NotNull String schemaId) {
this.outputFormatter = outputFormatter;
this.schemasApi = schemasApi;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.openapi.hivemq.Schema;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class GetSchemaTask {

private final @NotNull OutputFormatter outputFormatter;
private final @NotNull SchemasApi schemasApi;
private final @NotNull DataGovernanceHubSchemasApi schemasApi;
private final @NotNull String schemaId;
private final @Nullable String @Nullable [] fields;

public GetSchemaTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull SchemasApi schemasApi,
final @NotNull DataGovernanceHubSchemasApi schemasApi,
final @NotNull String schemaId,
final @Nullable String @Nullable [] fields) {
this.outputFormatter = outputFormatter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.openapi.hivemq.PaginationCursor;
import com.hivemq.cli.openapi.hivemq.Schema;
import com.hivemq.cli.openapi.hivemq.SchemaList;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand All @@ -36,15 +36,15 @@ public class ListSchemasTask {
private static final @NotNull Pattern CURSOR_PATTERN = Pattern.compile("cursor=([^&]*)");

private final @NotNull OutputFormatter outputFormatter;
private final @NotNull SchemasApi schemasApi;
private final @NotNull DataGovernanceHubSchemasApi schemasApi;
private final @Nullable String @Nullable [] schemaTypes;
private final @Nullable String @Nullable [] schemaIds;
private final @Nullable String @Nullable [] fields;
private final @Nullable Integer limit;

public ListSchemasTask(
final @NotNull OutputFormatter outputFormatter,
final @NotNull SchemasApi schemasApi,
final @NotNull DataGovernanceHubSchemasApi schemasApi,
final @Nullable String @Nullable [] schemaTypes,
final @Nullable String @Nullable [] schemaIds,
final @Nullable String @Nullable [] fields,
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/com/hivemq/cli/rest/HiveMQRestService.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import com.hivemq.cli.openapi.ApiClient;
import com.hivemq.cli.openapi.Configuration;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
import com.hivemq.cli.openapi.hivemq.MqttClientsApi;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.SchemasApi;
import okhttp3.OkHttpClient;
import org.jetbrains.annotations.NotNull;

Expand All @@ -43,14 +43,18 @@ public HiveMQRestService() {
return new MqttClientsApi(apiClient);
}

public @NotNull PoliciesApi getPoliciesApi(final @NotNull String host, final double requestPerSecondLimit) {
public @NotNull DataGovernanceHubPoliciesApi getPoliciesApi(
final @NotNull String host,
final double requestPerSecondLimit) {
final ApiClient apiClient = buildApiClient(host, requestPerSecondLimit);
return new PoliciesApi(apiClient);
return new DataGovernanceHubPoliciesApi(apiClient);
}

public @NotNull SchemasApi getSchemasApi(final @NotNull String host, final double requestPerSecondLimit) {
public @NotNull DataGovernanceHubSchemasApi getSchemasApi(
final @NotNull String host,
final double requestPerSecondLimit) {
final ApiClient apiClient = buildApiClient(host, requestPerSecondLimit);
return new SchemasApi(apiClient);
return new DataGovernanceHubSchemasApi(apiClient);
}

private static @NotNull ApiClient buildApiClient(final @NotNull String host, final double requestsPerSecondLimit) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.google.gson.Gson;
import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter;
import com.hivemq.cli.openapi.ApiException;
import com.hivemq.cli.openapi.hivemq.PoliciesApi;
import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
import com.hivemq.cli.rest.HiveMQRestService;
import com.hivemq.cli.utils.TestLoggerUtils;
import org.jetbrains.annotations.NotNull;
Expand All @@ -44,7 +44,7 @@ public class CreatePolicyCommandTest {
private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class);
private final @NotNull Gson gson = new Gson();
private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class);
private final @NotNull PoliciesApi policiesApi = mock(PoliciesApi.class);
private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class);

private final @NotNull CommandLine commandLine =
new CommandLine(new CreatePolicyCommand(hiveMQRestService, outputFormatter, gson));
Expand Down
Loading

0 comments on commit abdfee9

Please sign in to comment.