Merge pull request Azure#35 from Lusitanian/feature/cert_transparency…

…_fix Add python script to automatically make all necessary changes to generated code, regen code from latest swagger
lenala · Mar 28, 2018 · 2a71a76 · 2a71a76
2 parents eb41400 + d78dcd5
commit 2a71a76
Show file tree

Hide file tree

Showing 16 changed files with 296 additions and 241 deletions.
diff --git a/UpdateCustomChildClassesForBackwardsCompatibility.bash b/UpdateCustomChildClassesForBackwardsCompatibility.bash
diff --git a/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java b/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientBase.java
@@ -33,7 +33,12 @@
 import com.microsoft.azure.keyvault.models.IssuerAttributes;
 import com.microsoft.azure.keyvault.models.IssuerBundle;
 import com.microsoft.azure.keyvault.models.IssuerCredentials;
+import com.microsoft.azure.keyvault.webkey.JsonWebKey;
 import com.microsoft.azure.keyvault.models.JsonWebKeyCurveName;
+import com.microsoft.azure.keyvault.webkey.JsonWebKeyEncryptionAlgorithm;
+import com.microsoft.azure.keyvault.webkey.JsonWebKeyOperation;
+import com.microsoft.azure.keyvault.webkey.JsonWebKeySignatureAlgorithm;
+import com.microsoft.azure.keyvault.webkey.JsonWebKeyType;
 import com.microsoft.azure.keyvault.models.KeyAttributes;
 import com.microsoft.azure.keyvault.models.KeyBundle;
 import com.microsoft.azure.keyvault.models.KeyItem;
@@ -62,11 +67,6 @@
 import java.util.List;
 import java.util.Map;
 import rx.Observable;
-import com.microsoft.azure.keyvault.webkey.JsonWebKey;
-import com.microsoft.azure.keyvault.webkey.JsonWebKeyEncryptionAlgorithm;
-import com.microsoft.azure.keyvault.webkey.JsonWebKeyOperation;
-import com.microsoft.azure.keyvault.webkey.JsonWebKeySignatureAlgorithm;
-import com.microsoft.azure.keyvault.webkey.JsonWebKeyType;
 
 /**
  * The interface for KeyVaultClientBase class.
@@ -3814,6 +3814,7 @@ public interface KeyVaultClientBase {
      * @return the BackupCertificateResult object if successful.
      */
     BackupCertificateResult backupCertificate(String vaultBaseUrl, String certificateName);
+
     /**
      * Backs up the specified certificate.
      * Requests that a backup of the specified certificate be downloaded to the client. All versions of the certificate will be downloaded. This operation requires the certificates/backup permission.
@@ -3825,6 +3826,7 @@ public interface KeyVaultClientBase {
      * @return the {@link ServiceFuture} object
      */
     ServiceFuture<BackupCertificateResult> backupCertificateAsync(String vaultBaseUrl, String certificateName, final ServiceCallback<BackupCertificateResult> serviceCallback);
+
     /**
      * Backs up the specified certificate.
      * Requests that a backup of the specified certificate be downloaded to the client. All versions of the certificate will be downloaded. This operation requires the certificates/backup permission.
@@ -3835,6 +3837,7 @@ public interface KeyVaultClientBase {
      * @return the observable to the BackupCertificateResult object
      */
     Observable<BackupCertificateResult> backupCertificateAsync(String vaultBaseUrl, String certificateName);
+
     /**
      * Backs up the specified certificate.
      * Requests that a backup of the specified certificate be downloaded to the client. All versions of the certificate will be downloaded. This operation requires the certificates/backup permission.
@@ -3845,6 +3848,7 @@ public interface KeyVaultClientBase {
      * @return the observable to the BackupCertificateResult object
      */
     Observable<ServiceResponse<BackupCertificateResult>> backupCertificateWithServiceResponseAsync(String vaultBaseUrl, String certificateName);
+
     /**
      * Restores a backed up certificate to a vault.
      * Restores a backed up certificate, and all its versions, to a vault. This operation requires the certificates/restore permission.
@@ -3857,6 +3861,7 @@ public interface KeyVaultClientBase {
      * @return the CertificateBundle object if successful.
      */
     CertificateBundle restoreCertificate(String vaultBaseUrl, byte[] certificateBundleBackup);
+
     /**
      * Restores a backed up certificate to a vault.
      * Restores a backed up certificate, and all its versions, to a vault. This operation requires the certificates/restore permission.
@@ -3868,6 +3873,7 @@ public interface KeyVaultClientBase {
      * @return the {@link ServiceFuture} object
      */
     ServiceFuture<CertificateBundle> restoreCertificateAsync(String vaultBaseUrl, byte[] certificateBundleBackup, final ServiceCallback<CertificateBundle> serviceCallback);
+
     /**
      * Restores a backed up certificate to a vault.
      * Restores a backed up certificate, and all its versions, to a vault. This operation requires the certificates/restore permission.
@@ -3878,6 +3884,7 @@ public interface KeyVaultClientBase {
      * @return the observable to the CertificateBundle object
      */
     Observable<CertificateBundle> restoreCertificateAsync(String vaultBaseUrl, byte[] certificateBundleBackup);
+
     /**
      * Restores a backed up certificate to a vault.
      * Restores a backed up certificate, and all its versions, to a vault. This operation requires the certificates/restore permission.
@@ -3888,6 +3895,7 @@ public interface KeyVaultClientBase {
      * @return the observable to the CertificateBundle object
      */
     Observable<ServiceResponse<CertificateBundle>> restoreCertificateWithServiceResponseAsync(String vaultBaseUrl, byte[] certificateBundleBackup);
+
     /**
      * Lists the deleted certificates in the specified vault currently available for recovery.
      * The GetDeletedCertificates operation retrieves the certificates in the current vault which are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete enabled vaults.

diff --git a/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java b/azure-keyvault/src/main/java/com/microsoft/azure/keyvault/KeyVaultClientImpl.java
@@ -1374,9 +1374,9 @@ public Observable<ServiceResponse<Page<KeyItem>>> call(ServiceResponse<Page<KeyI
     /**
      * Retrieves a list of individual key versions with the same key name. The full key identifier, attributes, and tags are provided in the response. Authorization: Requires the keys/list permission.
      *
-    ServiceResponse<PageImpl<KeyItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<KeyItem>> * @param keyName The name of the key.
-    ServiceResponse<PageImpl<KeyItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param keyName The name of the key.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;KeyItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<KeyItem>>> getKeyVersionsSinglePageAsync(final String vaultBaseUrl, final String keyName, final Integer maxresults) {
@@ -1589,8 +1589,8 @@ public Observable<ServiceResponse<Page<KeyItem>>> call(ServiceResponse<Page<KeyI
     /**
      * List keys in the specified vault.
      *
-    ServiceResponse<PageImpl<KeyItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<KeyItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;KeyItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<KeyItem>>> getKeysSinglePageAsync(final String vaultBaseUrl, final Integer maxresults) {
@@ -3119,8 +3119,8 @@ public Observable<ServiceResponse<Page<SecretItem>>> call(ServiceResponse<Page<S
     /**
      * List secrets in a specified key vault.
      *
-    ServiceResponse<PageImpl<SecretItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<SecretItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;SecretItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<SecretItem>>> getSecretsSinglePageAsync(final String vaultBaseUrl, final Integer maxresults) {
@@ -3342,9 +3342,9 @@ public Observable<ServiceResponse<Page<SecretItem>>> call(ServiceResponse<Page<S
     /**
      * List the versions of the specified secret.
      *
-    ServiceResponse<PageImpl<SecretItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<SecretItem>> * @param secretName The name of the secret.
-    ServiceResponse<PageImpl<SecretItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param secretName The name of the secret.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;SecretItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<SecretItem>>> getSecretVersionsSinglePageAsync(final String vaultBaseUrl, final String secretName, final Integer maxresults) {
@@ -3557,8 +3557,8 @@ public Observable<ServiceResponse<Page<CertificateItem>>> call(ServiceResponse<P
     /**
      * List certificates in a specified key vault.
      *
-    ServiceResponse<PageImpl<CertificateItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<CertificateItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;CertificateItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateItem>>> getCertificatesSinglePageAsync(final String vaultBaseUrl, final Integer maxresults) {
@@ -4067,8 +4067,8 @@ public Observable<ServiceResponse<Page<CertificateIssuerItem>>> call(ServiceResp
     /**
      * List certificate issuers for a specified key vault.
      *
-    ServiceResponse<PageImpl<CertificateIssuerItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<CertificateIssuerItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;CertificateIssuerItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateIssuerItem>>> getCertificateIssuersSinglePageAsync(final String vaultBaseUrl, final Integer maxresults) {
@@ -5192,9 +5192,9 @@ public Observable<ServiceResponse<Page<CertificateItem>>> call(ServiceResponse<P
     /**
      * List the versions of a certificate.
      *
-    ServiceResponse<PageImpl<CertificateItem>> * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
-    ServiceResponse<PageImpl<CertificateItem>> * @param certificateName The name of the certificate.
-    ServiceResponse<PageImpl<CertificateItem>> * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+     * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
+     * @param certificateName The name of the certificate.
+     * @param maxresults Maximum number of results to return in a page. If not specified the service will return up to 25 results.
      * @return the PagedList&lt;CertificateItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateItem>>> getCertificateVersionsSinglePageAsync(final String vaultBaseUrl, final String certificateName, final Integer maxresults) {
@@ -6167,7 +6167,7 @@ public Observable<ServiceResponse<Page<KeyItem>>> call(ServiceResponse<Page<KeyI
     /**
      * Retrieves a list of individual key versions with the same key name. The full key identifier, attributes, and tags are provided in the response. Authorization: Requires the keys/list permission.
      *
-    ServiceResponse<PageImpl<KeyItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;KeyItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<KeyItem>>> getKeyVersionsNextSinglePageAsync(final String nextPageLink) {
@@ -6271,7 +6271,7 @@ public Observable<ServiceResponse<Page<KeyItem>>> call(ServiceResponse<Page<KeyI
     /**
      * List keys in the specified vault.
      *
-    ServiceResponse<PageImpl<KeyItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;KeyItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<KeyItem>>> getKeysNextSinglePageAsync(final String nextPageLink) {
@@ -6375,7 +6375,7 @@ public Observable<ServiceResponse<Page<SecretItem>>> call(ServiceResponse<Page<S
     /**
      * List secrets in a specified key vault.
      *
-    ServiceResponse<PageImpl<SecretItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;SecretItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<SecretItem>>> getSecretsNextSinglePageAsync(final String nextPageLink) {
@@ -6479,7 +6479,7 @@ public Observable<ServiceResponse<Page<SecretItem>>> call(ServiceResponse<Page<S
     /**
      * List the versions of the specified secret.
      *
-    ServiceResponse<PageImpl<SecretItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;SecretItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<SecretItem>>> getSecretVersionsNextSinglePageAsync(final String nextPageLink) {
@@ -6583,7 +6583,7 @@ public Observable<ServiceResponse<Page<CertificateItem>>> call(ServiceResponse<P
     /**
      * List certificates in a specified key vault.
      *
-    ServiceResponse<PageImpl<CertificateItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;CertificateItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateItem>>> getCertificatesNextSinglePageAsync(final String nextPageLink) {
@@ -6687,7 +6687,7 @@ public Observable<ServiceResponse<Page<CertificateIssuerItem>>> call(ServiceResp
     /**
      * List certificate issuers for a specified key vault.
      *
-    ServiceResponse<PageImpl<CertificateIssuerItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;CertificateIssuerItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateIssuerItem>>> getCertificateIssuersNextSinglePageAsync(final String nextPageLink) {
@@ -6791,7 +6791,7 @@ public Observable<ServiceResponse<Page<CertificateItem>>> call(ServiceResponse<P
     /**
      * List the versions of a certificate.
      *
-    ServiceResponse<PageImpl<CertificateItem>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @return the PagedList&lt;CertificateItem&gt; object wrapped in {@link ServiceResponse} if successful.
      */
     public Observable<ServiceResponse<Page<CertificateItem>>> getCertificateVersionsNextSinglePageAsync(final String nextPageLink) {