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 index 6aba9e97c..a562d863e 100644 --- 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 index 9fd2b853b..64df28e8a 100644 --- 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 index a99320d9d..5cd602352 100644 --- 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 index dd3c67d71..71b528990 100644 --- 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 index 576e759e9..4d579bd63 100644 --- 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 index 948c9db4b..1fa976d47 100644 --- 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 index 8c9d5f05b..8e7b1cc4e 100644 --- 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 index a61abedad..edfd690bd 100644 --- 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 index d973bba9c..9197d747e 100644 --- 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 index 68041f03f..49fbf795e 100644 --- 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 index 291b57da8..22db5fec0 100644 --- 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 index 393f37e9b..a6d06d9de 100644 --- 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 index 10164ed6f..4260b4cd5 100644 --- 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 allPolicies = new ArrayList<>(); + List 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 policies = policyList.getItems(); + final List 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 index 74714b220..67df06959 100644 --- 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; diff --git a/src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java b/src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java index ba8226318..34ee60d31 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java +++ b/src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java @@ -20,7 +20,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; 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 DataGovernanceHubSchemasApi schemasApi; + private final @NotNull DataHubSchemasApi 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 DataGovernanceHubSchemasApi schemasApi, + final @NotNull DataHubSchemasApi schemasApi, final @NotNull String schemaId, final @NotNull String schemaType, final @Nullable String messageType, diff --git a/src/main/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTask.java b/src/main/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTask.java index c992e1214..a6c79587b 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTask.java +++ b/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.DataGovernanceHubSchemasApi; +import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi; import org.jetbrains.annotations.NotNull; public class DeleteSchemaTask { private final @NotNull OutputFormatter outputFormatter; - private final @NotNull DataGovernanceHubSchemasApi schemasApi; + private final @NotNull DataHubSchemasApi schemasApi; private final @NotNull String schemaId; public DeleteSchemaTask( final @NotNull OutputFormatter outputFormatter, - final @NotNull DataGovernanceHubSchemasApi schemasApi, + final @NotNull DataHubSchemasApi schemasApi, final @NotNull String schemaId) { this.outputFormatter = outputFormatter; this.schemasApi = schemasApi; diff --git a/src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java b/src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java index 1d4183197..2016f4101 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java +++ b/src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,13 +26,13 @@ public class GetSchemaTask { private final @NotNull OutputFormatter outputFormatter; - private final @NotNull DataGovernanceHubSchemasApi schemasApi; + private final @NotNull DataHubSchemasApi schemasApi; private final @NotNull String schemaId; private final @Nullable String @Nullable [] fields; public GetSchemaTask( final @NotNull OutputFormatter outputFormatter, - final @NotNull DataGovernanceHubSchemasApi schemasApi, + final @NotNull DataHubSchemasApi schemasApi, final @NotNull String schemaId, final @Nullable String @Nullable [] fields) { this.outputFormatter = outputFormatter; diff --git a/src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.java b/src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.java index f2e82d2d4..2cbc0d171 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.java +++ b/src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.PaginationCursor; import com.hivemq.cli.openapi.hivemq.Schema; import com.hivemq.cli.openapi.hivemq.SchemaList; @@ -36,7 +36,7 @@ public class ListSchemasTask { private static final @NotNull Pattern CURSOR_PATTERN = Pattern.compile("cursor=([^&]*)"); private final @NotNull OutputFormatter outputFormatter; - private final @NotNull DataGovernanceHubSchemasApi schemasApi; + private final @NotNull DataHubSchemasApi schemasApi; private final @Nullable String @Nullable [] schemaTypes; private final @Nullable String @Nullable [] schemaIds; private final @Nullable String @Nullable [] fields; @@ -44,7 +44,7 @@ public class ListSchemasTask { public ListSchemasTask( final @NotNull OutputFormatter outputFormatter, - final @NotNull DataGovernanceHubSchemasApi schemasApi, + final @NotNull DataHubSchemasApi schemasApi, final @Nullable String @Nullable [] schemaTypes, final @Nullable String @Nullable [] schemaIds, final @Nullable String @Nullable [] fields, diff --git a/src/main/java/com/hivemq/cli/ioc/CliModule.java b/src/main/java/com/hivemq/cli/ioc/CliModule.java index 10417c4d5..4ca7929ca 100644 --- a/src/main/java/com/hivemq/cli/ioc/CliModule.java +++ b/src/main/java/com/hivemq/cli/ioc/CliModule.java @@ -26,7 +26,7 @@ import com.hivemq.cli.commands.cli.SubscribeCommand; import com.hivemq.cli.commands.cli.TestBrokerCommand; import com.hivemq.cli.commands.shell.ShellCommand; -import com.hivemq.cli.openapi.hivemq.Policy; +import com.hivemq.cli.openapi.hivemq.DataPolicy; import com.hivemq.cli.openapi.hivemq.Schema; import com.hivemq.cli.utils.json.OffsetDateTimeSerializer; import com.hivemq.cli.utils.json.PolicySerializer; @@ -85,7 +85,7 @@ class CliModule { return new GsonBuilder().setPrettyPrinting() .disableHtmlEscaping() .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer()) - .registerTypeAdapter(Policy.class, new PolicySerializer()) + .registerTypeAdapter(DataPolicy.class, new PolicySerializer()) .registerTypeAdapter(Schema.class, new SchemaSerializer()) .create(); } diff --git a/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java b/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java index 23c09f1a9..e3609b884 100644 --- a/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java +++ b/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java @@ -18,8 +18,8 @@ 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.DataHubDataPoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.MqttClientsApi; import okhttp3.OkHttpClient; import org.jetbrains.annotations.NotNull; @@ -43,18 +43,18 @@ public HiveMQRestService() { return new MqttClientsApi(apiClient); } - public @NotNull DataGovernanceHubPoliciesApi getPoliciesApi( + public @NotNull DataHubDataPoliciesApi getPoliciesApi( final @NotNull String host, final double requestPerSecondLimit) { final ApiClient apiClient = buildApiClient(host, requestPerSecondLimit); - return new DataGovernanceHubPoliciesApi(apiClient); + return new DataHubDataPoliciesApi(apiClient); } - public @NotNull DataGovernanceHubSchemasApi getSchemasApi( + public @NotNull DataHubSchemasApi getSchemasApi( final @NotNull String host, final double requestPerSecondLimit) { final ApiClient apiClient = buildApiClient(host, requestPerSecondLimit); - return new DataGovernanceHubSchemasApi(apiClient); + return new DataHubSchemasApi(apiClient); } private static @NotNull ApiClient buildApiClient(final @NotNull String host, final double requestsPerSecondLimit) { diff --git a/src/main/java/com/hivemq/cli/utils/json/PolicySerializer.java b/src/main/java/com/hivemq/cli/utils/json/PolicySerializer.java index 0e7e6597c..75a18a003 100644 --- a/src/main/java/com/hivemq/cli/utils/json/PolicySerializer.java +++ b/src/main/java/com/hivemq/cli/utils/json/PolicySerializer.java @@ -21,11 +21,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.hivemq.cli.openapi.hivemq.Policy; -import com.hivemq.cli.openapi.hivemq.PolicyAction; +import com.hivemq.cli.openapi.hivemq.DataPolicy; +import com.hivemq.cli.openapi.hivemq.DataPolicyAction; +import com.hivemq.cli.openapi.hivemq.DataPolicyValidation; +import com.hivemq.cli.openapi.hivemq.DataPolicyValidator; import com.hivemq.cli.openapi.hivemq.PolicyOperation; -import com.hivemq.cli.openapi.hivemq.PolicyValidation; -import com.hivemq.cli.openapi.hivemq.PolicyValidator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,27 +35,27 @@ * The generated OpenAPI classes do not preserve JSON field ordering. * This serializer manually restores the correct order. */ -public class PolicySerializer implements JsonSerializer { +public class PolicySerializer implements JsonSerializer { @Override public @NotNull JsonElement serialize( - final @NotNull Policy policy, + final @NotNull DataPolicy policy, final @NotNull Type typeOfSrc, final @NotNull JsonSerializationContext context) { final JsonObject object = new JsonObject(); - object.add(Policy.SERIALIZED_NAME_ID, context.serialize(policy.getId())); - object.add(Policy.SERIALIZED_NAME_CREATED_AT, context.serialize(policy.getCreatedAt())); - object.add(Policy.SERIALIZED_NAME_MATCHING, context.serialize(policy.getMatching())); - object.add(Policy.SERIALIZED_NAME_VALIDATION, serializeValidation(policy.getValidation(), context)); - object.add(Policy.SERIALIZED_NAME_ON_SUCCESS, serializePolicyAction(policy.getOnSuccess(), context)); - object.add(Policy.SERIALIZED_NAME_ON_FAILURE, serializePolicyAction(policy.getOnFailure(), context)); + object.add(DataPolicy.SERIALIZED_NAME_ID, context.serialize(policy.getId())); + object.add(DataPolicy.SERIALIZED_NAME_CREATED_AT, context.serialize(policy.getCreatedAt())); + object.add(DataPolicy.SERIALIZED_NAME_MATCHING, context.serialize(policy.getMatching())); + object.add(DataPolicy.SERIALIZED_NAME_VALIDATION, serializeValidation(policy.getValidation(), context)); + object.add(DataPolicy.SERIALIZED_NAME_ON_SUCCESS, serializePolicyAction(policy.getOnSuccess(), context)); + object.add(DataPolicy.SERIALIZED_NAME_ON_FAILURE, serializePolicyAction(policy.getOnFailure(), context)); return object; } private @Nullable JsonElement serializeValidation( - final @Nullable PolicyValidation policyValidation, final @NotNull JsonSerializationContext context) { + final @Nullable DataPolicyValidation policyValidation, final @NotNull JsonSerializationContext context) { if (policyValidation == null) { return null; } @@ -68,19 +68,19 @@ public class PolicySerializer implements JsonSerializer { final JsonArray validatorsArray = new JsonArray(); - for (final PolicyValidator validator : policyValidation.getValidators()) { + for (final DataPolicyValidator validator : policyValidation.getValidators()) { final JsonObject validatorObject = new JsonObject(); - validatorObject.add(PolicyValidator.SERIALIZED_NAME_TYPE, context.serialize(validator.getType())); - validatorObject.add(PolicyValidator.SERIALIZED_NAME_ARGUMENTS, context.serialize(validator.getArguments())); + validatorObject.add(DataPolicyValidator.SERIALIZED_NAME_TYPE, context.serialize(validator.getType())); + validatorObject.add(DataPolicyValidator.SERIALIZED_NAME_ARGUMENTS, context.serialize(validator.getArguments())); validatorsArray.add(validatorObject); } - object.add(PolicyValidation.SERIALIZED_NAME_VALIDATORS, context.serialize(validatorsArray)); + object.add(DataPolicyValidation.SERIALIZED_NAME_VALIDATORS, context.serialize(validatorsArray)); return object; } private @Nullable JsonElement serializePolicyAction( - final @Nullable PolicyAction policyAction, final @NotNull JsonSerializationContext context) { + final @Nullable DataPolicyAction policyAction, final @NotNull JsonSerializationContext context) { if (policyAction == null) { return null; } @@ -102,7 +102,7 @@ public class PolicySerializer implements JsonSerializer { operationsArray.add(operationObject); } - object.add(PolicyAction.SERIALIZED_NAME_PIPELINE, context.serialize(operationsArray)); + object.add(DataPolicyAction.SERIALIZED_NAME_PIPELINE, context.serialize(operationsArray)); return object; } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommandTest.java index c928d6105..ac8f75169 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/policies/CreatePolicyCommandTest.java +++ b/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.DataGovernanceHubPoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi; 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 DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new CreatePolicyCommand(hiveMQRestService, outputFormatter, gson)); @@ -96,7 +96,7 @@ void call_taskSuccessful_return0() { @Test void call_taskFailed_return1() throws ApiException { - when(policiesApi.createPolicy(any())).thenThrow(ApiException.class); + when(policiesApi.createDataPolicy(any())).thenThrow(ApiException.class); assertEquals(1, commandLine.execute("--definition=" + POLICY_JSON)); } } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommandTest.java index fa7784a4f..b90e09b4a 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/policies/DeletePolicyCommandTest.java @@ -18,7 +18,7 @@ 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.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public class DeletePolicyCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new DeletePolicyCommand(hiveMQRestService, outputFormatter)); @@ -70,12 +70,12 @@ void call_urlAndRateLimitPassed_usedInApi() { @Test void call_taskSuccessful_return0() throws ApiException { assertEquals(0, commandLine.execute("--id=policy-1")); - verify(policiesApi).deletePolicy(eq("policy-1")); + verify(policiesApi).deleteDataPolicy(eq("policy-1")); } @Test void call_taskFailed_return1() throws ApiException { - doThrow(ApiException.class).when(policiesApi).deletePolicy(any()); + doThrow(ApiException.class).when(policiesApi).deleteDataPolicy(any()); assertEquals(1, commandLine.execute("--id=policy-1")); } } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommandTest.java index cf87e5f7b..bd375a1af 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/policies/GetPolicyCommandTest.java @@ -18,7 +18,7 @@ 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.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public class GetPolicyCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new GetPolicyCommand(hiveMQRestService, outputFormatter)); @@ -70,18 +70,18 @@ void call_urlAndRateLimitPassed_usedInApi() { @Test void call_multipleFields_success() throws ApiException { assertEquals(0, commandLine.execute("--field=id", "--field=createdAt", "--id=policy-1")); - verify(policiesApi).getPolicy(eq("policy-1"), eq("id,createdAt")); + verify(policiesApi).getDataPolicy(eq("policy-1"), eq("id,createdAt")); } @Test void call_taskSuccessful_return0() throws ApiException { assertEquals(0, commandLine.execute("--id=policy-1")); - verify(policiesApi).getPolicy(eq("policy-1"), isNull()); + verify(policiesApi).getDataPolicy(eq("policy-1"), isNull()); } @Test void call_taskFailed_return1() throws ApiException { - when(policiesApi.getPolicy(any(), isNull())).thenThrow(ApiException.class); + when(policiesApi.getDataPolicy(any(), isNull())).thenThrow(ApiException.class); assertEquals(1, commandLine.execute("--id=policy-1")); } } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommandTest.java index 505c80828..e39488a98 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/policies/ListPoliciesCommandTest.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.PolicyList; +import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataPolicyList; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -41,7 +41,7 @@ public class ListPoliciesCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new ListPoliciesCommand(hiveMQRestService, outputFormatter)); @@ -50,8 +50,8 @@ public class ListPoliciesCommandTest { void setUp() throws ApiException { TestLoggerUtils.resetLogger(); when(hiveMQRestService.getPoliciesApi(any(), anyDouble())).thenReturn(policiesApi); - final PolicyList policyList = new PolicyList(); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenReturn(policyList); + final DataPolicyList policyList = new DataPolicyList(); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenReturn(policyList); } @Test @@ -68,7 +68,7 @@ void call_urlAndRateLimitPassed_usedInApi() { @Test void call_topicAndMultiplePolicyIdsAndSchemaIds_success() throws ApiException { assertEquals(0, commandLine.execute("--topic=t", "--id=p1", "--id=p2", "--schema-id=s1", "--schema-id=s2")); - verify(policiesApi).getAllPolicies(isNull(), eq("p1,p2"), eq("s1,s2"), eq("t"), any(), any()); + verify(policiesApi).getAllDataPolicies(isNull(), eq("p1,p2"), eq("s1,s2"), eq("t"), any(), any()); } @Test @@ -90,12 +90,12 @@ void call_limitNegative_error() { @Test void call_multipleFields_success() throws ApiException { assertEquals(0, commandLine.execute("--field=id", "--field=version")); - verify(policiesApi).getAllPolicies(eq("id,version"), isNull(), isNull(), isNull(), any(), any()); + verify(policiesApi).getAllDataPolicies(eq("id,version"), isNull(), isNull(), isNull(), any(), any()); } @Test void call_taskFailed_return1() throws ApiException { - doThrow(ApiException.class).when(policiesApi).getAllPolicies(any(), any(), any(), any(), any(), any()); + doThrow(ApiException.class).when(policiesApi).getAllDataPolicies(any(), any(), any(), any(), any(), any()); assertEquals(1, commandLine.execute()); } } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommandTest.java index 6f3c62300..17717a706 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/policies/UpdatePolicyCommandTest.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.DataGovernanceHubPoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -44,7 +44,7 @@ public class UpdatePolicyCommandTest { 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 DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new UpdatePolicyCommand(hiveMQRestService, outputFormatter, gson)); @@ -105,12 +105,12 @@ void call_urlAndRateLimitPassed_usedInApi() { @Test void call_taskSuccessful_return0() throws ApiException { assertEquals(0, commandLine.execute("--id=policy-1", "--definition=" + POLICY_JSON)); - verify(policiesApi).updatePolicy(eq("policy-1"), any()); + verify(policiesApi).updateDataPolicy(eq("policy-1"), any()); } @Test void call_taskFailed_return1() throws ApiException { - when(policiesApi.updatePolicy(eq("policy-1"), any())).thenThrow(ApiException.class); + when(policiesApi.updateDataPolicy(eq("policy-1"), any())).thenThrow(ApiException.class); assertEquals(1, commandLine.execute("--id=policy-1", "--definition=" + POLICY_JSON)); } } diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommandTest.java index c1667081d..ccbccac2b 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/CreateSchemaCommandTest.java @@ -21,7 +21,7 @@ import com.hivemq.cli.commands.hivemq.datagovernance.OutputFormatter; import com.hivemq.cli.openapi.ApiException; import com.hivemq.cli.openapi.JSON; -import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi; +import com.hivemq.cli.openapi.hivemq.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; @@ -56,7 +56,7 @@ public class CreateSchemaCommandTest { private @NotNull OutputFormatter outputFormatter; private final @NotNull ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); private final @NotNull JSON openapiSerialization = new JSON(); - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private @NotNull CommandLine commandLine; diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommandTest.java index 0039442db..80329d2d9 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/DeleteSchemaCommandTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public class DeleteSchemaCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new DeleteSchemaCommand(hiveMQRestService, outputFormatter)); diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommandTest.java index ecda44c62..3464f7e0e 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/GetSchemaCommandTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public class GetSchemaCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new GetSchemaCommand(hiveMQRestService, outputFormatter)); diff --git a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommandTest.java b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommandTest.java index 7d146eb16..c6f0d6754 100644 --- a/src/test/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommandTest.java +++ b/src/test/java/com/hivemq/cli/commands/hivemq/schemas/ListSchemasCommandTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.SchemaList; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; @@ -41,7 +41,7 @@ public class ListSchemasCommandTest { private final @NotNull HiveMQRestService hiveMQRestService = mock(HiveMQRestService.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new ListSchemasCommand(hiveMQRestService, outputFormatter)); diff --git a/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.java index 996a6478b..9bef501fd 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.java @@ -19,8 +19,8 @@ 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.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.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -36,9 +36,9 @@ public class CreatePolicyTaskTest { - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull ArgumentCaptor policyCaptor = ArgumentCaptor.forClass(Policy.class); + private final @NotNull ArgumentCaptor policyCaptor = ArgumentCaptor.forClass(DataPolicy.class); private final @NotNull Gson gson = new Gson(); private static final @NotNull String POLICY_ID = "policy-1"; @@ -46,15 +46,15 @@ public class CreatePolicyTaskTest { "{ \"id\": \"" + POLICY_ID + "\", \"matching\": { \"topicFilter\": \"a/#\" } }"; @Test - void execute_validPolicy_success() throws ApiException { - final Policy policy = gson.fromJson(POLICY_JSON, Policy.class); + void execute_validDataPolicy_success() throws ApiException { + final DataPolicy policy = gson.fromJson(POLICY_JSON, DataPolicy.class); final CreatePolicyTask task = new CreatePolicyTask(outputFormatter, policiesApi, gson, POLICY_JSON); - when(policiesApi.createPolicy(policyCaptor.capture())).thenReturn(policy); + when(policiesApi.createDataPolicy(policyCaptor.capture())).thenReturn(policy); assertTrue(task.execute()); - verify(policiesApi, times(1)).createPolicy(policy); + verify(policiesApi, times(1)).createDataPolicy(policy); verify(outputFormatter, times(0)).printJson(any()); assertEquals(policy, policyCaptor.getValue()); } @@ -65,18 +65,18 @@ void execute_invalidDefinition_printError() throws ApiException { assertFalse(task.execute()); verify(outputFormatter, times(1)).printError(any()); - verify(policiesApi, times(0)).createPolicy(any()); + verify(policiesApi, times(0)).createDataPolicy(any()); } @Test void execute_apiException_printError() throws ApiException { final CreatePolicyTask task = new CreatePolicyTask(outputFormatter, policiesApi, gson, POLICY_JSON); - when(policiesApi.createPolicy(any())).thenThrow(ApiException.class); + when(policiesApi.createDataPolicy(any())).thenThrow(ApiException.class); assertFalse(task.execute()); verify(outputFormatter, times(1)).printApiException(any(), any()); - verify(policiesApi, times(1)).createPolicy(any()); + verify(policiesApi, times(1)).createDataPolicy(any()); } } diff --git a/src/test/java/com/hivemq/cli/hivemq/policies/DeletePolicyTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/policies/DeletePolicyTaskTest.java index 8d93f9690..0e29d93be 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/DeletePolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/DeletePolicyTaskTest.java @@ -18,7 +18,7 @@ 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; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ public class DeletePolicyTaskTest { - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private static final @NotNull String POLICY_ID = "policy-1"; @@ -46,7 +46,7 @@ void execute_validId_success() { @Test void execute_apiException_printError() throws ApiException { final DeletePolicyTask task = new DeletePolicyTask(outputFormatter, policiesApi, POLICY_ID); - doThrow(ApiException.class).when(policiesApi).deletePolicy(any()); + doThrow(ApiException.class).when(policiesApi).deleteDataPolicy(any()); assertFalse(task.execute()); verify(outputFormatter, times(1)).printApiException(any(), any()); } diff --git a/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.java index acd8310c3..72b1c1b1b 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.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.Policy; +import com.hivemq.cli.openapi.hivemq.DataHubDataPoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataPolicy; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -35,21 +35,21 @@ public class GetPolicyTaskTest { - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private static final @NotNull String POLICY_ID = "policy-1"; @Test void execute_validId_success() throws ApiException { - final Policy policy = new Policy(); + final DataPolicy policy = new DataPolicy(); final GetPolicyTask task = new GetPolicyTask(outputFormatter, policiesApi, POLICY_ID, null); - when(policiesApi.getPolicy(eq(POLICY_ID), isNull())).thenReturn(policy); + when(policiesApi.getDataPolicy(eq(POLICY_ID), isNull())).thenReturn(policy); assertTrue(task.execute()); - verify(policiesApi, times(1)).getPolicy(eq(POLICY_ID), isNull()); + verify(policiesApi, times(1)).getDataPolicy(eq(POLICY_ID), isNull()); verify(outputFormatter, times(1)).printJson(policy); } @@ -57,7 +57,7 @@ void execute_validId_success() throws ApiException { void execute_apiException_printError() throws ApiException { final GetPolicyTask task = new GetPolicyTask(outputFormatter, policiesApi, POLICY_ID, null); - when(policiesApi.getPolicy(any(), isNull())).thenThrow(ApiException.class); + when(policiesApi.getDataPolicy(any(), isNull())).thenThrow(ApiException.class); assertFalse(task.execute()); verify(outputFormatter, times(1)).printApiException(any(), any()); diff --git a/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.java index 969fae654..0d3f119be 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.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.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -42,7 +42,7 @@ public class ListPoliciesTaskTest { - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @Test @@ -51,11 +51,11 @@ void execute_policyIdsProvided_usedAsUrlParameter() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, policyIds, null, null, null); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new PolicyList()); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new DataPolicyList()); assertTrue(task.execute()); final String policyIdsQueryParam = "policy-1,policy-2,policy-3"; - verify(policiesApi, times(1)).getAllPolicies(isNull(), + verify(policiesApi, times(1)).getAllDataPolicies(isNull(), eq(policyIdsQueryParam), isNull(), isNull(), @@ -69,11 +69,11 @@ void execute_schemaIdsProvided_usedAsUrlParameter() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, null, schemaIds, null, null); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new PolicyList()); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new DataPolicyList()); assertTrue(task.execute()); final String schemaIdsQueryParam = "schema-1,schema-2,schema-3"; - verify(policiesApi, times(1)).getAllPolicies(isNull(), + verify(policiesApi, times(1)).getAllDataPolicies(isNull(), isNull(), eq(schemaIdsQueryParam), isNull(), @@ -86,10 +86,10 @@ void execute_topicProvided_usedAsUrlParameter() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, "topic-1", null, null, null, null); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new PolicyList()); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new DataPolicyList()); assertTrue(task.execute()); - verify(policiesApi, times(1)).getAllPolicies(isNull(), isNull(), isNull(), eq("topic-1"), any(), any()); + verify(policiesApi, times(1)).getAllDataPolicies(isNull(), isNull(), isNull(), eq("topic-1"), any(), any()); } @Test @@ -98,40 +98,40 @@ void execute_fieldsProvided_usedAsUrlParameter() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, null, null, fields, null); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new PolicyList()); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenReturn(new DataPolicyList()); assertTrue(task.execute()); final String fieldsQueryParam = "id,version,createdAt"; - verify(policiesApi, times(1)).getAllPolicies(eq(fieldsQueryParam), isNull(), isNull(), isNull(), any(), any()); + verify(policiesApi, times(1)).getAllDataPolicies(eq(fieldsQueryParam), isNull(), isNull(), isNull(), any(), any()); } @Test void execute_cursorReturned_allPagesFetched() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, null, null, null, null); - final Policy policy1 = new Policy().id("policy-1"); - final Policy policy2 = new Policy().id("policy-2"); - final Policy policy3 = new Policy().id("policy-3"); - final Policy policy4 = new Policy().id("policy-4"); + final DataPolicy policy1 = new DataPolicy().id("policy-1"); + final DataPolicy policy2 = new DataPolicy().id("policy-2"); + final DataPolicy policy3 = new DataPolicy().id("policy-3"); + final DataPolicy policy4 = new DataPolicy().id("policy-4"); final String cursorPrefix = "/api/v1/data-validation/policies?cursor="; - final PolicyList page1 = new PolicyList().items(Collections.singletonList(policy1)) + final DataPolicyList page1 = new DataPolicyList().items(Collections.singletonList(policy1)) .links(new PaginationCursor().next(cursorPrefix + "cursor-1")); - final PolicyList page2 = new PolicyList().items(Arrays.asList(policy2, policy3)) + final DataPolicyList page2 = new DataPolicyList().items(Arrays.asList(policy2, policy3)) .links(new PaginationCursor().next(cursorPrefix + "cursor-2")); - final PolicyList page3 = new PolicyList().items(Collections.singletonList(policy4)); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), isNull())).thenReturn(page1); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), eq("cursor-1"))).thenReturn(page2); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), eq("cursor-2"))).thenReturn(page3); + final DataPolicyList page3 = new DataPolicyList().items(Collections.singletonList(policy4)); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), isNull())).thenReturn(page1); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), eq("cursor-1"))).thenReturn(page2); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), eq("cursor-2"))).thenReturn(page3); assertTrue(task.execute()); - verify(policiesApi).getAllPolicies(isNull(), isNull(), isNull(), isNull(), any(), isNull()); - verify(policiesApi).getAllPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-1")); - verify(policiesApi).getAllPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-2")); - verify(policiesApi, times(3)).getAllPolicies(any(), any(), any(), any(), any(), any()); + verify(policiesApi).getAllDataPolicies(isNull(), isNull(), isNull(), isNull(), any(), isNull()); + verify(policiesApi).getAllDataPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-1")); + verify(policiesApi).getAllDataPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-2")); + verify(policiesApi, times(3)).getAllDataPolicies(any(), any(), any(), any(), any(), any()); - final ArgumentCaptor outputCaptor = ArgumentCaptor.forClass(PolicyList.class); + final ArgumentCaptor outputCaptor = ArgumentCaptor.forClass(DataPolicyList.class); verify(outputFormatter).printJson(outputCaptor.capture()); assertEquals(Arrays.asList(policy1, policy2, policy3, policy4), outputCaptor.getValue().getItems()); } @@ -140,26 +140,26 @@ void execute_cursorReturned_allPagesFetched() throws ApiException { void execute_cursorReturnedLimitSpecified_limitNotExceeded() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, null, null, null, 3); - final Policy policy1 = new Policy().id("policy-1"); - final Policy policy2 = new Policy().id("policy-2"); - final Policy policy3 = new Policy().id("policy-3"); - final Policy policy4 = new Policy().id("policy-4"); + final DataPolicy policy1 = new DataPolicy().id("policy-1"); + final DataPolicy policy2 = new DataPolicy().id("policy-2"); + final DataPolicy policy3 = new DataPolicy().id("policy-3"); + final DataPolicy policy4 = new DataPolicy().id("policy-4"); final String cursorPrefix = "/api/v1/data-validation/schemas?cursor="; - final PolicyList page1 = new PolicyList().items(Arrays.asList(policy1, policy2)) + final DataPolicyList page1 = new DataPolicyList().items(Arrays.asList(policy1, policy2)) .links(new PaginationCursor().next(cursorPrefix + "cursor-1")); - final PolicyList page2 = new PolicyList().items(Arrays.asList(policy3, policy4)) + final DataPolicyList page2 = new DataPolicyList().items(Arrays.asList(policy3, policy4)) .links(new PaginationCursor().next(cursorPrefix + "cursor-2")); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), isNull())).thenReturn(page1); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), eq("cursor-1"))).thenReturn(page2); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), isNull())).thenReturn(page1); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), eq("cursor-1"))).thenReturn(page2); assertTrue(task.execute()); - verify(policiesApi).getAllPolicies(isNull(), isNull(), isNull(), isNull(), any(), isNull()); - verify(policiesApi).getAllPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-1")); - verify(policiesApi, times(2)).getAllPolicies(any(), any(), any(), any(), any(), any()); + verify(policiesApi).getAllDataPolicies(isNull(), isNull(), isNull(), isNull(), any(), isNull()); + verify(policiesApi).getAllDataPolicies(isNull(), isNull(), isNull(), isNull(), any(), eq("cursor-1")); + verify(policiesApi, times(2)).getAllDataPolicies(any(), any(), any(), any(), any(), any()); - final ArgumentCaptor outputCaptor = ArgumentCaptor.forClass(PolicyList.class); + final ArgumentCaptor outputCaptor = ArgumentCaptor.forClass(DataPolicyList.class); verify(outputFormatter).printJson(outputCaptor.capture()); assertEquals(Arrays.asList(policy1, policy2, policy3), outputCaptor.getValue().getItems()); } @@ -168,7 +168,7 @@ void execute_cursorReturnedLimitSpecified_limitNotExceeded() throws ApiException void execute_apiException_printError() throws ApiException { final ListPoliciesTask task = new ListPoliciesTask(outputFormatter, policiesApi, null, null, null, null, null); - when(policiesApi.getAllPolicies(any(), any(), any(), any(), any(), any())).thenThrow(ApiException.class); + when(policiesApi.getAllDataPolicies(any(), any(), any(), any(), any(), any())).thenThrow(ApiException.class); assertFalse(task.execute()); verify(outputFormatter, times(1)).printApiException(any(), any()); diff --git a/src/test/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTaskTest.java index 1dc42ad3a..36bf9b18d 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/UpdatePolicyTaskTest.java @@ -19,8 +19,8 @@ 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.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.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -37,9 +37,9 @@ public class UpdatePolicyTaskTest { - private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); + private final @NotNull DataHubDataPoliciesApi policiesApi = mock(DataHubDataPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); - private final @NotNull ArgumentCaptor policyCaptor = ArgumentCaptor.forClass(Policy.class); + private final @NotNull ArgumentCaptor policyCaptor = ArgumentCaptor.forClass(DataPolicy.class); private final @NotNull Gson gson = new Gson(); private static final @NotNull String POLICY_ID = "policy-1"; @@ -47,15 +47,15 @@ public class UpdatePolicyTaskTest { "{ \"id\": \"" + POLICY_ID + "\", \"matching\": { \"topicFilter\": \"a/#\" } }"; @Test - void execute_validPolicy_success() throws ApiException { - final Policy policy = gson.fromJson(POLICY_JSON, Policy.class); + void execute_validDataPolicy_success() throws ApiException { + final DataPolicy policy = gson.fromJson(POLICY_JSON, DataPolicy.class); final UpdatePolicyTask task = new UpdatePolicyTask(outputFormatter, policiesApi, gson, POLICY_ID, POLICY_JSON); - when(policiesApi.updatePolicy(eq(POLICY_ID), policyCaptor.capture())).thenReturn(policy); + when(policiesApi.updateDataPolicy(eq(POLICY_ID), policyCaptor.capture())).thenReturn(policy); assertTrue(task.execute()); - verify(policiesApi, times(1)).updatePolicy(eq(POLICY_ID), eq(policy)); + verify(policiesApi, times(1)).updateDataPolicy(eq(POLICY_ID), eq(policy)); verify(outputFormatter, times(0)).printJson(any()); assertEquals(policy, policyCaptor.getValue()); } @@ -66,18 +66,18 @@ void execute_invalidDefinition_printError() throws ApiException { assertFalse(task.execute()); verify(outputFormatter, times(1)).printError(any()); - verify(policiesApi, times(0)).updatePolicy(eq(POLICY_ID), any()); + verify(policiesApi, times(0)).updateDataPolicy(eq(POLICY_ID), any()); } @Test void execute_apiException_printError() throws ApiException { final UpdatePolicyTask task = new UpdatePolicyTask(outputFormatter, policiesApi, gson, POLICY_ID, POLICY_JSON); - when(policiesApi.updatePolicy(eq(POLICY_ID), any())).thenThrow(ApiException.class); + when(policiesApi.updateDataPolicy(eq(POLICY_ID), any())).thenThrow(ApiException.class); assertFalse(task.execute()); verify(outputFormatter, times(1)).printApiException(any(), any()); - verify(policiesApi, times(1)).updatePolicy(eq(POLICY_ID), any()); + verify(policiesApi, times(1)).updateDataPolicy(eq(POLICY_ID), any()); } } diff --git a/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.java index 29a5656ed..1be551988 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; import org.bouncycastle.util.encoders.Base64; import org.jetbrains.annotations.NotNull; @@ -42,7 +42,7 @@ public class CreateSchemaTaskTest { - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @SuppressWarnings("FieldCanBeLocal") diff --git a/src/test/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTaskTest.java index 45be45bc0..c58f4b8dc 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/DeleteSchemaTaskTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ public class DeleteSchemaTaskTest { - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private static final @NotNull String SCHEMA_ID = "schema-1"; diff --git a/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.java index 77fb3eadb..4252e8cba 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class GetSchemaTaskTest { - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @Test diff --git a/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.java b/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.java index 67b9fcc24..c73194aaf 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.java @@ -18,7 +18,7 @@ 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.DataHubSchemasApi; import com.hivemq.cli.openapi.hivemq.PaginationCursor; import com.hivemq.cli.openapi.hivemq.Schema; import com.hivemq.cli.openapi.hivemq.SchemaList; @@ -42,7 +42,7 @@ public class ListSchemasTaskTest { - private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); + private final @NotNull DataHubSchemasApi schemasApi = mock(DataHubSchemasApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @Test diff --git a/src/test/java/com/hivemq/cli/utils/json/PolicySerializerTest.java b/src/test/java/com/hivemq/cli/utils/json/PolicySerializerTest.java index 1adbd3c0e..3a02cd1eb 100644 --- a/src/test/java/com/hivemq/cli/utils/json/PolicySerializerTest.java +++ b/src/test/java/com/hivemq/cli/utils/json/PolicySerializerTest.java @@ -18,7 +18,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.hivemq.cli.openapi.JSON; -import com.hivemq.cli.openapi.hivemq.Policy; +import com.hivemq.cli.openapi.hivemq.DataPolicy; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -30,7 +30,7 @@ public class PolicySerializerTest { private final @NotNull Gson gson = new GsonBuilder().disableHtmlEscaping() .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer()) - .registerTypeAdapter(Policy.class, new PolicySerializer()) + .registerTypeAdapter(DataPolicy.class, new PolicySerializer()) .create(); private final @NotNull JSON openapiSerialization = new JSON(); @@ -43,7 +43,7 @@ void serialize_allFields_jsonIdentical() { "\"onSuccess\":{\"pipeline\":[{\"id\":\"success\",\"functionId\":\"successFunction\",\"arguments\":{\"argB\":\"valB\",\"argA\":\"valA\"}}]}," + "\"onFailure\":{\"pipeline\":[{\"id\":\"failure\",\"functionId\":\"failureFunction\",\"arguments\":{\"argA\":\"valA\",\"argB\":\"valB\"}}]}}"; - final Policy policy = openapiSerialization.deserialize(policyJson, Policy.class); + final DataPolicy policy = openapiSerialization.deserialize(policyJson, DataPolicy.class); final String serialized = gson.toJson(policy); assertEquals(policyJson, serialized); } @@ -52,7 +52,7 @@ void serialize_allFields_jsonIdentical() { void serialize_minimalFields_jsonIdentical() { final String policyJson = "{\"id\":\"policy-id\"," + "\"createdAt\":\"2023-01-01T01:02:03.004Z\"}"; - final Policy policy = openapiSerialization.deserialize(policyJson, Policy.class); + final DataPolicy policy = openapiSerialization.deserialize(policyJson, DataPolicy.class); final String serialized = gson.toJson(policy); assertEquals(policyJson, serialized); }