[Key Vault] Updated TypeSpec code customization and removed AutoRest files. (#45558)

* Updated tsp-location.yaml files

* Updated Autorest version

* Updated Secrets customizations for TSP.

* Removed AutoRest-specific files and renamed customizations folders

* Small typo fix for Secrets

* Updated codegen for Keys and re-generated

* Updated codegen for Certificates and re-generated

* Updated codegen for Administration and re-generated

* Fixed codegen for Keys and re-generated

* Updated other codegen POMs

* Fixed an issue with codegen and files being out of sync

* Update sdk/keyvault/azure-security-keyvault-administration/customizations/src/main/java/AdministrationCustomizations.java

Co-authored-by: Alan Zimmer <[email protected]>

* Updated tsp-location.yaml commits

* Fixed customizations

* Updated codegen commit hash

* Fixed codegen for Keys again

---------

Co-authored-by: Alan Zimmer <[email protected]>

Author: vcolin7

sdk/keyvault/azure-security-keyvault-administration/swagger/pom.xml renamed to sdk/keyvault/azure-security-keyvault-administration/customizations/pom.xml

@@ -2,20 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-code-customization-parent</artifactId>
     <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-code-customization-parent;current} -->
     <relativePath>../../../parents/azure-code-customization-parent</relativePath>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
+
   <name>Microsoft Azure Security Key Vault Administration code generation customization</name>
-  <description>This package contains code generation customization for Microsoft Azure Security Key Vault Administration</description>
+  <description>This package contains code generation customization for Microsoft Azure Security Key Vault Administration library</description>
 
   <groupId>com.azure.tools</groupId>
-  <artifactId>azure-security-administration-autorest-customization</artifactId>
+  <artifactId>azure-security-keyvault-administration-codegen-customization</artifactId>
   <version>1.0.0-beta.1</version>
   <packaging>jar</packaging>
 </project>

sdk/keyvault/azure-security-keyvault-administration/swagger/src/main/java/AdministrationCustomizations.java renamed to sdk/keyvault/azure-security-keyvault-administration/customizations/src/main/java/AdministrationCustomizations.java

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
 
 package com.azure.security.keyvault.administration;
 
 import com.azure.core.util.ServiceVersion;
 
 /**
- * The versions of Azure Key Vault Administration service supported by this client library.
+ * The versions of Azure Key Vault supported by this client library.
  */
 public enum KeyVaultAdministrationServiceVersion implements ServiceVersion {
     /**
@@ -40,6 +41,9 @@ public enum KeyVaultAdministrationServiceVersion implements ServiceVersion {
         this.version = version;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String getVersion() {
         return this.version;

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultAdministrationServiceVersion.java

@@ -188,7 +188,7 @@ public KeyVaultAdministrationClientImpl(HttpPipeline httpPipeline, SerializerAda
      * perform REST calls.
      */
     @Host("{vaultBaseUrl}")
-    @ServiceInterface(name = "KeyVaultAdministrationClient")
+    @ServiceInterface(name = "KeyVaultAdministrati")
     public interface KeyVaultAdministrationClientService {
         @Get("/backup/{jobId}/pending")
         @ExpectedResponses({ 200 })

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/implementation/KeyVaultAdministrationClientImpl.java

@@ -77,7 +77,7 @@ public KeyVaultAdministrationServiceVersion getServiceVersion() {
      * service to perform REST calls.
      */
     @Host("{vaultBaseUrl}")
-    @ServiceInterface(name = "KeyVaultAdministrationClientRoleAs")
+    @ServiceInterface(name = "KeyVaultAdministrati")
     public interface RoleAssignmentsService {
         @Delete("/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}")
         @ExpectedResponses({ 200 })

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/implementation/RoleAssignmentsImpl.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
+
 package com.azure.security.keyvault.administration.implementation.models;
 
 import com.azure.core.annotation.Generated;
@@ -19,7 +20,6 @@
  */
 @Immutable
 public final class FullBackupOperation implements JsonSerializable<FullBackupOperation> {
-
     /*
      * Status of the backup operation.
      */
@@ -71,7 +71,7 @@ private FullBackupOperation() {
 
     /**
      * Get the status property: Status of the backup operation.
-     *
+     * 
      * @return the status value.
      */
     @Generated
@@ -81,7 +81,7 @@ public OperationStatus getStatus() {
 
     /**
      * Get the statusDetails property: The status details of backup operation.
-     *
+     * 
      * @return the statusDetails value.
      */
     @Generated
@@ -91,7 +91,7 @@ public String getStatusDetails() {
 
     /**
      * Get the error property: Error encountered, if any, during the full backup operation.
-     *
+     * 
      * @return the error value.
      */
     @Generated
@@ -101,7 +101,7 @@ public FullBackupOperationError getError() {
 
     /**
      * Get the startTime property: The start time of the backup operation in UTC.
-     *
+     * 
      * @return the startTime value.
      */
     @Generated
@@ -114,7 +114,7 @@ public OffsetDateTime getStartTime() {
 
     /**
      * Get the endTime property: The end time of the backup operation in UTC.
-     *
+     * 
      * @return the endTime value.
      */
     @Generated
@@ -127,7 +127,7 @@ public OffsetDateTime getEndTime() {
 
     /**
      * Get the jobId property: Identifier for the full backup operation.
-     *
+     * 
      * @return the jobId value.
      */
     @Generated
@@ -138,7 +138,7 @@ public String getJobId() {
     /**
      * Get the azureStorageBlobContainerUri property: The Azure blob storage container Uri which contains the full
      * backup.
-     *
+     * 
      * @return the azureStorageBlobContainerUri value.
      */
     @Generated
@@ -165,7 +165,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
 
     /**
      * Reads an instance of FullBackupOperation from the JsonReader.
-     *
+     * 
      * @param jsonReader The JsonReader being read.
      * @return An instance of FullBackupOperation if the JsonReader was pointing to an instance of it, or null if it was
      * pointing to JSON null.
@@ -178,6 +178,7 @@ public static FullBackupOperation fromJson(JsonReader jsonReader) throws IOExcep
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
+
                 if ("status".equals(fieldName)) {
                     deserializedFullBackupOperation.status = OperationStatus.fromString(reader.getString());
                 } else if ("statusDetails".equals(fieldName)) {
@@ -196,6 +197,7 @@ public static FullBackupOperation fromJson(JsonReader jsonReader) throws IOExcep
                     reader.skipChildren();
                 }
             }
+
             return deserializedFullBackupOperation;
         });
     }

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/implementation/RoleDefinitionsImpl.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
+
 package com.azure.security.keyvault.administration.implementation.models;
 
 import com.azure.core.annotation.Generated;
@@ -16,7 +17,6 @@
  */
 @Immutable
 public final class FullBackupOperationError implements JsonSerializable<FullBackupOperationError> {
-
     /*
      * The error code.
      */
@@ -44,7 +44,7 @@ private FullBackupOperationError() {
 
     /**
      * Get the code property: The error code.
-     *
+     * 
      * @return the code value.
      */
     @Generated
@@ -54,7 +54,7 @@ public String getCode() {
 
     /**
      * Get the message property: The error message.
-     *
+     * 
      * @return the message value.
      */
     @Generated
@@ -64,7 +64,7 @@ public String getMessage() {
 
     /**
      * Get the innerError property: The key vault server error.
-     *
+     * 
      * @return the innerError value.
      */
     @Generated
@@ -84,7 +84,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
 
     /**
      * Reads an instance of FullBackupOperationError from the JsonReader.
-     *
+     * 
      * @param jsonReader The JsonReader being read.
      * @return An instance of FullBackupOperationError if the JsonReader was pointing to an instance of it, or null if
      * it was pointing to JSON null.
@@ -97,6 +97,7 @@ public static FullBackupOperationError fromJson(JsonReader jsonReader) throws IO
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
+
                 if ("code".equals(fieldName)) {
                     deserializedFullBackupOperationError.code = reader.getString();
                 } else if ("message".equals(fieldName)) {
@@ -107,6 +108,7 @@ public static FullBackupOperationError fromJson(JsonReader jsonReader) throws IO
                     reader.skipChildren();
                 }
             }
+
             return deserializedFullBackupOperationError;
         });
     }

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/implementation/models/FullBackupOperation.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
+
 package com.azure.security.keyvault.administration.implementation.models;
 
 import com.azure.core.annotation.Generated;
@@ -11,7 +12,6 @@
  * The status of a long-running operation.
  */
 public final class OperationStatus extends ExpandableStringEnum<OperationStatus> {
-
     /**
      * The operation is in progress.
      */
@@ -38,7 +38,7 @@ public final class OperationStatus extends ExpandableStringEnum<OperationStatus>
 
     /**
      * Creates a new instance of OperationStatus value.
-     *
+     * 
      * @deprecated Use the {@link #fromString(String)} factory method.
      */
     @Generated
@@ -48,7 +48,7 @@ public OperationStatus() {
 
     /**
      * Creates or finds a OperationStatus from its string representation.
-     *
+     * 
      * @param name a name to look for.
      * @return the corresponding OperationStatus.
      */
@@ -59,7 +59,7 @@ public static OperationStatus fromString(String name) {
 
     /**
      * Gets known OperationStatus values.
-     *
+     * 
      * @return known OperationStatus values.
      */
     @Generated

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/implementation/models/FullBackupOperationError.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
+
 package com.azure.security.keyvault.administration.implementation.models;
 
 import com.azure.core.annotation.Fluent;
@@ -18,7 +19,6 @@
  */
 @Fluent
 public final class Permission implements JsonSerializable<Permission> {
-
     /*
      * Action permissions that are granted.
      */
@@ -54,7 +54,7 @@ public Permission() {
 
     /**
      * Get the actions property: Action permissions that are granted.
-     *
+     * 
      * @return the actions value.
      */
     @Generated
@@ -64,7 +64,7 @@ public List<String> getActions() {
 
     /**
      * Set the actions property: Action permissions that are granted.
-     *
+     * 
      * @param actions the actions value to set.
      * @return the Permission object itself.
      */
@@ -77,7 +77,7 @@ public Permission setActions(List<String> actions) {
     /**
      * Get the notActions property: Action permissions that are excluded but not denied. They may be granted by other
      * role definitions assigned to a principal.
-     *
+     * 
      * @return the notActions value.
      */
     @Generated
@@ -88,7 +88,7 @@ public List<String> getNotActions() {
     /**
      * Set the notActions property: Action permissions that are excluded but not denied. They may be granted by other
      * role definitions assigned to a principal.
-     *
+     * 
      * @param notActions the notActions value to set.
      * @return the Permission object itself.
      */
@@ -100,7 +100,7 @@ public Permission setNotActions(List<String> notActions) {
 
     /**
      * Get the dataActions property: Data action permissions that are granted.
-     *
+     * 
      * @return the dataActions value.
      */
     @Generated
@@ -110,7 +110,7 @@ public List<KeyVaultDataAction> getDataActions() {
 
     /**
      * Set the dataActions property: Data action permissions that are granted.
-     *
+     * 
      * @param dataActions the dataActions value to set.
      * @return the Permission object itself.
      */
@@ -123,7 +123,7 @@ public Permission setDataActions(List<KeyVaultDataAction> dataActions) {
     /**
      * Get the notDataActions property: Data action permissions that are excluded but not denied. They may be granted by
      * other role definitions assigned to a principal.
-     *
+     * 
      * @return the notDataActions value.
      */
     @Generated
@@ -134,7 +134,7 @@ public List<KeyVaultDataAction> getNotDataActions() {
     /**
      * Set the notDataActions property: Data action permissions that are excluded but not denied. They may be granted by
      * other role definitions assigned to a principal.
-     *
+     * 
      * @param notDataActions the notDataActions value to set.
      * @return the Permission object itself.
      */
@@ -162,7 +162,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
 
     /**
      * Reads an instance of Permission from the JsonReader.
-     *
+     * 
      * @param jsonReader The JsonReader being read.
      * @return An instance of Permission if the JsonReader was pointing to an instance of it, or null if it was pointing
      * to JSON null.
@@ -175,6 +175,7 @@ public static Permission fromJson(JsonReader jsonReader) throws IOException {
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
+
                 if ("actions".equals(fieldName)) {
                     List<String> actions = reader.readArray(reader1 -> reader1.getString());
                     deserializedPermission.actions = actions;
@@ -193,6 +194,7 @@ public static Permission fromJson(JsonReader jsonReader) throws IOException {
                     reader.skipChildren();
                 }
             }
+
             return deserializedPermission;
         });
     }