Skip to content

Commit bf61668

Browse files
authored
[Key Vault] Added TSP configuration for Key Vault Certificates (Azure#43417)
* Added tsp-location.yaml * Added CertificatesCustomizations file * Got the latest TSP files for certs. * First generation. * Removed TSP-related files from other libraries * Re-generated after changing test, samples, and APIView configuration. * More adjustments to code generation before customization is applied. Re-generated code. * Updated code generation and Java customizations file again. * Added model customizations. * Moved custom types to the public models package and deleted unnecessary clients and client builder in implementation. * Fixed clients and client builder. * Got latest TSP configuration and fixed models. * Updated TSP config commit. * Removed temporary TypeSpec files. * Fixed test issues. * Ran stainless. * Fixed CheckStyle issues. * Fixed SpotBugs issues. * Updated test recordings. * Re-generated the library. * Updated CertificatesCustomizations.java and re-generated. * Fixed CertificateClientBuilder. * Updated CertificateClientBuilder. * Updated CertificateClientBuilder yet again. * Re-generated with the latest commit hash an updated code customization. * Added methods lost by moving from Azure.Core.nextLink to TypeSpec.nextLink via code customization. * Fixed code-generation. * Fixed CheckStyle issue.
1 parent 6c82ecc commit bf61668

File tree

70 files changed

+7281
-5944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+7281
-5944
lines changed

sdk/keyvault/azure-security-keyvault-certificates/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/keyvault/azure-security-keyvault-certificates",
5-
"Tag": "java/keyvault/azure-security-keyvault-certificates_e018897fab"
5+
"Tag": "java/keyvault/azure-security-keyvault-certificates_f79afcd807"
66
}

sdk/keyvault/azure-security-keyvault-certificates/checkstyle-suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<!-- This file is generated by the /eng/scripts/linting_suppression_generator.py script. -->
44

55
<suppressions>
6+
<suppress files="com.azure.security.keyvault.certificates.implementation.CertificateClientImpl.java" checks="JavaDocFormatting" />
67
<suppress files="com.azure.security.keyvault.certificates.implementation.KeyVaultCredentialPolicy.java" checks="JavadocMethodCheck" />
78
<suppress files="com.azure.security.keyvault.certificates.implementation.CertificateClientImpl.java" checks="MissingJavadocMethodCheck" />
89
<suppress files="com.azure.security.keyvault.certificates.implementation.CertificateIssuerHelper.java" checks="MissingJavadocMethodCheck" />

sdk/keyvault/azure-security-keyvault-certificates/spotbugs-exclude.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<Class name="com.azure.security.keyvault.certificates.implementation.models.CertificateUpdateParameters" />
2121
<Class name="com.azure.security.keyvault.certificates.implementation.models.Contacts" />
2222
<Class name="com.azure.security.keyvault.certificates.implementation.models.DeletedCertificateListResult" />
23+
<Class name="com.azure.security.keyvault.certificates.implementation.models.DeletedCertificateBundle" />
24+
<Class name="com.azure.security.keyvault.certificates.implementation.models.DeletedCertificateItem" />
2325
<Class name="com.azure.security.keyvault.certificates.implementation.models.OrganizationDetails" />
2426
<Class name="com.azure.security.keyvault.certificates.implementation.models.X509CertificateProperties" />
2527
<Class name="com.azure.security.keyvault.certificates.models.CertificatePolicy" />
@@ -59,6 +61,7 @@
5961
<Class name="com.azure.security.keyvault.certificates.implementation.models.CertificateItem" />
6062
<Class name="com.azure.security.keyvault.certificates.implementation.models.CertificateRestoreParameters" />
6163
<Class name="com.azure.security.keyvault.certificates.implementation.models.DeletedCertificateBundle" />
64+
<Class name="com.azure.security.keyvault.certificates.implementation.models.DeletedCertificateItem" />
6265
<Class name="com.azure.security.keyvault.certificates.models.CertificateProperties" />
6366
</Or>
6467
</Match>

sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateAsyncClient.java

Lines changed: 379 additions & 275 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClient.java

Lines changed: 220 additions & 123 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClientBuilder.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public CertificateClientBuilder() {
161161
* and {@link #retryPolicy(RetryPolicy)} have been set.
162162
*/
163163
public CertificateClient buildClient() {
164-
return new CertificateClient(buildInnerClient(), vaultUrl);
164+
return new CertificateClient(buildImplClient(), vaultUrl);
165165
}
166166

167167
/**
@@ -183,10 +183,10 @@ public CertificateClient buildClient() {
183183
* and {@link #retryPolicy(RetryPolicy)} have been set.
184184
*/
185185
public CertificateAsyncClient buildAsyncClient() {
186-
return new CertificateAsyncClient(buildInnerClient(), vaultUrl);
186+
return new CertificateAsyncClient(buildImplClient(), vaultUrl);
187187
}
188188

189-
private CertificateClientImpl buildInnerClient() {
189+
private CertificateClientImpl buildImplClient() {
190190
Configuration buildConfiguration
191191
= (configuration != null) ? configuration : Configuration.getGlobalConfiguration().clone();
192192

@@ -197,10 +197,12 @@ private CertificateClientImpl buildInnerClient() {
197197
.logExceptionAsError(new IllegalStateException(KeyVaultErrorCodeStrings.VAULT_END_POINT_REQUIRED));
198198
}
199199

200-
CertificateServiceVersion serviceVersion = version != null ? version : CertificateServiceVersion.getLatest();
200+
if (version == null) {
201+
version = CertificateServiceVersion.getLatest();
202+
}
201203

202204
if (pipeline != null) {
203-
return new CertificateClientImpl(pipeline, serviceVersion.getVersion());
205+
return new CertificateClientImpl(pipeline, vaultUrl, version);
204206
}
205207

206208
if (credential == null) {
@@ -240,13 +242,13 @@ private CertificateClientImpl buildInnerClient() {
240242
Tracer tracer = TracerProvider.getDefaultProvider()
241243
.createTracer(CLIENT_NAME, CLIENT_VERSION, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
242244

243-
HttpPipeline pipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
245+
HttpPipeline builtPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
244246
.httpClient(httpClient)
245247
.tracer(tracer)
246248
.clientOptions(localClientOptions)
247249
.build();
248250

249-
return new CertificateClientImpl(pipeline, serviceVersion.getVersion());
251+
return new CertificateClientImpl(builtPipeline, vaultUrl, version);
250252
}
251253

252254
/**

0 commit comments

Comments
 (0)