diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index bb7b88dfbaa1..5f047333bd26 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -274,7 +274,7 @@ com.azure.resourcemanager:azure-resourcemanager-datadog;1.0.0-beta.3;1.0.0-beta. com.azure.resourcemanager:azure-resourcemanager-communication;1.0.0;1.1.0-beta.4 com.azure.resourcemanager:azure-resourcemanager-apimanagement;1.0.0-beta.3;1.0.0-beta.4 com.azure.resourcemanager:azure-resourcemanager-kubernetesconfiguration;1.0.0-beta.3;1.0.0-beta.4 -com.azure.resourcemanager:azure-resourcemanager-resourcegraph;1.0.0-beta.3;1.0.0-beta.4 +com.azure.resourcemanager:azure-resourcemanager-resourcegraph;1.0.0-beta.3;1.0.0 com.azure.resourcemanager:azure-resourcemanager-changeanalysis;1.0.0;1.1.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-delegatednetwork;1.0.0-beta.1;1.0.0-beta.2 com.azure.resourcemanager:azure-resourcemanager-synapse;1.0.0-beta.6;1.0.0-beta.7 diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/CHANGELOG.md b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/CHANGELOG.md index 98c9dc1a4a82..68217fa2fc9a 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/CHANGELOG.md +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/CHANGELOG.md @@ -1,14 +1,8 @@ # Release History -## 1.0.0-beta.4 (Unreleased) +## 1.0.0 (2022-11-02) -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Azure Resource Manager ResourceGraph client library for Java. This package contains Microsoft Azure SDK for ResourceGraph Management SDK. Azure Resource Graph API Reference. Package tag package-2021-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ## 1.0.0-beta.3 (2022-04-07) diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/README.md b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/README.md index c7e4150e722d..6006edf2b3cf 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/README.md +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/README.md @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-resourcegraph - 1.0.0-beta.3 + 1.0.0 ``` [//]: # ({x-version-update-end}) @@ -41,19 +41,19 @@ Various documentation is available to help you get started Azure Management Libraries require a `TokenCredential` implementation for authentication and an `HttpClient` implementation for HTTP client. -[Azure Identity][azure_identity] package and [Azure Core Netty HTTP][azure_core_http_netty] package provide the default implementation. +[Azure Identity][azure_identity] and [Azure Core Netty HTTP][azure_core_http_netty] packages provide the default implementation. ### Authentication -By default, Azure Active Directory token authentication depends on correct configure of following environment variables. +By default, Azure Active Directory token authentication depends on correct configuration of the following environment variables. - `AZURE_CLIENT_ID` for Azure client ID. - `AZURE_TENANT_ID` for Azure tenant ID. - `AZURE_CLIENT_SECRET` or `AZURE_CLIENT_CERTIFICATE_PATH` for client secret or client certificate. -In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`. +In addition, Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment variable. -With above configuration, `azure` client can be authenticated by following code: +With above configuration, `azure` client can be authenticated using the following code: ```java AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE); @@ -97,13 +97,13 @@ response = manager.resourceProviders().resources(queryRequest); ## Contributing -For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md). +For details on contributing to this repository, see the [contributing guide][cg]. -1. Fork it -1. Create your feature branch (`git checkout -b my-new-feature`) -1. Commit your changes (`git commit -am 'Add some feature'`) -1. Push to the branch (`git push origin my-new-feature`) -1. Create new Pull Request +This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit . + +When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repositories using our CLA. + +This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact with any additional questions or comments. [survey]: https://microsoft.qualtrics.com/jfe/form/SV_ehN0lIk2FKEBkwd?Q_CHL=DOCS @@ -114,3 +114,6 @@ For details on contributing to this repository, see the [contributing guide](htt [azure_core_http_netty]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core/azure-core-http-netty [authenticate]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/AUTH.md [design]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/DESIGN.md +[cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md +[coc]: https://opensource.microsoft.com/codeofconduct/ +[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/ diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml index 62da0247ae9e..9c8aeb50075a 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml @@ -9,7 +9,7 @@ com.azure.resourcemanager azure-resourcemanager-resourcegraph - 1.0.0-beta.4 + 1.0.0 jar Microsoft Azure SDK for ResourceGraph Management @@ -51,6 +51,12 @@ azure-core-management 1.8.1 + + com.azure + azure-core-test + 1.12.1 + test + com.azure azure-identity @@ -58,9 +64,15 @@ test - com.azure - azure-core-test - 1.12.1 + org.junit.jupiter + junit-jupiter-engine + 5.8.2 + test + + + org.mockito + mockito-core + 4.5.1 test diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/ResourceGraphManager.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/ResourceGraphManager.java index dbc13510472b..77221a00072b 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/ResourceGraphManager.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/ResourceGraphManager.java @@ -206,7 +206,7 @@ public ResourceGraphManager authenticate(TokenCredential credential, AzureProfil .append("-") .append("com.azure.resourcemanager.resourcegraph") .append("/") - .append("1.0.0-beta.3"); + .append("1.0.0"); if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { userAgentBuilder .append(" (") @@ -263,7 +263,11 @@ public ResourceGraphManager authenticate(TokenCredential credential, AzureProfil } } - /** @return Resource collection API of ResourceProviders. */ + /** + * Gets the resource collection API of ResourceProviders. + * + * @return Resource collection API of ResourceProviders. + */ public ResourceProviders resourceProviders() { if (this.resourceProviders == null) { this.resourceProviders = new ResourceProvidersImpl(clientObject.getResourceProviders(), this); @@ -271,7 +275,11 @@ public ResourceProviders resourceProviders() { return resourceProviders; } - /** @return Resource collection API of Operations. */ + /** + * Gets the resource collection API of Operations. + * + * @return Resource collection API of Operations. + */ public Operations operations() { if (this.operations == null) { this.operations = new OperationsImpl(clientObject.getOperations(), this); diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceProvidersClient.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceProvidersClient.java index e78b538a4bfc..0c06911802d0 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceProvidersClient.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceProvidersClient.java @@ -17,24 +17,24 @@ public interface ResourceProvidersClient { * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. + * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result. + * @return query result along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - QueryResponseInner resources(QueryRequest query); + Response resourcesWithResponse(QueryRequest query, Context context); /** * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. - * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result along with {@link Response}. + * @return query result. */ @ServiceMethod(returns = ReturnType.SINGLE) - Response resourcesWithResponse(QueryRequest query, Context context); + QueryResponseInner resources(QueryRequest query); } diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/OperationInner.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/OperationInner.java index 3807d8330214..283fbd362e7e 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/OperationInner.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/OperationInner.java @@ -29,6 +29,10 @@ public final class OperationInner { @JsonProperty(value = "origin") private String origin; + /** Creates an instance of OperationInner class. */ + public OperationInner() { + } + /** * Get the name property: Operation name: {provider}/{resource}/{operation}. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/QueryResponseInner.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/QueryResponseInner.java index 499340d6c1f3..9d693eed3168 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/QueryResponseInner.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/models/QueryResponseInner.java @@ -21,8 +21,8 @@ public final class QueryResponseInner { private long totalRecords; /* - * Number of records returned in the current response. In the case of - * paging, this is the number of records in the current page. + * Number of records returned in the current response. In the case of paging, this is the number of records in the + * current page. */ @JsonProperty(value = "count", required = true) private long count; @@ -34,9 +34,8 @@ public final class QueryResponseInner { private ResultTruncated resultTruncated; /* - * When present, the value can be passed to a subsequent query call - * (together with the same query and scopes used in the current request) to - * retrieve the next page of data. + * When present, the value can be passed to a subsequent query call (together with the same query and scopes used + * in the current request) to retrieve the next page of data. */ @JsonProperty(value = "$skipToken") private String skipToken; @@ -53,6 +52,10 @@ public final class QueryResponseInner { @JsonProperty(value = "facets") private List facets; + /** Creates an instance of QueryResponseInner class. */ + public QueryResponseInner() { + } + /** * Get the totalRecords property: Number of total records matching the query. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientBuilder.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientBuilder.java index 8712af38576c..5620f7fc0065 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientBuilder.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientBuilder.java @@ -103,26 +103,21 @@ public ResourceGraphClientBuilder serializerAdapter(SerializerAdapter serializer * @return an instance of ResourceGraphClientImpl. */ public ResourceGraphClientImpl buildClient() { - if (pipeline == null) { - this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); - } - if (endpoint == null) { - this.endpoint = "https://management.azure.com"; - } - if (environment == null) { - this.environment = AzureEnvironment.AZURE; - } - if (pipeline == null) { - this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); - } - if (defaultPollInterval == null) { - this.defaultPollInterval = Duration.ofSeconds(30); - } - if (serializerAdapter == null) { - this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter(); - } + String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com"; + AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE; + HttpPipeline localPipeline = + (pipeline != null) + ? pipeline + : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); + Duration localDefaultPollInterval = + (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30); + SerializerAdapter localSerializerAdapter = + (serializerAdapter != null) + ? serializerAdapter + : SerializerFactory.createDefaultManagementSerializerAdapter(); ResourceGraphClientImpl client = - new ResourceGraphClientImpl(pipeline, serializerAdapter, defaultPollInterval, environment, endpoint); + new ResourceGraphClientImpl( + localPipeline, localSerializerAdapter, localDefaultPollInterval, localEnvironment, localEndpoint); return client; } } diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientImpl.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientImpl.java index 334dc3c6d7a4..1a59844481ff 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientImpl.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceGraphClientImpl.java @@ -15,6 +15,7 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.management.polling.PollerFactory; import com.azure.core.util.Context; +import com.azure.core.util.CoreUtils; import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.AsyncPollResponse; import com.azure.core.util.polling.LongRunningOperationStatus; @@ -30,7 +31,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.Map; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -161,10 +161,7 @@ public Context getContext() { * @return the merged context. */ public Context mergeContext(Context context) { - for (Map.Entry entry : this.getContext().getValues().entrySet()) { - context = context.addData(entry.getKey(), entry.getValue()); - } - return context; + return CoreUtils.mergeContexts(this.getContext(), context); } /** diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersClientImpl.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersClientImpl.java index 173159447bea..dbeb1f57f27d 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersClientImpl.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersClientImpl.java @@ -133,43 +133,35 @@ private Mono> resourcesWithResponseAsync(QueryReque */ @ServiceMethod(returns = ReturnType.SINGLE) private Mono resourcesAsync(QueryRequest query) { - return resourcesWithResponseAsync(query) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + return resourcesWithResponseAsync(query).flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. + * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result. + * @return query result along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public QueryResponseInner resources(QueryRequest query) { - return resourcesAsync(query).block(); + public Response resourcesWithResponse(QueryRequest query, Context context) { + return resourcesWithResponseAsync(query, context).block(); } /** * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. - * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result along with {@link Response}. + * @return query result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response resourcesWithResponse(QueryRequest query, Context context) { - return resourcesWithResponseAsync(query, context).block(); + public QueryResponseInner resources(QueryRequest query) { + return resourcesWithResponse(query, Context.NONE).getValue(); } } diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersImpl.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersImpl.java index e0a6ae542ea0..ae32593ba755 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersImpl.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/implementation/ResourceProvidersImpl.java @@ -28,15 +28,6 @@ public ResourceProvidersImpl( this.serviceManager = serviceManager; } - public QueryResponse resources(QueryRequest query) { - QueryResponseInner inner = this.serviceClient().resources(query); - if (inner != null) { - return new QueryResponseImpl(inner, this.manager()); - } else { - return null; - } - } - public Response resourcesWithResponse(QueryRequest query, Context context) { Response inner = this.serviceClient().resourcesWithResponse(query, context); if (inner != null) { @@ -50,6 +41,15 @@ public Response resourcesWithResponse(QueryRequest query, Context } } + public QueryResponse resources(QueryRequest query) { + QueryResponseInner inner = this.serviceClient().resources(query); + if (inner != null) { + return new QueryResponseImpl(inner, this.manager()); + } else { + return null; + } + } + private ResourceProvidersClient serviceClient() { return this.innerClient; } diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ErrorDetails.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ErrorDetails.java index 4737e577634e..501869d84d30 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ErrorDetails.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ErrorDetails.java @@ -33,6 +33,10 @@ public final class ErrorDetails { */ @JsonIgnore private Map additionalProperties; + /** Creates an instance of ErrorDetails class. */ + public ErrorDetails() { + } + /** * Get the code property: Error code identifying the specific error. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/Facet.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/Facet.java index 86e4778394e2..d3c773d058c1 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/Facet.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/Facet.java @@ -30,6 +30,10 @@ public class Facet { @JsonProperty(value = "expression", required = true) private String expression; + /** Creates an instance of Facet class. */ + public Facet() { + } + /** * Get the expression property: Facet expression, same as in the corresponding facet request. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetError.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetError.java index d74851ac29af..e13948879087 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetError.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetError.java @@ -22,6 +22,10 @@ public final class FacetError extends Facet { @JsonProperty(value = "errors", required = true) private List errors; + /** Creates an instance of FacetError class. */ + public FacetError() { + } + /** * Get the errors property: An array containing detected facet errors with details. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequest.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequest.java index 0e24a6a14f1d..b1a29ec231c6 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequest.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequest.java @@ -23,6 +23,10 @@ public final class FacetRequest { @JsonProperty(value = "options") private FacetRequestOptions options; + /** Creates an instance of FacetRequest class. */ + public FacetRequest() { + } + /** * Get the expression property: The column or list of columns to summarize by. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequestOptions.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequestOptions.java index d8c9e77c0790..a5da137822ec 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequestOptions.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetRequestOptions.java @@ -11,8 +11,7 @@ @Fluent public final class FacetRequestOptions { /* - * The column name or query expression to sort on. Defaults to count if not - * present. + * The column name or query expression to sort on. Defaults to count if not present. */ @JsonProperty(value = "sortBy") private String sortBy; @@ -24,8 +23,8 @@ public final class FacetRequestOptions { private FacetSortOrder sortOrder; /* - * Specifies the filter condition for the 'where' clause which will be run - * on main query's result, just before the actual faceting. + * Specifies the filter condition for the 'where' clause which will be run on main query's result, just before the + * actual faceting. */ @JsonProperty(value = "filter") private String filter; @@ -36,6 +35,10 @@ public final class FacetRequestOptions { @JsonProperty(value = "$top") private Integer top; + /** Creates an instance of FacetRequestOptions class. */ + public FacetRequestOptions() { + } + /** * Get the sortBy property: The column name or query expression to sort on. Defaults to count if not present. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetResult.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetResult.java index 257e12a4207f..5e5bdc9d860e 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetResult.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetResult.java @@ -28,12 +28,15 @@ public final class FacetResult extends Facet { private int count; /* - * A JObject array or Table containing the desired facets. Only present if - * the facet is valid. + * A JObject array or Table containing the desired facets. Only present if the facet is valid. */ @JsonProperty(value = "data", required = true) private Object data; + /** Creates an instance of FacetResult class. */ + public FacetResult() { + } + /** * Get the totalRecords property: Number of total records in the facet results. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetSortOrder.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetSortOrder.java index 03d27b3b22b8..c50fbe86827a 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetSortOrder.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/FacetSortOrder.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -/** Defines values for FacetSortOrder. */ +/** The sorting order by the selected column (count by default). */ public enum FacetSortOrder { /** Enum value asc. */ ASC("asc"), @@ -30,6 +30,9 @@ public enum FacetSortOrder { */ @JsonCreator public static FacetSortOrder fromString(String value) { + if (value == null) { + return null; + } FacetSortOrder[] items = FacetSortOrder.values(); for (FacetSortOrder item : items) { if (item.toString().equalsIgnoreCase(value)) { @@ -39,6 +42,7 @@ public static FacetSortOrder fromString(String value) { return null; } + /** {@inheritDoc} */ @JsonValue @Override public String toString() { diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationDisplay.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationDisplay.java index 6ae26220ffce..27a233a48443 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationDisplay.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationDisplay.java @@ -34,6 +34,10 @@ public final class OperationDisplay { @JsonProperty(value = "description") private String description; + /** Creates an instance of OperationDisplay class. */ + public OperationDisplay() { + } + /** * Get the provider property: Service provider: Microsoft Resource Graph. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationListResult.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationListResult.java index 918f1093b5cd..e352f47df2b3 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationListResult.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/OperationListResult.java @@ -16,12 +16,15 @@ @Fluent public final class OperationListResult { /* - * List of Resource Graph operations supported by the Resource Graph - * resource provider. + * List of Resource Graph operations supported by the Resource Graph resource provider. */ @JsonProperty(value = "value") private List value; + /** Creates an instance of OperationListResult class. */ + public OperationListResult() { + } + /** * Get the value property: List of Resource Graph operations supported by the Resource Graph resource provider. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequest.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequest.java index 8fd1ab1c7347..19506a00ca5d 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequest.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequest.java @@ -19,8 +19,7 @@ public final class QueryRequest { private List subscriptions; /* - * Azure management groups against which to execute the query. Example: [ - * 'mg1', 'mg2' ] + * Azure management groups against which to execute the query. Example: [ 'mg1', 'mg2' ] */ @JsonProperty(value = "managementGroups") private List managementGroups; @@ -43,6 +42,10 @@ public final class QueryRequest { @JsonProperty(value = "facets") private List facets; + /** Creates an instance of QueryRequest class. */ + public QueryRequest() { + } + /** * Get the subscriptions property: Azure subscriptions against which to execute the query. * diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequestOptions.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequestOptions.java index fd367a645844..4d3a2c177577 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequestOptions.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/QueryRequestOptions.java @@ -11,22 +11,21 @@ @Fluent public final class QueryRequestOptions { /* - * Continuation token for pagination, capturing the next page size and - * offset, as well as the context of the query. + * Continuation token for pagination, capturing the next page size and offset, as well as the context of the query. */ @JsonProperty(value = "$skipToken") private String skipToken; /* - * The maximum number of rows that the query should return. Overrides the - * page size when ```$skipToken``` property is present. + * The maximum number of rows that the query should return. Overrides the page size when ```$skipToken``` property + * is present. */ @JsonProperty(value = "$top") private Integer top; /* - * The number of rows to skip from the beginning of the results. Overrides - * the next page offset when ```$skipToken``` property is present. + * The number of rows to skip from the beginning of the results. Overrides the next page offset when + * ```$skipToken``` property is present. */ @JsonProperty(value = "$skip") private Integer skip; @@ -38,13 +37,16 @@ public final class QueryRequestOptions { private ResultFormat resultFormat; /* - * Only applicable for tenant and management group level queries to decide - * whether to allow partial scopes for result in case the number of - * subscriptions exceed allowed limits. + * Only applicable for tenant and management group level queries to decide whether to allow partial scopes for + * result in case the number of subscriptions exceed allowed limits. */ @JsonProperty(value = "allowPartialScopes") private Boolean allowPartialScopes; + /** Creates an instance of QueryRequestOptions class. */ + public QueryRequestOptions() { + } + /** * Get the skipToken property: Continuation token for pagination, capturing the next page size and offset, as well * as the context of the query. diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResourceProviders.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResourceProviders.java index fe99a66d5c8d..e01b3ef4a0fb 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResourceProviders.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResourceProviders.java @@ -13,22 +13,22 @@ public interface ResourceProviders { * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. + * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result. + * @return query result along with {@link Response}. */ - QueryResponse resources(QueryRequest query); + Response resourcesWithResponse(QueryRequest query, Context context); /** * Queries the resources managed by Azure Resource Manager for scopes specified in the request. * * @param query Request specifying query and its options. - * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return query result along with {@link Response}. + * @return query result. */ - Response resourcesWithResponse(QueryRequest query, Context context); + QueryResponse resources(QueryRequest query); } diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultFormat.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultFormat.java index 1c4046e89b81..bcf741091869 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultFormat.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultFormat.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -/** Defines values for ResultFormat. */ +/** Defines in which format query result returned. */ public enum ResultFormat { /** Enum value table. */ TABLE("table"), @@ -30,6 +30,9 @@ public enum ResultFormat { */ @JsonCreator public static ResultFormat fromString(String value) { + if (value == null) { + return null; + } ResultFormat[] items = ResultFormat.values(); for (ResultFormat item : items) { if (item.toString().equalsIgnoreCase(value)) { @@ -39,6 +42,7 @@ public static ResultFormat fromString(String value) { return null; } + /** {@inheritDoc} */ @JsonValue @Override public String toString() { diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultTruncated.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultTruncated.java index ff78599437fc..cb12b8de9de1 100644 --- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultTruncated.java +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/models/ResultTruncated.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -/** Defines values for ResultTruncated. */ +/** Indicates whether the query results are truncated. */ public enum ResultTruncated { /** Enum value true. */ TRUE("true"), @@ -30,6 +30,9 @@ public enum ResultTruncated { */ @JsonCreator public static ResultTruncated fromString(String value) { + if (value == null) { + return null; + } ResultTruncated[] items = ResultTruncated.values(); for (ResultTruncated item : items) { if (item.toString().equalsIgnoreCase(value)) { @@ -39,6 +42,7 @@ public static ResultTruncated fromString(String value) { return null; } + /** {@inheritDoc} */ @JsonValue @Override public String toString() { diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestOptionsTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestOptionsTests.java new file mode 100644 index 000000000000..4721c5f99b54 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestOptionsTests.java @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.models.FacetRequestOptions; +import com.azure.resourcemanager.resourcegraph.models.FacetSortOrder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class FacetRequestOptionsTests { + @Test + public void testDeserialize() { + FacetRequestOptions model = + BinaryData + .fromString("{\"sortBy\":\"ufo\",\"sortOrder\":\"asc\",\"filter\":\"wifsq\",\"$top\":1701108276}") + .toObject(FacetRequestOptions.class); + Assertions.assertEquals("ufo", model.sortBy()); + Assertions.assertEquals(FacetSortOrder.ASC, model.sortOrder()); + Assertions.assertEquals("wifsq", model.filter()); + Assertions.assertEquals(1701108276, model.top()); + } + + @Test + public void testSerialize() { + FacetRequestOptions model = + new FacetRequestOptions() + .withSortBy("ufo") + .withSortOrder(FacetSortOrder.ASC) + .withFilter("wifsq") + .withTop(1701108276); + model = BinaryData.fromObject(model).toObject(FacetRequestOptions.class); + Assertions.assertEquals("ufo", model.sortBy()); + Assertions.assertEquals(FacetSortOrder.ASC, model.sortOrder()); + Assertions.assertEquals("wifsq", model.filter()); + Assertions.assertEquals(1701108276, model.top()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestTests.java new file mode 100644 index 000000000000..175cafeb1d12 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetRequestTests.java @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.models.FacetRequest; +import com.azure.resourcemanager.resourcegraph.models.FacetRequestOptions; +import com.azure.resourcemanager.resourcegraph.models.FacetSortOrder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class FacetRequestTests { + @Test + public void testDeserialize() { + FacetRequest model = + BinaryData + .fromString( + "{\"expression\":\"soqijg\",\"options\":{\"sortBy\":\"bpazlobcufpdzn\",\"sortOrder\":\"asc\",\"filter\":\"qqjnqgl\",\"$top\":2127527772}}") + .toObject(FacetRequest.class); + Assertions.assertEquals("soqijg", model.expression()); + Assertions.assertEquals("bpazlobcufpdzn", model.options().sortBy()); + Assertions.assertEquals(FacetSortOrder.ASC, model.options().sortOrder()); + Assertions.assertEquals("qqjnqgl", model.options().filter()); + Assertions.assertEquals(2127527772, model.options().top()); + } + + @Test + public void testSerialize() { + FacetRequest model = + new FacetRequest() + .withExpression("soqijg") + .withOptions( + new FacetRequestOptions() + .withSortBy("bpazlobcufpdzn") + .withSortOrder(FacetSortOrder.ASC) + .withFilter("qqjnqgl") + .withTop(2127527772)); + model = BinaryData.fromObject(model).toObject(FacetRequest.class); + Assertions.assertEquals("soqijg", model.expression()); + Assertions.assertEquals("bpazlobcufpdzn", model.options().sortBy()); + Assertions.assertEquals(FacetSortOrder.ASC, model.options().sortOrder()); + Assertions.assertEquals("qqjnqgl", model.options().filter()); + Assertions.assertEquals(2127527772, model.options().top()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetResultTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetResultTests.java new file mode 100644 index 000000000000..80643f0ccaf5 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetResultTests.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.models.FacetResult; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class FacetResultTests { + @Test + public void testDeserialize() { + FacetResult model = + BinaryData + .fromString( + "{\"resultType\":\"FacetResult\",\"totalRecords\":8819753813869121711,\"count\":1725970823,\"expression\":\"qnjaqwix\"}") + .toObject(FacetResult.class); + Assertions.assertEquals("qnjaqwix", model.expression()); + Assertions.assertEquals(8819753813869121711L, model.totalRecords()); + Assertions.assertEquals(1725970823, model.count()); + } + + @Test + public void testSerialize() { + FacetResult model = + new FacetResult().withExpression("qnjaqwix").withTotalRecords(8819753813869121711L).withCount(1725970823); + model = BinaryData.fromObject(model).toObject(FacetResult.class); + Assertions.assertEquals("qnjaqwix", model.expression()); + Assertions.assertEquals(8819753813869121711L, model.totalRecords()); + Assertions.assertEquals(1725970823, model.count()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetTests.java new file mode 100644 index 000000000000..b4eb70e5bf54 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/FacetTests.java @@ -0,0 +1,25 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.models.Facet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class FacetTests { + @Test + public void testDeserialize() { + Facet model = BinaryData.fromString("{\"resultType\":\"Facet\",\"expression\":\"j\"}").toObject(Facet.class); + Assertions.assertEquals("j", model.expression()); + } + + @Test + public void testSerialize() { + Facet model = new Facet().withExpression("j"); + model = BinaryData.fromObject(model).toObject(Facet.class); + Assertions.assertEquals("j", model.expression()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationDisplayTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationDisplayTests.java new file mode 100644 index 000000000000..1e9fae20a9dc --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationDisplayTests.java @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.models.OperationDisplay; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class OperationDisplayTests { + @Test + public void testDeserialize() { + OperationDisplay model = + BinaryData + .fromString( + "{\"provider\":\"nchgej\",\"resource\":\"odmailzyd\",\"operation\":\"o\",\"description\":\"yahux\"}") + .toObject(OperationDisplay.class); + Assertions.assertEquals("nchgej", model.provider()); + Assertions.assertEquals("odmailzyd", model.resource()); + Assertions.assertEquals("o", model.operation()); + Assertions.assertEquals("yahux", model.description()); + } + + @Test + public void testSerialize() { + OperationDisplay model = + new OperationDisplay() + .withProvider("nchgej") + .withResource("odmailzyd") + .withOperation("o") + .withDescription("yahux"); + model = BinaryData.fromObject(model).toObject(OperationDisplay.class); + Assertions.assertEquals("nchgej", model.provider()); + Assertions.assertEquals("odmailzyd", model.resource()); + Assertions.assertEquals("o", model.operation()); + Assertions.assertEquals("yahux", model.description()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationInnerTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationInnerTests.java new file mode 100644 index 000000000000..17fe01cbd71e --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationInnerTests.java @@ -0,0 +1,49 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.fluent.models.OperationInner; +import com.azure.resourcemanager.resourcegraph.models.OperationDisplay; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class OperationInnerTests { + @Test + public void testDeserialize() { + OperationInner model = + BinaryData + .fromString( + "{\"name\":\"iwbybrkxvdumjg\",\"display\":{\"provider\":\"wvukx\",\"resource\":\"udccsnhsjc\",\"operation\":\"ejhkry\",\"description\":\"napczwlokjy\"},\"origin\":\"kkvnipjox\"}") + .toObject(OperationInner.class); + Assertions.assertEquals("iwbybrkxvdumjg", model.name()); + Assertions.assertEquals("wvukx", model.display().provider()); + Assertions.assertEquals("udccsnhsjc", model.display().resource()); + Assertions.assertEquals("ejhkry", model.display().operation()); + Assertions.assertEquals("napczwlokjy", model.display().description()); + Assertions.assertEquals("kkvnipjox", model.origin()); + } + + @Test + public void testSerialize() { + OperationInner model = + new OperationInner() + .withName("iwbybrkxvdumjg") + .withDisplay( + new OperationDisplay() + .withProvider("wvukx") + .withResource("udccsnhsjc") + .withOperation("ejhkry") + .withDescription("napczwlokjy")) + .withOrigin("kkvnipjox"); + model = BinaryData.fromObject(model).toObject(OperationInner.class); + Assertions.assertEquals("iwbybrkxvdumjg", model.name()); + Assertions.assertEquals("wvukx", model.display().provider()); + Assertions.assertEquals("udccsnhsjc", model.display().resource()); + Assertions.assertEquals("ejhkry", model.display().operation()); + Assertions.assertEquals("napczwlokjy", model.display().description()); + Assertions.assertEquals("kkvnipjox", model.origin()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationListResultTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationListResultTests.java new file mode 100644 index 000000000000..bb0b7d2c5318 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationListResultTests.java @@ -0,0 +1,82 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.util.BinaryData; +import com.azure.resourcemanager.resourcegraph.fluent.models.OperationInner; +import com.azure.resourcemanager.resourcegraph.models.OperationDisplay; +import com.azure.resourcemanager.resourcegraph.models.OperationListResult; +import java.util.Arrays; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public final class OperationListResultTests { + @Test + public void testDeserialize() { + OperationListResult model = + BinaryData + .fromString( + "{\"value\":[{\"name\":\"siznto\",\"display\":{\"provider\":\"a\",\"resource\":\"ajpsquc\",\"operation\":\"o\",\"description\":\"dkfo\"},\"origin\":\"nygj\"},{\"name\":\"jddeqsrdeupewnw\",\"display\":{\"provider\":\"tjzyflus\",\"resource\":\"hmofc\",\"operation\":\"smy\",\"description\":\"kdtmlxhekuk\"},\"origin\":\"txukcdmp\"},{\"name\":\"cryuan\",\"display\":{\"provider\":\"xzdxtayrlhmwh\",\"resource\":\"mrqobmtukknr\",\"operation\":\"tihfx\",\"description\":\"jbpzvgnwzsymg\"},\"origin\":\"uf\"},{\"name\":\"zk\",\"display\":{\"provider\":\"bihanuf\",\"resource\":\"cbjy\",\"operation\":\"git\",\"description\":\"qhabifpikxwcz\"},\"origin\":\"scnpqxuhivy\"}]}") + .toObject(OperationListResult.class); + Assertions.assertEquals("siznto", model.value().get(0).name()); + Assertions.assertEquals("a", model.value().get(0).display().provider()); + Assertions.assertEquals("ajpsquc", model.value().get(0).display().resource()); + Assertions.assertEquals("o", model.value().get(0).display().operation()); + Assertions.assertEquals("dkfo", model.value().get(0).display().description()); + Assertions.assertEquals("nygj", model.value().get(0).origin()); + } + + @Test + public void testSerialize() { + OperationListResult model = + new OperationListResult() + .withValue( + Arrays + .asList( + new OperationInner() + .withName("siznto") + .withDisplay( + new OperationDisplay() + .withProvider("a") + .withResource("ajpsquc") + .withOperation("o") + .withDescription("dkfo")) + .withOrigin("nygj"), + new OperationInner() + .withName("jddeqsrdeupewnw") + .withDisplay( + new OperationDisplay() + .withProvider("tjzyflus") + .withResource("hmofc") + .withOperation("smy") + .withDescription("kdtmlxhekuk")) + .withOrigin("txukcdmp"), + new OperationInner() + .withName("cryuan") + .withDisplay( + new OperationDisplay() + .withProvider("xzdxtayrlhmwh") + .withResource("mrqobmtukknr") + .withOperation("tihfx") + .withDescription("jbpzvgnwzsymg")) + .withOrigin("uf"), + new OperationInner() + .withName("zk") + .withDisplay( + new OperationDisplay() + .withProvider("bihanuf") + .withResource("cbjy") + .withOperation("git") + .withDescription("qhabifpikxwcz")) + .withOrigin("scnpqxuhivy"))); + model = BinaryData.fromObject(model).toObject(OperationListResult.class); + Assertions.assertEquals("siznto", model.value().get(0).name()); + Assertions.assertEquals("a", model.value().get(0).display().provider()); + Assertions.assertEquals("ajpsquc", model.value().get(0).display().resource()); + Assertions.assertEquals("o", model.value().get(0).display().operation()); + Assertions.assertEquals("dkfo", model.value().get(0).display().description()); + Assertions.assertEquals("nygj", model.value().get(0).origin()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationsListMockTests.java b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationsListMockTests.java new file mode 100644 index 000000000000..f2d03196642d --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/java/com/azure/resourcemanager/resourcegraph/generated/OperationsListMockTests.java @@ -0,0 +1,73 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.resourcegraph.generated; + +import com.azure.core.credential.AccessToken; +import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; +import com.azure.core.http.HttpRequest; +import com.azure.core.http.HttpResponse; +import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.AzureEnvironment; +import com.azure.core.management.profile.AzureProfile; +import com.azure.core.util.Context; +import com.azure.resourcemanager.resourcegraph.ResourceGraphManager; +import com.azure.resourcemanager.resourcegraph.models.Operation; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.time.OffsetDateTime; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public final class OperationsListMockTests { + @Test + public void testList() throws Exception { + HttpClient httpClient = Mockito.mock(HttpClient.class); + HttpResponse httpResponse = Mockito.mock(HttpResponse.class); + ArgumentCaptor httpRequest = ArgumentCaptor.forClass(HttpRequest.class); + + String responseStr = + "{\"value\":[{\"name\":\"t\",\"display\":{\"provider\":\"dvpjhulsuuvmk\",\"resource\":\"zkrwfn\",\"operation\":\"odjpslwejd\",\"description\":\"wryoqpsoacc\"},\"origin\":\"zakljlahbc\"}]}"; + + Mockito.when(httpResponse.getStatusCode()).thenReturn(200); + Mockito.when(httpResponse.getHeaders()).thenReturn(new HttpHeaders()); + Mockito + .when(httpResponse.getBody()) + .thenReturn(Flux.just(ByteBuffer.wrap(responseStr.getBytes(StandardCharsets.UTF_8)))); + Mockito + .when(httpResponse.getBodyAsByteArray()) + .thenReturn(Mono.just(responseStr.getBytes(StandardCharsets.UTF_8))); + Mockito + .when(httpClient.send(httpRequest.capture(), Mockito.any())) + .thenReturn( + Mono + .defer( + () -> { + Mockito.when(httpResponse.getRequest()).thenReturn(httpRequest.getValue()); + return Mono.just(httpResponse); + })); + + ResourceGraphManager manager = + ResourceGraphManager + .configure() + .withHttpClient(httpClient) + .authenticate( + tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)), + new AzureProfile("", "", AzureEnvironment.AZURE)); + + PagedIterable response = manager.operations().list(Context.NONE); + + Assertions.assertEquals("t", response.iterator().next().name()); + Assertions.assertEquals("dvpjhulsuuvmk", response.iterator().next().display().provider()); + Assertions.assertEquals("zkrwfn", response.iterator().next().display().resource()); + Assertions.assertEquals("odjpslwejd", response.iterator().next().display().operation()); + Assertions.assertEquals("wryoqpsoacc", response.iterator().next().display().description()); + Assertions.assertEquals("zakljlahbc", response.iterator().next().origin()); + } +} diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000000..1f0955d450f0 --- /dev/null +++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline