used new OPENAPI spec.

hivemq · Sep 12, 2023 · 2bfc40f · 2bfc40f
1 parent 7ea7fa4
commit 2bfc40f
Show file tree

Hide file tree

Showing 40 changed files with 206 additions and 206 deletions.
diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommand.java
@@ -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.DataGovernanceHubPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.tinylog.Logger;
@@ -66,7 +66,7 @@ public CreatePolicyCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubPoliciesApi policiesApi =
+        final DataHubDataPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         final String definition = definitionOptions.getDefinition();

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommand.java
@@ -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.DataGovernanceHubPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.tinylog.Logger;
@@ -60,7 +60,7 @@ public DeletePolicyCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubPoliciesApi policiesApi =
+        final DataHubDataPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (policyId.isEmpty()) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommand.java
@@ -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.DataGovernanceHubPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -67,7 +67,7 @@ public GetPolicyCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubPoliciesApi policiesApi =
+        final DataHubDataPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (policyId.isEmpty()) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommand.java
@@ -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.DataGovernanceHubPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -71,7 +71,7 @@ public ListPoliciesCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubPoliciesApi policiesApi =
+        final DataHubDataPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (limit != null && limit < 0) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommand.java
@@ -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.UpdatePolicyTask;
-import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.tinylog.Logger;
@@ -70,7 +70,7 @@ public UpdatePolicyCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubPoliciesApi policiesApi =
+        final DataHubDataPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (policyId.isEmpty()) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommand.java
@@ -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.DataGovernanceHubSchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.NotNull;
@@ -98,7 +98,7 @@ public CreateSchemaCommand(
     public @NotNull Integer call() throws IOException {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubSchemasApi schemasApi =
+        final DataHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (schemaType.equals("PROTOBUF") && messageType == null) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommand.java
@@ -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.DataGovernanceHubSchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.tinylog.Logger;
@@ -60,7 +60,7 @@ public DeleteSchemaCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubSchemasApi schemasApi =
+        final DataHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (schemaId.isEmpty()) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommand.java
@@ -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.DataGovernanceHubSchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -68,7 +68,7 @@ public GetSchemaCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubSchemasApi schemasApi =
+        final DataHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (schemaId.isEmpty()) {

diff --git a/src/main/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommand.java b/src/main/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommand.java
@@ -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.DataGovernanceHubSchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi;
 import com.hivemq.cli.rest.HiveMQRestService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -79,7 +79,7 @@ public ListSchemasCommand(
     public @NotNull Integer call() {
         Logger.trace("Command {}", this);
 
-        final DataGovernanceHubSchemasApi schemasApi =
+        final DataHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (limit != null && limit < 0) {

diff --git a/src/main/java/com/hivemq/cli/hivemq/policies/CreatePolicyTask.java b/src/main/java/com/hivemq/cli/hivemq/policies/CreatePolicyTask.java
@@ -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.DataGovernanceHubPoliciesApi;
-import com.hivemq.cli.openapi.hivemq.Policy;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataPolicy;
 import org.jetbrains.annotations.NotNull;
 
 public class CreatePolicyTask {
     private final @NotNull OutputFormatter outputFormatter;
-    private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
+    private final @NotNull DataHubDataPoliciesApi policiesApi;
     private final @NotNull Gson gson;
     private final @NotNull String definition;
 
     public CreatePolicyTask(
             final @NotNull OutputFormatter outputFormatter,
-            final @NotNull DataGovernanceHubPoliciesApi policiesApi,
+            final @NotNull DataHubDataPoliciesApi policiesApi,
             final @NotNull Gson gson,
             final @NotNull String definition) {
         this.outputFormatter = outputFormatter;
@@ -42,16 +42,16 @@ public CreatePolicyTask(
     }
 
     public boolean execute() {
-        final Policy policy;
+        final DataPolicy policy;
         try {
-            policy = gson.fromJson(definition, Policy.class);
+            policy = gson.fromJson(definition, DataPolicy.class);
         } catch (final JsonSyntaxException jsonSyntaxException) {
             outputFormatter.printError("Could not parse policy JSON: " + jsonSyntaxException.getMessage());
             return false;
         }
 
         try {
-            policiesApi.createPolicy(policy);
+            policiesApi.createDataPolicy(policy);
         } catch (final ApiException apiException) {
             outputFormatter.printApiException("Failed to create policy", apiException);
             return false;

diff --git a/src/main/java/com/hivemq/cli/hivemq/policies/DeletePolicyTask.java b/src/main/java/com/hivemq/cli/hivemq/policies/DeletePolicyTask.java
@@ -18,17 +18,17 @@
 
 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.DataHubDataPoliciesApi;
 import org.jetbrains.annotations.NotNull;
 
 public class DeletePolicyTask {
     private final @NotNull OutputFormatter outputFormatter;
-    private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
+    private final @NotNull DataHubDataPoliciesApi policiesApi;
     private final @NotNull String policyId;
 
     public DeletePolicyTask(
             final @NotNull OutputFormatter outputFormatter,
-            final @NotNull DataGovernanceHubPoliciesApi policiesApi,
+            final @NotNull DataHubDataPoliciesApi policiesApi,
             final @NotNull String policyId) {
         this.outputFormatter = outputFormatter;
         this.policiesApi = policiesApi;
@@ -37,7 +37,7 @@ public DeletePolicyTask(
 
     public boolean execute() {
         try {
-            policiesApi.deletePolicy(policyId);
+            policiesApi.deleteDataPolicy(policyId);
         } catch (final ApiException apiException) {
             outputFormatter.printApiException("Failed to delete policy", apiException);
             return false;

diff --git a/src/main/java/com/hivemq/cli/hivemq/policies/GetPolicyTask.java b/src/main/java/com/hivemq/cli/hivemq/policies/GetPolicyTask.java
@@ -18,20 +18,20 @@
 
 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.Policy;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataPolicy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class GetPolicyTask {
     private final @NotNull OutputFormatter outputFormatter;
-    private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
+    private final @NotNull DataHubDataPoliciesApi policiesApi;
     private final @NotNull String policyId;
     private final @Nullable String @Nullable [] fields;
 
     public GetPolicyTask(
             final @NotNull OutputFormatter outputFormatter,
-            final @NotNull DataGovernanceHubPoliciesApi policiesApi,
+            final @NotNull DataHubDataPoliciesApi policiesApi,
             final @NotNull String policyId,
             final @Nullable String @Nullable [] fields) {
         this.outputFormatter = outputFormatter;
@@ -48,9 +48,9 @@ public boolean execute() {
             fieldsQueryParam = String.join(",", fields);
         }
 
-        final Policy policy;
+        final DataPolicy policy;
         try {
-            policy = policiesApi.getPolicy(policyId, fieldsQueryParam);
+            policy = policiesApi.getDataPolicy(policyId, fieldsQueryParam);
         } catch (final ApiException apiException) {
             outputFormatter.printApiException("Failed to get policy", apiException);
             return false;

diff --git a/src/main/java/com/hivemq/cli/hivemq/policies/ListPoliciesTask.java b/src/main/java/com/hivemq/cli/hivemq/policies/ListPoliciesTask.java
@@ -18,10 +18,10 @@
 
 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.DataHubDataPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataPolicy;
+import com.hivemq.cli.openapi.hivemq.DataPolicyList;
 import com.hivemq.cli.openapi.hivemq.PaginationCursor;
-import com.hivemq.cli.openapi.hivemq.Policy;
-import com.hivemq.cli.openapi.hivemq.PolicyList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -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 DataGovernanceHubPoliciesApi policiesApi;
+    private final @NotNull DataHubDataPoliciesApi policiesApi;
     private final @Nullable String topic;
     private final @Nullable String @Nullable [] policyIds;
     private final @Nullable String @Nullable [] schemaIds;
@@ -45,7 +45,7 @@ public class ListPoliciesTask {
 
     public ListPoliciesTask(
             final @NotNull OutputFormatter outputFormatter,
-            final @NotNull DataGovernanceHubPoliciesApi policiesApi,
+            final @NotNull DataHubDataPoliciesApi policiesApi,
             final @Nullable String topic,
             final @Nullable String @Nullable [] policyIds,
             final @Nullable String @Nullable [] schemaIds,
@@ -82,18 +82,18 @@ public boolean execute() {
             schemaIdsQueryParam = String.join(",", schemaIds);
         }
 
-        List<Policy> allPolicies = new ArrayList<>();
+        List<DataPolicy> allPolicies = new ArrayList<>();
 
         try {
             String nextCursor = null;
             do {
-                final PolicyList policyList = policiesApi.getAllPolicies(fieldsQueryParam,
+                final DataPolicyList policyList = policiesApi.getAllDataPolicies(fieldsQueryParam,
                         policyIdsQueryParam,
                         schemaIdsQueryParam,
                         topic,
                         50,
                         nextCursor);
-                final List<Policy> policies = policyList.getItems();
+                final List<DataPolicy> policies = policyList.getItems();
                 final PaginationCursor links = policyList.getLinks();
 
                 if (policies != null) {
@@ -121,7 +121,7 @@ public boolean execute() {
             return false;
         }
 
-        final PolicyList policyList = new PolicyList().items(allPolicies);
+        final DataPolicyList policyList = new DataPolicyList().items(allPolicies);
         outputFormatter.printJson(policyList);
 
         return true;

diff --git a/src/main/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTask.java b/src/main/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTask.java
@@ -20,20 +20,20 @@
 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.DataGovernanceHubPoliciesApi;
-import com.hivemq.cli.openapi.hivemq.Policy;
+import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataPolicy;
 import org.jetbrains.annotations.NotNull;
 
 public class UpdatePolicyTask {
     private final @NotNull OutputFormatter outputFormatter;
-    private final @NotNull DataGovernanceHubPoliciesApi policiesApi;
+    private final @NotNull DataHubDataPoliciesApi policiesApi;
     private final @NotNull Gson gson;
     private final @NotNull String policyId;
     private final @NotNull String definition;
 
     public UpdatePolicyTask(
             final @NotNull OutputFormatter outputFormatter,
-            final @NotNull DataGovernanceHubPoliciesApi policiesApi,
+            final @NotNull DataHubDataPoliciesApi policiesApi,
             final @NotNull Gson gson,
             final @NotNull String policyId,
             final @NotNull String definition) {
@@ -45,16 +45,16 @@ public UpdatePolicyTask(
     }
 
     public boolean execute() {
-        final Policy policy;
+        final DataPolicy policy;
         try {
-            policy = gson.fromJson(definition, Policy.class);
+            policy = gson.fromJson(definition, DataPolicy.class);
         } catch (final JsonSyntaxException jsonSyntaxException) {
             outputFormatter.printError("Could not parse policy JSON: " + jsonSyntaxException.getMessage());
             return false;
         }
 
         try {
-            policiesApi.updatePolicy(policyId, policy);
+            policiesApi.updateDataPolicy(policyId, policy);
         } catch (final ApiException apiException) {
             outputFormatter.printApiException("Failed to update policy", apiException);
             return false;