cli open api update

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.PoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
 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 PoliciesApi policiesApi =
+        final DataGovernanceHubPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         final String definition = definitionOptions.getDefinition();

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.PoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
 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 PoliciesApi policiesApi =
+        final DataGovernanceHubPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (policyId.isEmpty()) {

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.PoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
 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 PoliciesApi policiesApi =
+        final DataGovernanceHubPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (policyId.isEmpty()) {

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.PoliciesApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi;
 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 PoliciesApi policiesApi =
+        final DataGovernanceHubPoliciesApi policiesApi =
                 hiveMQRestService.getPoliciesApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (limit != null && limit < 0) {

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.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;
@@ -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) {

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.SchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
 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 SchemasApi schemasApi =
+        final DataGovernanceHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (schemaId.isEmpty()) {

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.SchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
 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 SchemasApi schemasApi =
+        final DataGovernanceHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (schemaId.isEmpty()) {

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.SchemasApi;
+import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi;
 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 SchemasApi schemasApi =
+        final DataGovernanceHubSchemasApi schemasApi =
                 hiveMQRestService.getSchemasApi(dataGovernanceOptions.getUrl(), dataGovernanceOptions.getRateLimit());
 
         if (limit != null && limit < 0) {

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.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;

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.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;

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.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;

src/main/java/com/hivemq/cli/hivemq/policies/ListPoliciesTask.java

@@ -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;
@@ -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;
@@ -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,

src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java

@@ -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;
 
@@ -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;
@@ -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,

src/main/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTask.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.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;

src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java

@@ -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;

src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.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.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;
 
@@ -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,

src/main/java/com/hivemq/cli/rest/HiveMQRestService.java

@@ -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;
 
@@ -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) {

src/test/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommandTest.java

@@ -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;
@@ -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));