Skip to content

Commit 22f6a3f

Browse files
vcolin7vcolin7
committed
Updated code to use the latest codegen and fixed build issues
1 parent 0bdb3dc commit 22f6a3f

File tree

82 files changed

+1426
-678
lines changed

Some content is hidden

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

82 files changed

+1426
-678
lines changed

‎sdk/keyvault-v2/azure-security-keyvault-administration/README.md

+7-10
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,8 @@ Back up an entire collection of keys using `beginBackup()`.
319319
String blobStorageUrl = "https://myaccount.blob.core.windows.net/myContainer";
320320
String sasToken = "<sas-token>";
321321

322-
// TODO (vcolin7): Uncomment once LROs are available in clientcore.
323-
Poller<KeyVaultBackupOperation, String> backupPoller = null;
324-
//keyVaultBackupClient.beginBackup(blobStorageUrl, sasToken);
322+
Poller<KeyVaultBackupOperation, String> backupPoller =
323+
keyVaultBackupClient.beginBackup(blobStorageUrl, sasToken);
325324
PollResponse<KeyVaultBackupOperation> pollResponse = backupPoller.poll();
326325

327326
System.out.printf("The current status of the operation is: %s.%n", pollResponse.getStatus());
@@ -347,9 +346,8 @@ Restore an entire collection of keys from a backup using `beginRestore()`.
347346
String folderUrl = "https://myaccount.blob.core.windows.net/myContainer/mhsm-myaccount-2020090117323313";
348347
String sasToken = "<sas-token>";
349348

350-
// TODO (vcolin7): Uncomment once LROs are available in clientcore.
351-
Poller<KeyVaultRestoreOperation, KeyVaultRestoreResult> restorePoller = null;
352-
//keyVaultBackupClient.beginRestore(folderUrl, sasToken);
349+
Poller<KeyVaultRestoreOperation, KeyVaultRestoreResult> restorePoller =
350+
keyVaultBackupClient.beginRestore(folderUrl, sasToken);
353351
PollResponse<KeyVaultRestoreOperation> pollResponse = restorePoller.poll();
354352

355353
System.out.printf("The current status of the operation is: %s.%n", pollResponse.getStatus());
@@ -374,9 +372,8 @@ String folderUrl = "https://myaccount.blob.core.windows.net/myContainer/mhsm-mya
374372
String sasToken = "<sas-token>";
375373
String keyName = "myKey";
376374

377-
// TODO (vcolin7): Uncomment once LROs are available in clientcore.
378-
Poller<KeyVaultSelectiveKeyRestoreOperation, KeyVaultSelectiveKeyRestoreResult> restorePoller = null;
379-
//keyVaultBackupClient.beginSelectiveKeyRestore(folderUrl, sasToken, keyName);
375+
Poller<KeyVaultSelectiveKeyRestoreOperation, KeyVaultSelectiveKeyRestoreResult> restorePoller =
376+
keyVaultBackupClient.beginSelectiveKeyRestore(folderUrl, sasToken, keyName);
380377
PollResponse<KeyVaultSelectiveKeyRestoreOperation> pollResponse = restorePoller.poll();
381378

382379
System.out.printf("The current status of the operation is: %s.%n", pollResponse.getStatus());
@@ -450,7 +447,7 @@ catching the exception and displaying additional information about the error.
450447

451448
```java readme-sample-troubleshooting
452449
try {
453-
keyVaultAccessControlClient.getRoleAssignment(KeyVaultRoleScope.GLOBAL, "<role-assignment-name>");
450+
keyVaultAccessControlClient.getRoleAssignment(KeyVaultRoleScope.GLOBAL, "<role-assginment-name>");
454451
} catch (HttpResponseException e) {
455452
System.out.println(e.getMessage());
456453
}

‎sdk/keyvault-v2/azure-security-keyvault-administration/checkstyle-suppressions.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
<!-- This file is generated by the /eng/scripts/linting_suppression_generator.py script. -->
44

55
<suppressions>
6-
<suppress checks="JavaDocFormatting" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientImpl" />
6+
<suppress checks="JavaDocFormatting" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientImpl.java" />
7+
<suppress checks="JavadocThrowsChecks" files="com.azure.v2.security.keyvault.administration.KeyVaultBackupClient.java" />
78
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientImpl.java" />
8-
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultCredentialPolicy.java" />
9+
10+
<!-- TODO (vcolin7): Find if there is a way to throw in specific places without excluding the whole class. -->
11+
<suppress checks="ThrowFromClientLogger" files="com.azure.v2.security.keyvault.administration.KeyVaultBackupClient.java" />
912

1013
<!-- TODO (vcolin7): Remove after updating the CheckStyle tool to handle classes generated by annotation-processor -->
1114
<suppress checks="FinalClass" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientServiceImpl.java" />
@@ -15,19 +18,15 @@
1518
<suppress checks="GoodLogging" files="com.azure.v2.security.keyvault.administration.implementation.RoleAssignmentsServiceImpl.java" />
1619
<suppress checks="GoodLogging" files="com.azure.v2.security.keyvault.administration.implementation.RoleDefinitionsServiceImpl.java" />
1720
<suppress checks="JavadocPackage" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientServiceImpl.java" />
18-
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientServiceImpl" />
21+
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientServiceImpl.java" />
1922
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.RoleAssignmentsImpl.java" />
2023
<suppress checks="MissingJavadocMethod" files="com.azure.v2.security.keyvault.administration.implementation.RoleDefinitionsImpl.java" />
2124
<suppress checks="ThrowFromClientLogger" files="com.azure.v2.security.keyvault.administration.implementation.KeyVaultAdministrationClientServiceImpl.java" />
2225
<suppress checks="ThrowFromClientLogger" files="com.azure.v2.security.keyvault.administration.implementation.RoleAssignmentsServiceImpl.java" />
2326
<suppress checks="ThrowFromClientLogger" files="com.azure.v2.security.keyvault.administration.implementation.RoleDefinitionsServiceImpl.java" />
2427

25-
<!-- TODO (vcolin7): Remove after updating the CheckStyle tool to handle RequestContext -->
28+
<!-- TODO (vcolin7): Remove after updating the CheckStyle tool to handle RequestContext and Poller instead of RequestOptions and SyncPoller, respectively -->
2629
<suppress checks="ServiceClient" files="com.azure.v2.security.keyvault.administration.KeyVaultAccessControlClient.java" />
30+
<suppress checks="ServiceClient" files="com.azure.v2.security.keyvault.administration.KeyVaultBackupClient.java" />
2731
<suppress checks="ServiceClient" files="com.azure.v2.security.keyvault.administration.KeyVaultSettingsClient.java" />
28-
29-
<!-- TODO (vcolin7): Remove after fixing the TODOs for LROs. -->
30-
<suppress checks="RegexpSingleline" files="com.azure.v2.security.keyvault.administration.KeyVaultBackupClient.java" />
31-
32-
<suppress checks="DenyListedWords" files="com.azure.v2.security.keyvault.administration.implementation.models.SASTokenParameter.java" />
3332
</suppressions>

‎sdk/keyvault-v2/azure-security-keyvault-administration/customizations/pom.xml

+14-21
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,21 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>com.azure</groupId>
9-
<artifactId>azure-code-customization-parent</artifactId>
10-
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-code-customization-parent;current} -->
11-
<relativePath>../../../parents/azure-code-customization-parent</relativePath>
12-
</parent>
7+
<name>Microsoft Azure Security Key Vault Administration code generation customization</name>
8+
<description>This package contains code generation customization for Microsoft Azure Security Key Vault Administration library</description>
139

14-
<name>Microsoft Azure Security Key Vault Administration code generation customization</name>
15-
<description>This package contains code generation customization for Microsoft Azure Security Key Vault Administration</description>
10+
<groupId>com.azure.tools</groupId>
11+
<artifactId>azure-security-keyvault-administration-customization</artifactId>
12+
<version>1.0.0-beta.1</version>
13+
<packaging>jar</packaging>
1614

17-
<groupId>com.azure.v2.tools</groupId>
18-
<artifactId>azure-security-administration-codegen-customization</artifactId>
19-
<version>1.0.0-beta.1</version>
20-
<packaging>jar</packaging>
21-
22-
<dependencies>
23-
<dependency>
24-
<groupId>com.microsoft.typespec</groupId>
25-
<artifactId>http-client-generator-core</artifactId>
26-
<version>1.0.0-beta.1</version>
27-
</dependency>
28-
</dependencies>
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.microsoft.typespec</groupId>
18+
<artifactId>http-client-generator-core</artifactId>
19+
<version>1.0.0-beta.1</version>
20+
</dependency>
21+
</dependencies>
2922
</project>

‎sdk/keyvault-v2/azure-security-keyvault-administration/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
5656
<dependency>
5757
<groupId>io.clientcore</groupId>
5858
<artifactId>core</artifactId>
59-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
59+
<version>1.0.0-beta.9</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
6060
</dependency>
6161
<dependency>
6262
<groupId>com.azure.v2</groupId>
@@ -73,12 +73,12 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
7373
</dependency>
7474
</dependencies>
7575

76-
<build>
76+
<!--<build>
7777
<plugins>
7878
<plugin>
7979
<groupId>org.apache.maven.plugins</groupId>
8080
<artifactId>maven-compiler-plugin</artifactId>
81-
<version>3.13.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
81+
<version>3.13.0</version> &lt;!&ndash; {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} &ndash;&gt;
8282
<executions>
8383
<execution>
8484
<id>run-annotation-processing</id>
@@ -96,7 +96,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
9696
<annotationProcessorPath>
9797
<groupId>io.clientcore</groupId>
9898
<artifactId>annotation-processor</artifactId>
99-
<version>1.0.0-beta.2</version> <!-- {x-version-update;io.clientcore:annotation-processor;dependency} -->
99+
<version>1.0.0-beta.2</version> &lt;!&ndash; {x-version-update;io.clientcore:annotation-processor;dependency} &ndash;&gt;
100100
</annotationProcessorPath>
101101
</annotationProcessorPaths>
102102
<annotationProcessors>
@@ -116,10 +116,10 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
116116
<dependency>
117117
<groupId>io.clientcore</groupId>
118118
<artifactId>annotation-processor</artifactId>
119-
<version>1.0.0-beta.2</version> <!-- {x-version-update;io.clientcore:annotation-processor;dependency} -->
119+
<version>1.0.0-beta.2</version> &lt;!&ndash; {x-version-update;io.clientcore:annotation-processor;dependency} &ndash;&gt;
120120
</dependency>
121121
</dependencies>
122122
</plugin>
123123
</plugins>
124-
</build>
124+
</build>-->
125125
</project>

‎sdk/keyvault-v2/azure-security-keyvault-administration/src/main/java/com/azure/v2/security/keyvault/administration/KeyVaultAccessControlClient.java

-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import io.clientcore.core.http.paging.PagedIterable;
2121
import io.clientcore.core.instrumentation.logging.ClientLogger;
2222

23-
import java.io.IOException;
24-
import java.io.UncheckedIOException;
2523
import java.util.Objects;
2624
import java.util.UUID;
2725

@@ -611,8 +609,6 @@ public Response<Void> deleteRoleDefinitionWithResponse(KeyVaultRoleScope roleSco
611609
}
612610

613611
throw LOGGER.logThrowableAsError(e);
614-
} catch (IOException e) {
615-
throw LOGGER.logThrowableAsError(new UncheckedIOException(e));
616612
}
617613
}
618614

@@ -1014,8 +1010,6 @@ public Response<Void> deleteRoleAssignmentWithResponse(KeyVaultRoleScope roleSco
10141010
}
10151011

10161012
throw LOGGER.logThrowableAsError(e);
1017-
} catch (IOException e) {
1018-
throw LOGGER.logThrowableAsError(new UncheckedIOException(e));
10191013
}
10201014
}
10211015
}

‎sdk/keyvault-v2/azure-security-keyvault-administration/src/main/java/com/azure/v2/security/keyvault/administration/KeyVaultAccessControlClientBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ public KeyVaultAccessControlClient buildClient() {
164164

165165
HttpPipeline builtPipeline = httpPipelineBuilder.httpClient(httpClient).build();
166166

167-
return new KeyVaultAccessControlClient(
168-
new KeyVaultAdministrationClientImpl(builtPipeline, endpoint, version.getVersion()));
167+
return new KeyVaultAccessControlClient(new KeyVaultAdministrationClientImpl(builtPipeline, endpoint, version));
169168
}
170169

171170
/**

0 commit comments

Comments
 (0)