Renamed classes and updated documentation

Author: fmeheust

ojdbc-provider-gcp/README.md

@@ -6,10 +6,11 @@ Google Cloud Platform (GCP).
 ## Centralized Config Providers
 
 <dl>
-<dt><a href="#gcp-object-storage-config-provider">GCP Object Storage Config 
+<dt><a href="#gcp-cloud-storage-config-provider">GCP Cloud Storage Config 
+Provider</a></dt>
+<dd>Provides connection properties managed by the Cloud Storage service</dd>
+<dt><a href="#gcp-secret_manager-config-provider">GCP Secret Manager Config 
 Provider</a></dt>
-<dd>Provides connection properties managed by the Object Storage service</dd>
-<dt><a href="#gcp-vault-secret-config-provider">GCP Vault Secret Config Provider</a></dt>
 <dd>Provides connection properties managed by the Secret Manager service</dd>
 <dt><a href="#caching-configuration">Caching configuration</a></dt>
 <dd>Caching mechanism adopted by Centralized Config Providers</dd>
@@ -18,10 +19,10 @@ Provider</a></dt>
 ## Resource Providers
 
 <dl>
-<dt><a href="#vault-password-provider">Vault Password Provider</a></dt>
-<dd>Provides passwords managed by the Vault service</dd>
-<dt><a href="#vault-username-provider">Vault Username Provider</a></dt>
-<dd>Provides usernames managed by the Vault service</dd>
+<dt><a href="#vault-password-provider">Secret Manager Password Provider</a></dt>
+<dd>Provides passwords managed by the Secret Manager service</dd>
+<dt><a href="#vault-username-provider">Secret Manager Username Provider</a></dt>
+<dd>Provides usernames managed by the Secret Manager service</dd>
 </dl>
 
 Visit any of the links above to find information and usage examples for a
@@ -68,11 +69,11 @@ gcloud auth application-default login
 ```
 A sign-in screen appears. After you sign in, your credentials are stored in the local credential file used by ADC.
 
-## GCP Object Storage Config Provider
-The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-gcp-object:` to be able to identify that the configuration parameters should be loaded using GCP Object Storage. Users only need to indicate the project, bucket and object containing the JSON payload, with the following syntax:
+## GCP Cloud Storage Config Provider
+The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-gcpstorage:` to be able to identify that the configuration parameters should be loaded using GCP Object Storage. Users only need to indicate the project, bucket and object containing the JSON payload, with the following syntax:
 
 <pre>
-jdbc:oracle:thin:@config-gcp-object://project={project};bucket={bucket};object={object}]
+jdbc:oracle:thin:@config-gcpstorage://project={project};bucket={bucket};object={object}]
 </pre>
 
 ### JSON Payload format
@@ -146,8 +147,8 @@ For the JSON type of provider (GCP Object Storage, HTTP/HTTPS, File) the passwor
     - method
     - optional parameters (depends on the cloud provider).
 
-## GCP Vault Secret Config Provider
-Apart from GCP Object Storage, users can also store JSON Payload in the content of GCP Secret Manager secret. Users need to indicate the resource name:
+## GCP Secret Manager Config Provider
+Apart from GCP Cloud Storage, users can also store JSON Payload in the content of GCP Secret Manager secret. Users need to indicate the resource name:
 
 <pre>
 jdbc:oracle:thin:@config-gcpvault:{resource-name}

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpObjectStorageConfigurationProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpCloudStorageConfigurationProvider.java

@@ -43,14 +43,14 @@
 import java.util.Map;
 
 import oracle.jdbc.driver.OracleConfigurationJsonProvider;
-import oracle.jdbc.provider.gcp.objectstorage.GcpObjectStorageFactory;
+import oracle.jdbc.provider.gcp.objectstorage.GcpCloudStorageFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 
 /**
- * A provider for JSON payload which contains configuration from GCP Object
+ * A provider for JSON payload which contains configuration from GCP Cloud
  * Storage. See {@link #getJson(String)} for the spec of the JSON payload.
  */
-public class GcpObjectStorageConfigurationProvider extends OracleConfigurationJsonProvider {
+public class GcpCloudStorageConfigurationProvider extends OracleConfigurationJsonProvider {
 
   public static final String PROJECT_PARAMETER = "project";
   public static final String BUCKET_PARAMETER = "bucket";
@@ -64,7 +64,7 @@ public String getType() {
   /**
    * {@inheritDoc}
    * <p>
-   * Returns the JSON payload stored in GCP Object Storage.
+   * Returns the JSON payload stored in GCP Cloud Storage.
    * </p>
    * 
    * @param location semi-colon separated list of key value pairs
@@ -89,7 +89,7 @@ public InputStream getJson(String location) throws SQLException {
     }
     ParameterSet parameterSet = GcpConfigurationParameters.getParser().parseNamedValues(namedValues);
 
-    return GcpObjectStorageFactory.getInstance().request(parameterSet).getContent();
+    return GcpCloudStorageFactory.getInstance().request(parameterSet).getContent();
   }
 
 }

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpConfigurationParameters.java

@@ -37,35 +37,35 @@
  */
 package oracle.jdbc.provider.gcp.configuration;
 
-import static oracle.jdbc.provider.gcp.secrets.GcpVaultSecretFactory.SECRET_VERSION_NAME;
+import static oracle.jdbc.provider.gcp.secrets.GcpSecretManagerFactory.SECRET_VERSION_NAME;
 
-import oracle.jdbc.provider.gcp.objectstorage.GcpObjectStorageFactory;
+import oracle.jdbc.provider.gcp.objectstorage.GcpCloudStorageFactory;
 import oracle.jdbc.provider.parameter.ParameterSetParser;;
 
 public class GcpConfigurationParameters {
   /**
    * <p>
-   * A parser that recognizes parameters of URIs received by
-   * {@link GcpObjectStorageProvider}, and JSON objects received by
-   * {@link GcpVaultSecretProvider}.
+   * A parser that recognizes parameters of key/value pairs received by
+   * {@link GcpCloudStorageConfigurationProvider}, and resource names received
+   * by {@link GcpSecretManagerConfigurationProvider}.
    * </p>
    */
   private static final ParameterSetParser PARAMETER_SET_PARSER = ParameterSetParser.builder()
       .addParameter("value", SECRET_VERSION_NAME)
       .addParameter("secretVersionName", SECRET_VERSION_NAME)
       .addParameter(
-          GcpObjectStorageConfigurationProvider.PROJECT_PARAMETER, GcpObjectStorageFactory.PROJECT)
+          GcpCloudStorageConfigurationProvider.PROJECT_PARAMETER, GcpCloudStorageFactory.PROJECT)
       .addParameter(
-          GcpObjectStorageConfigurationProvider.BUCKET_PARAMETER, GcpObjectStorageFactory.BUCKET)
+          GcpCloudStorageConfigurationProvider.BUCKET_PARAMETER, GcpCloudStorageFactory.BUCKET)
       .addParameter(
-          GcpObjectStorageConfigurationProvider.OBJECT_PARAMETER, GcpObjectStorageFactory.OBJECT)
+          GcpCloudStorageConfigurationProvider.OBJECT_PARAMETER, GcpCloudStorageFactory.OBJECT)
       .build();
 
   /**
    * @return A parser that recognizes parameters of URIs received by
-   *         {@link GcpObjectStorageConfigurationProvider}, and JSON objects
+   *         {@link GcpCloudStorageConfigurationProvider}, and JSON objects
    *         received by
-   *         {@link GcpVaultSecretConfigurationProvider}.
+   *         {@link GcpSecretManagerConfigurationProvider}.
    */
   public static ParameterSetParser getParser() {
     return PARAMETER_SET_PARSER;

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpJsonVaultSecretProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpJsonSecretManagerProvider.java

@@ -42,12 +42,12 @@
 import java.util.Base64;
 
 import oracle.jdbc.provider.configuration.JsonSecretUtil;
-import oracle.jdbc.provider.gcp.secrets.GcpVaultSecretFactory;
+import oracle.jdbc.provider.gcp.secrets.GcpSecretManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.spi.OracleConfigurationJsonSecretProvider;
 import oracle.sql.json.OracleJsonObject;
 
-public class GcpJsonVaultSecretProvider implements OracleConfigurationJsonSecretProvider {
+public class GcpJsonSecretManagerProvider implements OracleConfigurationJsonSecretProvider {
 
   /**
    * {@inheritDoc}
@@ -74,7 +74,7 @@ public char[] getSecret(OracleJsonObject jsonObject) {
     ParameterSet parameterSet = GcpConfigurationParameters.getParser().parseNamedValues(
         JsonSecretUtil.toNamedValues(jsonObject));
 
-    ByteString stringData = GcpVaultSecretFactory.getInstance().request(parameterSet).getContent().getData();
+    ByteString stringData = GcpSecretManagerFactory.getInstance().request(parameterSet).getContent().getData();
     return Base64.getEncoder().encodeToString(stringData.toByteArray()).toCharArray();
   }
 

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpVaultSecretConfigurationProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/configuration/GcpSecretManagerConfigurationProvider.java

@@ -44,15 +44,15 @@
 import java.util.Map;
 
 import oracle.jdbc.driver.OracleConfigurationJsonProvider;
-import oracle.jdbc.provider.gcp.secrets.GcpVaultSecretFactory;
+import oracle.jdbc.provider.gcp.secrets.GcpSecretManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 
 /**
  * A provider for JSON payload which contains configuration from GCP Secret
  * Manager.
  * See {@link #getJson(String)} for the spec of the JSON payload.
  **/
-public class GcpVaultSecretConfigurationProvider extends OracleConfigurationJsonProvider {
+public class GcpSecretManagerConfigurationProvider extends OracleConfigurationJsonProvider {
 
   @Override
   public String getType() {
@@ -75,7 +75,7 @@ public InputStream getJson(String location) throws SQLException {
     namedValues.put("secretVersionName", location);
     ParameterSet parameterSet = GcpConfigurationParameters.getParser().parseNamedValues(namedValues);
     return new ByteArrayInputStream(
-        GcpVaultSecretFactory.getInstance().request(parameterSet).getContent().getData().toByteArray());
+        GcpSecretManagerFactory.getInstance().request(parameterSet).getContent().getData().toByteArray());
   }
 
 }

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/objectstorage/GcpObjectStorageFactory.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/objectstorage/GcpCloudStorageFactory.java

@@ -51,16 +51,16 @@
 import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSet;
 
-public class GcpObjectStorageFactory implements ResourceFactory<InputStream> {
+public class GcpCloudStorageFactory implements ResourceFactory<InputStream> {
   /** The secret version name for the secret */
   public static final Parameter<String> PROJECT = Parameter.create(REQUIRED);
   public static final Parameter<String> BUCKET = Parameter.create(REQUIRED);
   public static final Parameter<String> OBJECT = Parameter.create(REQUIRED);
 
   private static final ResourceFactory<InputStream> INSTANCE = CachedResourceFactory
-      .create(new GcpObjectStorageFactory());
+      .create(new GcpCloudStorageFactory());
 
-  private GcpObjectStorageFactory() {
+  private GcpCloudStorageFactory() {
   }
 
   /**

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpVaultSecretPasswordProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java

@@ -54,9 +54,9 @@
  * {@link java.util.ServiceLoader}.
  * </p>
  */
-public class GcpVaultSecretPasswordProvider extends GcpVaultSecretProvider implements PasswordProvider {
+public class GcpSecretManagerPasswordProvider extends GcpSecretManagerProvider implements PasswordProvider {
 
-  public GcpVaultSecretPasswordProvider() {
+  public GcpSecretManagerPasswordProvider() {
     super("secret-password");
   }
 

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpVaultSecretProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerProvider.java

@@ -41,28 +41,28 @@
 
 import com.google.protobuf.ByteString;
 
-import oracle.jdbc.provider.gcp.secrets.GcpVaultSecretFactory;
+import oracle.jdbc.provider.gcp.secrets.GcpSecretManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.provider.resource.AbstractResourceProvider;
 import oracle.jdbc.provider.resource.ResourceParameter;
 
 /**
  * Internal class to be inherited by other resource providers using secrets.
  */
-class GcpVaultSecretProvider extends AbstractResourceProvider {
+class GcpSecretManagerProvider extends AbstractResourceProvider {
 
   private static final ResourceParameter[] PARAMETERS = {
-      new ResourceParameter("secretVersionName", GcpVaultSecretFactory.SECRET_VERSION_NAME)
+      new ResourceParameter("secretVersionName", GcpSecretManagerFactory.SECRET_VERSION_NAME)
   };
 
-  protected GcpVaultSecretProvider(String valueType) {
+  protected GcpSecretManagerProvider(String valueType) {
     super("gcp", valueType, PARAMETERS);
   }
 
   /**
    * <p>
    * Returns a secret identified by a parameter named "secretVersionName" which
-   * configures {@link GcpVaultSecretFactory#SECRET_VERSION_NAME}. This method
+   * configures {@link GcpSecretManagerFactory#SECRET_VERSION_NAME}. This method
    * parses these parameters from text values.
    * </p>
    * <p>
@@ -78,7 +78,7 @@ protected final ByteString getSecret(
 
     ParameterSet parameterSet = parseParameterValues(parameterValues);
 
-    return GcpVaultSecretFactory.getInstance()
+    return GcpSecretManagerFactory.getInstance()
         .request(parameterSet)
         .getContent()
         .getData();

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpVaultSecretUsernameProvider.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java

@@ -52,9 +52,9 @@
  * {@link java.util.ServiceLoader}.
  * </p>
  */
-public class GcpVaultSecretUsernameProvider extends GcpVaultSecretProvider implements UsernameProvider {
+public class GcpSecretManagerUsernameProvider extends GcpSecretManagerProvider implements UsernameProvider {
 
-  public GcpVaultSecretUsernameProvider() {
+  public GcpSecretManagerUsernameProvider() {
     super("secret-username");
   }
 

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/secrets/GcpVaultSecretFactory.java ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/secrets/GcpSecretManagerFactory.java

@@ -64,15 +64,15 @@
  * of a secret as a database password, or any other security sensitive value.
  * </p>
  */
-public class GcpVaultSecretFactory implements ResourceFactory<SecretPayload> {
+public class GcpSecretManagerFactory implements ResourceFactory<SecretPayload> {
 
   /** The secret version name for the secret */
   public static final Parameter<String> SECRET_VERSION_NAME = Parameter.create(REQUIRED);
 
   private static final ResourceFactory<SecretPayload> INSTANCE = CachedResourceFactory
-      .create(new GcpVaultSecretFactory());
+      .create(new GcpSecretManagerFactory());
 
-  private GcpVaultSecretFactory() {
+  private GcpSecretManagerFactory() {
   }
 
   /**

ojdbc-provider-gcp/src/main/resources/META-INF/services/oracle.jdbc.spi.OracleConfigurationJsonSecretProvider

@@ -1 +1 @@
-oracle.jdbc.provider.gcp.configuration.GcpJsonVaultSecretProvider
+oracle.jdbc.provider.gcp.configuration.GcpJsonSecretManagerProvider

ojdbc-provider-gcp/src/main/resources/META-INF/services/oracle.jdbc.spi.OracleConfigurationProvider

@@ -1,2 +1,2 @@
-oracle.jdbc.provider.gcp.configuration.GcpObjectStorageConfigurationProvider
-oracle.jdbc.provider.gcp.configuration.GcpVaultSecretConfigurationProvider
+oracle.jdbc.provider.gcp.configuration.GcpCloudStorageConfigurationProvider
+oracle.jdbc.provider.gcp.configuration.GcpSecretManagerConfigurationProvider

ojdbc-provider-gcp/src/main/resources/META-INF/services/oracle.jdbc.spi.PasswordProvider

@@ -1 +1 @@
-oracle.jdbc.provider.gcp.resource.GcpVaultSecretPasswordProvider
+oracle.jdbc.provider.gcp.resource.GcpSecretManagerPasswordProvider

ojdbc-provider-gcp/src/main/resources/META-INF/services/oracle.jdbc.spi.UsernameProvider

@@ -1 +1 @@
-oracle.jdbc.provider.gcp.resource.GcpVaultSecretUsernameProvider
+oracle.jdbc.provider.gcp.resource.GcpSecretManagerUsernameProvider

ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/configuration/GcpObjectStorageProviderTest.java ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/configuration/GcpCloudStorageProviderTest.java

@@ -49,7 +49,7 @@
 import oracle.jdbc.spi.OracleConfigurationProvider;
 
 @Disabled
-public class GcpObjectStorageProviderTest {
+public class GcpCloudStorageProviderTest {
 
   private enum GcpTestProperties {
     GCP_OBJECT_STORAGE_URL

ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/configuration/GcpVaultSecretConfigurationProviderTest.java ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/configuration/GcpSecretManagerConfigurationProviderTest.java

@@ -49,7 +49,7 @@
 import oracle.jdbc.spi.OracleConfigurationProvider;
 
 @Disabled
-public class GcpVaultSecretConfigurationProviderTest {
+public class GcpSecretManagerConfigurationProviderTest {
   private enum GcpTestProperties {
     SECRET_VERSION_NAME_CONFIG
   }

ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/resource/GcpVaultSecretPasswordProviderTest.java ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/resource/GcpSecretManagerPasswordProviderTest.java

@@ -56,7 +56,7 @@
 import static oracle.jdbc.provider.resource.ResourceProviderTestUtil.findProvider;
 
 @Disabled
-public class GcpVaultSecretPasswordProviderTest {
+public class GcpSecretManagerPasswordProviderTest {
   private static final PasswordProvider PROVIDER = findProvider(
       PasswordProvider.class, "ojdbc-provider-gcp-secret-password");
 

ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/resource/GcpVaultSecretUsernameProviderTest.java ojdbc-provider-gcp/src/test/java/oracle/provider/gcp/resource/GcpSecretManagerUsernameProviderTest.java

@@ -56,7 +56,7 @@
 import oracle.jdbc.spi.UsernameProvider;
 
 @Disabled
-public class GcpVaultSecretUsernameProviderTest {
+public class GcpSecretManagerUsernameProviderTest {
   private static final UsernameProvider PROVIDER = findProvider(
       UsernameProvider.class, "ojdbc-provider-gcp-secret-username");
 

ojdbc-provider-samples/src/main/java/oracle/jdbc/provider/gcp/configuration/SimpleObjectStorageExample.java ojdbc-provider-samples/src/main/java/oracle/jdbc/provider/gcp/configuration/SimpleCloudStorageExample.java

@@ -46,9 +46,9 @@
 
 /**
  * A standalone example that configures Oracle JDBC to be provided with the
- * connection properties retrieved from OCI Object Storage.
+ * connection properties retrieved from OCI Cloud Storage.
  */
-public class SimpleObjectStorageExample {
+public class SimpleCloudStorageExample {
 
   /**
    * <p>