diff --git a/specs/hivemq-openapi.yaml b/specs/hivemq-openapi.yaml index 71c3bbf3f..67adae078 100644 --- a/specs/hivemq-openapi.yaml +++ b/specs/hivemq-openapi.yaml @@ -78,10 +78,42 @@ info: ## OpenAPI HiveMQ's REST API provides an OpenAPI 3.0 schema definition that can imported into popular API tooling (e.g. Postman) or can be used to generate client-code for multiple programming languages. title: HiveMQ REST API - version: 4.17.0-SNAPSHOT + version: 4.18.0-SNAPSHOT x-logo: url: https://www.hivemq.com/img/svg/hivemq-bee.svg tags: +- description: |- + These endpoints can be used to manage the Data Governance Hub. + + Currently, this includes the option to start a 5-hour long trial mode that temporarily removes all limitations.For more information on all capabilities the HiveMQ Data Governance Hub offers, see the [HiveMQ documentation](https://docs.hivemq.com/hivemq/latest/data-governance-hub/index.html). + name: Data Governance Hub - Management +- description: |- + Policies describe how you want the HiveMQ broker to apply schemas to incoming MQTT message payload data and act on the validation results. + Each policy has four sections: + + - Matching: Specifies which packets the policy engine validates. + - Validation: Specifies how the packets are validated. For example, based on a JSON Schema. + - OnSuccess: Defines which actions are executed when the outcome of a validation is successful. + - OnFailure: Defines which actions are executed when the validation fails. + + These endpoints can be used to create, update, delete, and list policies. + + For more information on all capabilities the HiveMQ Data Governance Hub offers, see the [HiveMQ documentation](https://docs.hivemq.com/hivemq/4.16/data-governance-hub/index.html). + name: Data Governance Hub - Policies +- description: |- + A schema defines the expected structure and format of incoming MQTT message payload data. + + This endpoint can be used to create, get, and delete schemas. + + Schemas can be enforced with the use of a policy. + + Currently, the following schema definitions are supported: + + - [JSON Schema](https://json-schema.org/) + - [Protocol Buffers (Protobuf)](https://protobuf.dev/) + + For more information on how to define and use a schema in HiveMQ, see [Schemas](https://docs.hivemq.com/hivemq/latest/data-governance-hub/schemas.html). + name: Data Governance Hub - Schemas - description: |- These endpoints can be used to create, download, inspect and restore backups created by HiveMQ. @@ -150,7 +182,7 @@ paths: schema: type: string example: null - - description: Comma-separated list of policy ids used for filtering. Multiple + - description: Comma-separated list of policy IDs used for filtering. Multiple filters can be applied together. example: "policy1,policy2" in: query @@ -158,7 +190,7 @@ paths: schema: type: string example: null - - description: Comma-separated list of schema ids used for filtering. Multiple + - description: Comma-separated list of schema IDs used for filtering. Multiple filters can be applied together. example: "schema1,schema2" in: query @@ -166,18 +198,18 @@ paths: schema: type: string example: null - - description: MQTT topic string that is matched by the retrieved policies. - Returned policies are sorted in the same way as they are applied to matching - publishes. 'topic' filtering does not support pagination + - description: MQTT topic string that the retrieved policies must match. Returned + policies are sorted in the same way as they are applied to matching publishes. + 'topic' filtering does not support pagination example: topic/my-topic in: query name: topic schema: type: string example: null - - description: Specifies the page size for the returned results. Has to be between - 10 and 500. Default page size is 50. Limit is ignored if the 'topic' query - parameter is set. + - description: Specifies the page size for the returned results. The value must + be between 10 and 500. The default page size is 50. The limit is ignored + if the 'topic' query parameter is set. example: 100 in: query name: limit @@ -415,7 +447,7 @@ paths: description: Not all cluster nodes at minimum version summary: Get all policies tags: - - Policies + - Data Governance Hub - Policies post: description: |- Create a policy @@ -455,7 +487,7 @@ paths: \ with result '${validationResult}'" schema: $ref: '#/components/schemas/Policy' - description: The policy that should be created. + description: The policy to create. required: true responses: "201": @@ -503,7 +535,7 @@ paths: examples: policy-id-already-in-use: description: Bad request - summary: The given policy id is already in use + summary: The given policy identifier is already in use value: errors: - title: Policy id already used @@ -528,13 +560,13 @@ paths: description: Temporarily not available summary: Create a new policy tags: - - Policies + - Data Governance Hub - Policies /api/v1/data-validation/policies/{policyId}: delete: description: "Deletes an existing policy. \n\n " operationId: deletePolicy parameters: - - description: The id of the policy to delete. + - description: The identifier of the policy to delete. example: policy1 in: path name: policyId @@ -590,14 +622,14 @@ paths: description: Not all cluster nodes at minimum version summary: Delete a policy tags: - - Policies + - Data Governance Hub - Policies get: description: "Get a specific policy. \n\n This endpoint returns the content\ \ of the policy with the content-type `application/json`. \n\n This endpoint\ \ requires at least HiveMQ version 4.15.0 on all cluster nodes." operationId: getPolicy parameters: - - description: The id of the policy. + - description: The identifier of the policy. example: policy1 in: path name: policyId @@ -683,7 +715,188 @@ paths: description: Resource not found summary: Get a policy tags: - - Policies + - Data Governance Hub - Policies + put: + description: |- + Update a policy + + The path parameter 'policyId' must match the 'id' of the policy in the request body. + The matching part of policies cannot be changed with an update. + This endpoint requires at least HiveMQ version 4.17.0 on all cluster nodes. + operationId: updatePolicy + parameters: + - description: The identifier of the policy. + example: policy1 + in: path + name: policyId + required: true + schema: + type: string + example: null + requestBody: + content: + application/json: + example: + id: policy1 + matching: + topicFilter: topic/+ + validation: + validators: + - type: schema + arguments: + strategy: ALL_OF + schemas: + - schemaId: schema + version: "1" + onSuccess: + pipeline: + - id: logOperationSuccess + functionId: System.log + arguments: + level: DEBUG + message: "${clientId} sent a publish on topic '${topic}' with\ + \ result '${validationResult}'" + onFailure: + pipeline: + - id: logOperationFailure + functionId: System.log + arguments: + level: WARN + message: "${clientId} sent an invalid publish on topic '${topic}'\ + \ with result '${validationResult}'" + schema: + $ref: '#/components/schemas/Policy' + description: The policy that should be updated. + required: true + responses: + "200": + content: + application/json: + examples: + response-example: + description: Example response. + summary: Policy was updated successfully + value: + id: policy1 + createdAt: 2023-04-19T13:35:00.930Z + matching: + topicFilter: topic/+ + validation: + validators: + - type: schema + arguments: + strategy: ALL_OF + schemas: + - schemaId: schema1 + version: "1" + onSuccess: + pipeline: + - id: logOperationSuccess + functionId: System.log + arguments: + level: DEBUG + message: "${clientId} sent a publish on topic '${topic}'\ + \ with result '${validationResult}'" + onFailure: + pipeline: + - id: logOperationFailure + functionId: System.log + arguments: + level: WARN + message: "${clientId} sent an invalid publish on topic '${topic}'\ + \ with result '${validationResult}'" + schema: + $ref: '#/components/schemas/Policy' + description: Success + "400": + content: + application/json: + examples: + param-missing: + description: Bad request + summary: Required URL parameter missing + value: + errors: + - title: Required parameter missing + detail: Required URL parameter 'parameterName' is missing + policy-not-parsable: + description: Bad request + summary: The submitted policy can not be parsed + value: + errors: + - title: Policy not parsable + detail: The submitted policy 'policy' can not be parsed. + policy-not-valid: + description: Bad request + summary: The submitted policy is not valid + value: + errors: + - title: Policy is not valid + detail: Required body entity parameter is missing + policy-topic-filter-not-matching: + description: Bad request + summary: The policy topic filter does not match + value: + errors: + - title: Topic filter does not match + detail: The policy with id 'policyId' has a topic filter 'my/topic/filter' + that does not match the topic filter of the current policy. + referenced-schema-does-not-exist: + description: Bad request + summary: A schema that is referenced in the policy does not exist + value: + errors: + - title: Referenced schema does not exist + detail: The referenced schema with id 'schema-id' does not exist. + schema: + $ref: '#/components/schemas/Errors' + description: Bad request + "404": + content: + application/json: + examples: + not-found: + description: Policy not found + summary: Not found + value: + errors: + - title: Referenced policy not found + detail: The referenced policy with id 'policyId' was not found. + schema: + $ref: '#/components/schemas/Errors' + description: Policy not found + "412": + content: + application/json: + examples: + etag-not-matching: + description: Precondition failed + summary: Etag not matching + value: + errors: + - title: Precondition Failed + detail: Policy does not match the given etag '123456789'. + schema: + $ref: '#/components/schemas/Errors' + description: Precondition failed + "503": + content: + application/json: + examples: + version-check-failed: + description: Version check failed + summary: Version check failed + value: + errors: + - title: Endpoint not active yet + detail: "Not all cluster nodes support this endpoint yet, please\ + \ try again later" + schema: + $ref: '#/components/schemas/Errors' + description: Not all cluster nodes at minimum version + summary: Update an existing policy + tags: + - Data Governance Hub - Policies /api/v1/data-validation/schemas: get: description: "Get all schemas. \n\n This endpoint returns the content of the\ @@ -842,7 +1055,7 @@ paths: description: Not all cluster nodes at minimum version summary: Get all schemas tags: - - Schemas + - Data Governance Hub - Schemas post: description: |- Creates a schema @@ -909,13 +1122,15 @@ paths: description: Temporarily not available summary: Create a new schema tags: - - Schemas + - Data Governance Hub - Schemas /api/v1/data-validation/schemas/{schemaId}: delete: - description: "Deletes all versions of the schema. \n\n " + description: "Deletes the selected schema and all associated versions of the\ + \ schema. \n\n This endpoint requires HiveMQ version4.15.0 or above on all\ + \ cluster nodes." operationId: deleteSchema parameters: - - description: The schema id of the schema versions to delete. + - description: The schema identifier of the schema versions to delete. example: schema1 in: path name: schemaId @@ -971,7 +1186,7 @@ paths: description: Not all cluster nodes at minimum version summary: Delete all versions of the schema tags: - - Schemas + - Data Governance Hub - Schemas get: description: "Get a specific schema. \n\n This endpoint returns the content\ \ of the latest version of the schema with the content-type `application/json`.\ @@ -979,7 +1194,7 @@ paths: \ nodes." operationId: getSchema parameters: - - description: The id of the schema. + - description: The identifier of the schema. example: schema1 in: path name: schemaId @@ -1042,7 +1257,7 @@ paths: description: Resource not found summary: Get a schema tags: - - Schemas + - Data Governance Hub - Schemas /api/v1/management/backups: get: description: |- @@ -1300,6 +1515,57 @@ paths: summary: Restore a new backup tags: - Backup & Restore + /api/v1/management/data-governance-hub/start-trial: + post: + description: |- + Use this endpoint to start the Data Governance Hub trial mode. + + This endpoint requires at least HiveMQ version 4.17.0 on the REST API node. + operationId: startTrialMode + responses: + "204": + description: "Success, no response body" + "400": + content: + application/json: + examples: + trial-already-expired: + description: Bad request + summary: Data Governance Hub trial mode is already expired + value: + errors: + - title: Trial mode already expired + detail: The trial mode period for data governance hub has already + expired. Restart HiveMQ to get another 5 hours trial mode. + trial-already-running: + description: Bad request + summary: Data Governance Hub trial mode is already running + value: + errors: + - title: Trial mode already running + detail: "The trial mode for data governance hub cannot be started,\ + \ as it is already running." + schema: + $ref: '#/components/schemas/Errors' + description: Bad request + "503": + content: + application/json: + examples: + temporarily-not-available: + description: The endpoint is temporarily not available + summary: Temporarily not available + value: + errors: + - title: The endpoint is temporarily not available + detail: "The endpoint is temporarily not available, please try\ + \ again later" + schema: + $ref: '#/components/schemas/Errors' + description: Temporarily not available + summary: Start trial mode + tags: + - Data Governance Hub - Management /api/v1/management/diagnostic-archives: post: description: Triggers the creation of a new diagnostic archive. @@ -2636,8 +2902,9 @@ components: - matching PolicyAction: type: object - description: The action which will be triggered dependent of the validation - outcome. + description: "One or more operations the outcome of the validation triggers.\ + \ When this field is empty, the outcome of the policy validation does not\ + \ trigger any operations." example: null properties: pipeline: @@ -2662,7 +2929,7 @@ components: $ref: '#/components/schemas/Policy' PolicyMatching: type: object - description: The policy's matching rules. + description: The matching rules the policy applies. example: null properties: topicFilter: @@ -2695,7 +2962,9 @@ components: - id PolicyValidation: type: object - description: The validation part of the policy. + description: "The section of the policy that defines how incoming MQTT messages\ + \ are validated. If this section is empty, the result of the policy validation\ + \ is always successful." example: null properties: validators: 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 be38701e4..6aba9e97c 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.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(); 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 bf93091cf..9fd2b853b 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.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()) { 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 577ea685c..a99320d9d 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.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()) { 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 3530ab85e..dd3c67d71 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.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) { 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 f073d25a3..948c9db4b 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.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) { 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 1c323a0b7..8c9d5f05b 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.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()) { 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 fa2293f38..a61abedad 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.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()) { 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 92ac53e48..d973bba9c 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.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) { 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 5d8b06ac1..68041f03f 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.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; 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 f7d861b10..291b57da8 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.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; 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 33fe9605e..393f37e9b 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.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; 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 8771c9802..10164ed6f 100644 --- a/src/main/java/com/hivemq/cli/hivemq/policies/ListPoliciesTask.java +++ b/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, 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 19c9bb233..ba8226318 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTask.java +++ b/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, 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 cdc370364..c992e1214 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.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; 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 383c71e85..1d4183197 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/GetSchemaTask.java +++ b/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; 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 282f7f42a..f2e82d2d4 100644 --- a/src/main/java/com/hivemq/cli/hivemq/schemas/ListSchemasTask.java +++ b/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,7 +36,7 @@ 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; @@ -44,7 +44,7 @@ public class ListSchemasTask { 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, diff --git a/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java b/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java index 959ff15dc..23c09f1a9 100644 --- a/src/main/java/com/hivemq/cli/rest/HiveMQRestService.java +++ b/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) { 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 aba655a33..c928d6105 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.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)); 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 2ac83633b..fa7784a4f 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.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; @@ -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 PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new DeletePolicyCommand(hiveMQRestService, outputFormatter)); 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 2b742c633..cf87e5f7b 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.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; @@ -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 PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new GetPolicyCommand(hiveMQRestService, outputFormatter)); 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 3da37f284..505c80828 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,7 +18,7 @@ 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.PolicyList; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; @@ -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 PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull CommandLine commandLine = new CommandLine(new ListPoliciesCommand(hiveMQRestService, outputFormatter)); 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 5a5c770ce..c1667081d 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,8 +21,8 @@ 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.Schema; -import com.hivemq.cli.openapi.hivemq.SchemasApi; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import com.hivemq.cli.utils.json.OffsetDateTimeSerializer; @@ -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 SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 ab09f2d42..0039442db 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.SchemasApi; +import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi; 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 SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 8c787e669..ecda44c62 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.SchemasApi; +import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi; 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 SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 6172b5676..7d146eb16 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,8 +18,8 @@ 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.SchemaList; -import com.hivemq.cli.openapi.hivemq.SchemasApi; import com.hivemq.cli.rest.HiveMQRestService; import com.hivemq.cli.utils.TestLoggerUtils; import org.jetbrains.annotations.NotNull; @@ -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 SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 0c012fe9d..996a6478b 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/CreatePolicyTaskTest.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.openapi.hivemq.Policy; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ public class CreatePolicyTaskTest { - private final @NotNull PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private final @NotNull ArgumentCaptor policyCaptor = ArgumentCaptor.forClass(Policy.class); private final @NotNull Gson gson = new Gson(); 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 df3096010..8d93f9690 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.PoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ public class DeletePolicyTaskTest { - private final @NotNull PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private static final @NotNull String POLICY_ID = "policy-1"; 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 7bc5bbd54..acd8310c3 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/GetPolicyTaskTest.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.PoliciesApi; +import com.hivemq.cli.openapi.hivemq.DataGovernanceHubPoliciesApi; import com.hivemq.cli.openapi.hivemq.Policy; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ public class GetPolicyTaskTest { - private final @NotNull PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); private static final @NotNull String POLICY_ID = "policy-1"; 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 cd8b66a13..969fae654 100644 --- a/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/policies/ListPoliciesTaskTest.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; @@ -42,7 +42,7 @@ public class ListPoliciesTaskTest { - private final @NotNull PoliciesApi policiesApi = mock(PoliciesApi.class); + private final @NotNull DataGovernanceHubPoliciesApi policiesApi = mock(DataGovernanceHubPoliciesApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @Test 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 a4cba1c05..29a5656ed 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/CreateSchemaTaskTest.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.DataGovernanceHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; -import com.hivemq.cli.openapi.hivemq.SchemasApi; import org.bouncycastle.util.encoders.Base64; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; @@ -42,7 +42,7 @@ public class CreateSchemaTaskTest { - private final @NotNull SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 0ef394b8d..45be45bc0 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.SchemasApi; +import com.hivemq.cli.openapi.hivemq.DataGovernanceHubSchemasApi; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ public class DeleteSchemaTaskTest { - private final @NotNull SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 ee1fb6117..77fb3eadb 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/GetSchemaTaskTest.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.DataGovernanceHubSchemasApi; import com.hivemq.cli.openapi.hivemq.Schema; -import com.hivemq.cli.openapi.hivemq.SchemasApi; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class GetSchemaTaskTest { - private final @NotNull SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.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 f9f39b9f7..67b9fcc24 100644 --- a/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.java +++ b/src/test/java/com/hivemq/cli/hivemq/schemas/ListSchemasTaskTest.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.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -42,7 +42,7 @@ public class ListSchemasTaskTest { - private final @NotNull SchemasApi schemasApi = mock(SchemasApi.class); + private final @NotNull DataGovernanceHubSchemasApi schemasApi = mock(DataGovernanceHubSchemasApi.class); private final @NotNull OutputFormatter outputFormatter = mock(OutputFormatter.class); @Test