Rebase the branch onto main, updatae JavaDoc, and fix the pipeline error.

Author: ting-lan-wang

ojdbc-provider-aws/README.md

@@ -26,7 +26,7 @@ JDK versions. The coordinates for the latest release are:
 <dependency>
   <groupId>com.oracle.database.jdbc</groupId>
   <artifactId>ojdbc-provider-aws</artifactId>
-  <version>1.2.0</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 
@@ -47,11 +47,19 @@ The default credentials provider chain searches for credentials in one of the fo
 6. Amazon EC2 instance IAM role-provided credentials
 
 ## AWS S3 Config Provider
-The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-awss3:` to be able to identify that the configuration parameters should be loaded using AWS S3. Users only need to indicate the S3 URI of the object that contains the JSON payload, with the following syntax:
+The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-awss3:` to be able to identify that the configuration parameters should be loaded using AWS S3.
+Users only need to indicate the S3 URI of the object that contains the JSON payload.
 
+A URL with either of the following formats is valid:
 <pre>
-jdbc:oracle:thin:@config-awass3://{s3-uri}
+jdbc:oracle:thin:@config-awss3://{S3-URI}
 </pre>
+or
+<pre>
+jdbc:oracle:thin:@config-aws{S3-URI}
+</pre>
+
+The {S3-URI} can be obtained from the Amazon S3 console and follows this naming convention: s3://bucket-name/file-name.
 
 ### JSON Payload format
 

ojdbc-provider-aws/pom.xml

@@ -5,13 +5,13 @@
   <name>Oracle JDBC AWS Providers</name>
 
   <artifactId>ojdbc-provider-aws</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>com.oracle.database.jdbc</groupId>
     <artifactId>ojdbc-extensions</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <dependencyManagement>
@@ -39,14 +39,6 @@
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>s3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>appconfig</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>appconfigdata</artifactId>
-    </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>auth</artifactId>

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/authentication/AwsCredentialsFactory.java

@@ -38,17 +38,15 @@
 
 package oracle.jdbc.provider.aws.authentication;
 
+import oracle.jdbc.provider.aws.AwsResourceFactory;
 import oracle.jdbc.provider.factory.Resource;
 import oracle.jdbc.provider.factory.ResourceFactory;
 import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
-import software.amazon.awssdk.services.appconfigdata.AppConfigDataClient;
 
-import static java.lang.String.format;
 import static oracle.jdbc.provider.parameter.Parameter.CommonAttribute.REQUIRED;
-import static oracle.jdbc.provider.parameter.Parameter.CommonAttribute.SENSITIVE;
 
 /**
  * <p>
@@ -115,7 +113,7 @@ private static AwsCredentials getCredential(ParameterSet parameterSet) {
   }
 
   /**
-   * Returns credentials resolved by {@link AppConfigDataClient}.
+   * Returns credentials resolved by {@link AwsResourceFactory}.
    * @return
    */
   private static AwsCredentials defaultCredentials() {

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/configuration/AwsConfigurationParameters.java

@@ -40,11 +40,8 @@
 
 import oracle.jdbc.provider.aws.authentication.AwsAuthenticationMethod;
 import oracle.jdbc.provider.aws.authentication.AwsCredentialsFactory;
-import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSetParser;
 
-import static oracle.jdbc.provider.parameter.Parameter.CommonAttribute.REQUIRED;
-
 public final class AwsConfigurationParameters {
 
   /**

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/configuration/AwsS3ConfigurationProvider.java

@@ -1,6 +1,7 @@
 package oracle.jdbc.provider.aws.configuration;
 
 import oracle.jdbc.driver.OracleConfigurationJsonProvider;
+import oracle.jdbc.util.OracleConfigurationCache;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 
@@ -54,6 +55,15 @@ public String getType() {
         return "awss3";
     }
 
+    /**
+     * {@inheritDoc}
+     * @return cache of this provider which is used to store configuration
+     */
+    @Override
+    public OracleConfigurationCache getCache() {
+        return CACHE;
+    }
+
     private URI getURI(String s3Url) throws URISyntaxException {
         if (!s3Url.startsWith("s3://")) {
             s3Url = "s3://" + s3Url;

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/configuration/AwsSecretsManagerConfigurationProvider.java

@@ -4,6 +4,7 @@
 import oracle.jdbc.provider.aws.secrets.SecretsManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.provider.parameter.ParameterSetParser;
+import oracle.jdbc.util.OracleConfigurationCache;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -57,4 +58,13 @@ public InputStream getJson(String secretName) {
   public String getType() {
     return "awssecretsmanager";
   }
+
+  /**
+   * {@inheritDoc}
+   * @return cache of this provider which is used to store configuration
+   */
+  @Override
+  public OracleConfigurationCache getCache() {
+    return CACHE;
+  }
 }

ojdbc-provider-azure/README.md

@@ -44,7 +44,7 @@ JDK versions. The coordinates for the latest release are:
 <dependency>
   <groupId>com.oracle.database.jdbc</groupId>
   <artifactId>ojdbc-provider-azure</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 

ojdbc-provider-oci/README.md

@@ -56,7 +56,7 @@ JDK versions. The coordinates for the latest release are:
 <dependency>
   <groupId>com.oracle.database.jdbc</groupId>
   <artifactId>ojdbc-provider-oci</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 

ojdbc-provider-opentelemetry/README.md

@@ -44,7 +44,7 @@ The coordinates for the latest release are:
 <dependency>
   <groupId>com.oracle.database.jdbc</groupId>
   <artifactId>ojdbc-provider-opentelemetry</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 

ojdbc-provider-samples/src/main/java/oracle/jdbc/provider/aws/configuration/AwsS3Example.java

@@ -65,7 +65,12 @@ public static void main(String[] args) throws SQLException {
 
     // Sample default URL if non present
     if (args.length == 0) {
-      url = "jdbc:oracle:thin:@config-awss3://{bucket-name}/{key-name}";
+      // A URL with either of the following formats is valid:
+      // "jdbc:oracle:thin:@config-awss3://{S3-URI}" or
+      // "jdbc:oracle:thin:@config-aws{S3-URI}".
+      // The {S3-URI} can be obtained from the Amazon S3 console and follows
+      // this naming convention: S3://bucket-name/file-name.
+      url = "jdbc:oracle:thin:@config-awss3://mybucket/myconfigfile.json";
     } else {
       url = args[0];
     }