Fix error in api review (Azure#23200)

AzureSDKAutomation · Jul 28, 2021 · 95fc2af · 95fc2af
1 parent f7d6928
commit 95fc2af
Show file tree

Hide file tree

Showing 63 changed files with 289 additions and 571 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -46,7 +46,7 @@
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.ai.formrecognizer.models.FieldValue"/>
 
   <!-- Fields tenantId, clientId and clientSecret are not set in all constructors. -->
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.KeyVaultClient"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.implementation.KeyVaultClient"/>
 
   <!-- Fields defaultTrustManager and keyStore might be set more than once. -->
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.KeyVaultTrustManager"/>
@@ -177,7 +177,7 @@ the main ServiceBusClientBuilder. -->
 
   <!-- suppress the runtime exception in the KeyVaultClient class-->
   <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
-            files="com.azure.security.keyvault.jca.KeyVaultClient.java"/>
+            files="com.azure.security.keyvault.jca.implementation.KeyVaultClient.java"/>
 
   <!-- This class overrides a method that throws, so it cannot be avoided. -->
   <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files="com.azure.security.keyvault.jca.KeyVaultTrustManager"/>
@@ -297,7 +297,7 @@ the main ServiceBusClientBuilder. -->
 
 
   <!-- Fields tenantId, clientId and clientSecret are not set in all constructors. -->
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.KeyVaultClient"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.implementation.KeyVaultClient"/>
 
   <!-- Fields defaultTrustManager and keyStore might be set more than once. -->
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.security.keyvault.jca.KeyVaultTrustManager"/>

diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -144,7 +144,7 @@
   <!-- Suppress Redundant nullcheck error for JreCertificates$JREKeyStore.loadKeyStore(KeyStore). -->
   <Match>
     <Or>
-      <Class name="com.azure.security.keyvault.jca.JreCertificates$JREKeyStore"/> <!-- false positive -->
+      <Class name="com.azure.security.keyvault.jca.implementation.certificates.JreCertificates$JREKeyStore"/> <!-- false positive -->
     </Or>
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>
@@ -2440,7 +2440,7 @@
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
   </Match>
   <Match>
-    <Class name="com.azure.security.keyvault.jca.LegacyRestClient"/>
+    <Class name="com.azure.security.keyvault.jca.implementation.utils.HttpUtil"/>
     <Method name="~(get|post)"/>
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
   </Match>

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -259,7 +259,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-jca</artifactId>
-      <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
+      <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -110,7 +110,7 @@ com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-security-confidentialledger;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-security-keyvault-administration;4.0.1;4.1.0-beta.1
 com.azure:azure-security-keyvault-certificates;4.2.1;4.3.0-beta.1
-com.azure:azure-security-keyvault-jca;1.0.1;1.1.0-beta.1
+com.azure:azure-security-keyvault-jca;1.0.1;2.0.0-beta.1
 com.azure:azure-security-test-keyvault-jca;1.0.0;1.0.0
 com.azure:azure-security-keyvault-keys;4.3.1;4.4.0-beta.2
 com.azure:azure-security-keyvault-secrets;4.3.1;4.4.0-beta.1

diff --git a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.1.0-beta.1 (Unreleased)
+## 2.0.0-beta.1 (Unreleased)
 
 
 ## 1.0.1 (2021-07-01)

diff --git a/sdk/keyvault/azure-security-keyvault-jca/README.md b/sdk/keyvault/azure-security-keyvault-jca/README.md
@@ -18,7 +18,7 @@ Maven dependency for the Azure Key Vault JCA client library. Add it to your proj
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-security-keyvault-jca</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>com.azure</groupId>
     <artifactId>azure-security-keyvault-jca</artifactId>
-    <version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
+    <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
     <name>JCA Provider for Azure Key Vault</name>
     <description>The Java Crypto Architecture (JCA) Provider for Azure Key Vault</description>
     <build>
@@ -37,6 +37,16 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
+                <configuration>
+                    <excludes>
+                        <exclude>module-info.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -49,14 +59,6 @@
                         <configuration>
                             <createSourcesJar>true</createSourcesJar>
                             <shadeSourcesContent>true</shadeSourcesContent>
-			                      <filters>
-                                <filter>
-                                    <artifact>com.azure:azure-security-keyvault-jca</artifact>
-                                    <excludes>
-                                        <exclude>module-info.java</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.fasterxml.jackson</pattern>
@@ -99,7 +101,7 @@
               <version>1.0.0.RC1</version>  <!-- {x-version-update;org.moditect:moditect-maven-plugin;external_dependency} -->
               <executions>
                 <execution>
-                  <id>add-module-infos</id>
+                  <id>add-module-info</id>
                   <phase>package</phase>
                   <goals>
                     <goal>add-module-info</goal>
@@ -108,7 +110,7 @@
                     <overwriteExistingFiles>true</overwriteExistingFiles>
                     <module>
                       <moduleInfoFile>
-                        src/main/module-info.java
+                        src/main/resources/module-info.java
                       </moduleInfoFile>
                     </module>
                   </configuration>

diff --git a/...curity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/DelegateRestClient.java b/...curity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/DelegateRestClient.java
diff --git a/...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/JsonConverter.java b/...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/JsonConverter.java
diff --git a/...rity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/JsonConverterFactory.java b/...rity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/JsonConverterFactory.java
diff --git a/...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java b/...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultJcaProvider.java
@@ -12,7 +12,7 @@
 /**
  * The Azure Key Vault security provider.
  */
-public class KeyVaultJcaProvider extends Provider {
+public final class KeyVaultJcaProvider extends Provider {
 
     /**
      * Stores the name.

diff --git a/...curity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java b/...curity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java
@@ -24,7 +24,7 @@
 /**
  * The Azure Key Vault variant of the X509ExtendedKeyManager.
  */
-public class KeyVaultKeyManager extends X509ExtendedKeyManager {
+public final class KeyVaultKeyManager extends X509ExtendedKeyManager {
 
     /**
      * Stores the logger.

diff --git a/...keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManagerFactory.java b/...keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManagerFactory.java
@@ -14,7 +14,7 @@
 /**
  * The Azure Key Vault variant of the KeyManagerFactory.
  */
-public class KeyVaultKeyManagerFactory extends KeyManagerFactorySpi {
+public final class KeyVaultKeyManagerFactory extends KeyManagerFactorySpi {
 
     /**
      * Stores the logger.

diff --git a/...security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/...security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
@@ -2,6 +2,11 @@
 // Licensed under the MIT License.
 package com.azure.security.keyvault.jca;
 
+import com.azure.security.keyvault.jca.implementation.certificates.AzureCertificates;
+import com.azure.security.keyvault.jca.implementation.certificates.ClasspathCertificates;
+import com.azure.security.keyvault.jca.implementation.certificates.JreCertificates;
+import com.azure.security.keyvault.jca.implementation.certificates.KeyVaultCertificates;
+import com.azure.security.keyvault.jca.implementation.certificates.SpecificPathCertificates;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.Key;

diff --git a/...eyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java b/...eyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultLoadStoreParameter.java
@@ -8,7 +8,7 @@
 /**
  * The Azure Key Vault LoadStoreParameter of the KeyStoreSpi.
  */
-public class KeyVaultLoadStoreParameter implements KeyStore.LoadStoreParameter {
+public final class KeyVaultLoadStoreParameter implements KeyStore.LoadStoreParameter {
 
     /**
      * Stores the URI.

diff --git a/...rity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManager.java b/...rity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManager.java
@@ -22,7 +22,7 @@
 /**
  * The Azure Key Vault variant of the X509TrustManager.
  */
-public class KeyVaultTrustManager extends X509ExtendedTrustManager {
+public final class KeyVaultTrustManager extends X509ExtendedTrustManager {
 
     /**
      * Stores the logger.

diff --git a/...yvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactory.java b/...yvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactory.java
@@ -14,7 +14,7 @@
 /**
  * The Azure Key Vault variant of the TrustManagerFactory.
  */
-public class KeyVaultTrustManagerFactory extends TrustManagerFactorySpi {
+public final class KeyVaultTrustManagerFactory extends TrustManagerFactorySpi {
 
     /**
      * Stores the logger.

diff --git a/...ca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java b/...ca/src/main/java/com/azure/security/keyvault/jca/KeyVaultTrustManagerFactoryProvider.java
@@ -10,7 +10,7 @@
 /**
  * The Azure Key Vault TrustManagerFactory provider.
  */
-public class KeyVaultTrustManagerFactoryProvider extends Provider {
+public final class KeyVaultTrustManagerFactoryProvider extends Provider {
 
     /**
      * Stores the serial version UID.

diff --git a/...azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/RestClient.java b/...azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/RestClient.java
diff --git a/...ecurity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/RestClientFactory.java b/...ecurity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/RestClientFactory.java