camelCase option name and consistent sample config name

Author: Michael-A-McMahon

README.md

@@ -157,11 +157,11 @@ Options. For Options having any of the following names, a CharSequence value may
   - [oracle.net.ssl_context_protocol](https://docs.oracle.com/en/database/oracle/oracle-database/21/jajdb/oracle/jdbc/OracleConnection.html?is-external=true#CONNECTION_PROPERTY_SSL_CONTEXT_PROTOCOL)
   - [oracle.jdbc.fanEnabled](https://docs.oracle.com/en/database/oracle/oracle-database/21/jajdb/oracle/jdbc/OracleConnection.html?is-external=true#CONNECTION_PROPERTY_FAN_ENABLED)
   - [oracle.jdbc.implicitStatementCacheSize](https://docs.oracle.com/en/database/oracle/oracle-database/21/jajdb/oracle/jdbc/OracleConnection.html?is-external=true#CONNECTION_PROPERTY_IMPLICIT_STATEMENT_CACHE_SIZE)
-- Oracle Net Descriptors of the form ```(DESCRIPTION=...)``` may be specified as an io.r2dbc.spi.Option having the name `oracle-net-descriptor`.
-  - If `oracle-net-descriptor` is specified, then it is invalid to specify any other options that might conflict with information in the descriptor, such as: `HOST`, `PORT`, `DATABASE`, and `SSL`.
-  - The `oracle-net-descriptor` option may appear in the query section of an R2DBC URL: `r2dbc:oracle://?oracle-net-descriptor=(DESCRIPTION=...)`
-  - The `oracle-net-descriptor` option may be provided programatically: `ConnectionFactoryOptions.builder().option(Option.valueOf("oracle-net-descriptor"), "(DESCRIPTION=...)")`
-  - The `oracle-net-descriptor` option may be set as the alias of a descriptor in a tnsnames.ora file. The directory of tnsnames.ora may be set using an io.r2dbc.spi.Option having the name `TNS_ADMIN`: `r2dbc:oracle://?oracle-net-descriptor=myAlias&TNS_ADMIN=/path/to/tnsnames/`
+- Oracle Net Descriptors of the form ```(DESCRIPTION=...)``` may be specified as an io.r2dbc.spi.Option having the name `oracleNetDescriptor`.
+  - If `oracleNetDescriptor` is specified, then it is invalid to specify any other options that might conflict with information in the descriptor, such as: `HOST`, `PORT`, `DATABASE`, and `SSL`.
+  - The `oracleNetDescriptor` option may appear in the query section of an R2DBC URL: `r2dbc:oracle://?oracleNetDescriptor=(DESCRIPTION=...)`
+  - The `oracleNetDescriptor` option may be provided programatically: `ConnectionFactoryOptions.builder().option(Option.valueOf("oracleNetDescriptor"), "(DESCRIPTION=...)")`
+  - The `oracleNetDescriptor` option may be set as the alias of a descriptor in a tnsnames.ora file. The directory of tnsnames.ora may be set using an io.r2dbc.spi.Option having the name `TNS_ADMIN`: `r2dbc:oracle://?oracleNetDescriptor=myAlias&TNS_ADMIN=/path/to/tnsnames/`
 
 
 ### Thread Safety and Parallel Execution

sample/example-config.properties

@@ -1,7 +1,4 @@
-# Values in this properties file configure how sample code connects to a
-# database.
-
-# This file contains example values. Create a copy named config.properties in
+# Values in this properties file configure how sample code connects to a # database. # This file contains example values. Create a copy named config.properties in
 # /sample and change the example values to actual values for your test database.
 
 # Host name of a test database
@@ -11,7 +8,7 @@ HOST=db.host.example.com
 PORT=1521
 
 # Service name of a test database
-SERVICE_NAME=db.service.name
+DATABASE=db.service.name
 
 # User name authenticated by a test database
 USER=db_user

sample/src/main/java/oracle/r2dbc/samples/DatabaseConfig.java

@@ -61,7 +61,7 @@ public class DatabaseConfig {
   static final int PORT = Integer.parseInt(CONFIG.getProperty("PORT"));
 
   /** Service name of an Oracle Database */
-  static final String SERVICE_NAME = CONFIG.getProperty("SERVICE_NAME");
+  static final String SERVICE_NAME = CONFIG.getProperty("DATABASE");
 
   /** User name that connects to an Oracle Database */
   static final String USER = CONFIG.getProperty("USER");

sample/src/main/java/oracle/r2dbc/samples/DescriptorURL.java

@@ -55,7 +55,7 @@ public class DescriptorURL {
 
   public static void main(String[] args) {
     // A descriptor may appear in the query section of an R2DBC URL:
-    String r2dbcUrl = "r2dbc:oracle://?oracle-net-descriptor="+DESCRIPTOR;
+    String r2dbcUrl = "r2dbc:oracle://?oracleNetDescriptor="+DESCRIPTOR;
     Mono.from(ConnectionFactories.get(ConnectionFactoryOptions.parse(r2dbcUrl)
       .mutate()
       .option(ConnectionFactoryOptions.USER, USER)
@@ -75,7 +75,7 @@ public static void main(String[] args) {
     // A descriptor may also be specified as an Option
     Mono.from(ConnectionFactories.get(ConnectionFactoryOptions.builder()
       .option(ConnectionFactoryOptions.DRIVER, "oracle")
-      .option(Option.valueOf("oracle-net-descriptor"), DESCRIPTOR)
+      .option(Option.valueOf("oracleNetDescriptor"), DESCRIPTOR)
       .option(ConnectionFactoryOptions.USER, USER)
       .option(ConnectionFactoryOptions.PASSWORD, PASSWORD)
       .build())

src/main/java/oracle/r2dbc/impl/OracleConnectionFactoryImpl.java

@@ -142,7 +142,7 @@ final class OracleConnectionFactoryImpl implements ConnectionFactory {
    * @throws IllegalStateException If the value of a required option is not
    * specified.
    *
-   * @throws IllegalArgumentException If the {@code oracle-net-descriptor}
+   * @throws IllegalArgumentException If the {@code oracleNetDescriptor}
    * {@code Option} is provided with any other options that might have
    * conflicting values, such as {@link ConnectionFactoryOptions#HOST}.
    */
@@ -193,4 +193,4 @@ public Publisher<Connection> create() {
   public ConnectionFactoryMetadata getMetadata() {
     return () -> "Oracle Database";
   }
-}
+}

src/main/java/oracle/r2dbc/impl/OracleConnectionFactoryProviderImpl.java

@@ -88,7 +88,7 @@ public OracleConnectionFactoryProviderImpl() { }
    * @throws IllegalStateException If any option required by
    * {@link OracleConnectionFactoryImpl} is not specified by {@code options}.
    *
-   * @throws IllegalArgumentException If the {@code oracle-net-descriptor}
+   * @throws IllegalArgumentException If the {@code oracleNetDescriptor}
    * {@code Option} is provided with any other options that might have
    * conflicting values, such as {@link ConnectionFactoryOptions#HOST}.
    */
@@ -124,4 +124,4 @@ public String getDriver() {
     return DRIVER_IDENTIFIER;
   }
 
-}
+}

src/main/java/oracle/r2dbc/impl/OracleReactiveJdbcAdapter.java

@@ -200,7 +200,7 @@ final class OracleReactiveJdbcAdapter implements ReactiveJdbcAdapter {
    * of the form "(DESCRIPTION=...)"
    */
   private static final Option<CharSequence> DESCRIPTOR =
-    Option.valueOf("oracle-net-descriptor");
+    Option.valueOf("oracleNetDescriptor");
 
   /**
    * Java object types that are supported by
@@ -421,7 +421,7 @@ static OracleReactiveJdbcAdapter getInstance() {
    * this way, the Oracle JDBC Driver uses the default character set of the
    * database, which may not support Unicode characters.
    *
-   * @throws IllegalArgumentException If the {@code oracle-net-descriptor}
+   * @throws IllegalArgumentException If the {@code oracleNetDescriptor}
    * {@code Option} is provided with any other options that might have
    * conflicting values, such as {@link ConnectionFactoryOptions#HOST}.
    */
@@ -446,7 +446,7 @@ public DataSource createDataSource(ConnectionFactoryOptions options) {
    * {@link #createDataSource(ConnectionFactoryOptions)}
    * @param options R2DBC options. Not null.
    * @return An Oracle JDBC URL composed from R2DBC options
-   * @throws IllegalArgumentException If the {@code oracle-net-descriptor}
+   * @throws IllegalArgumentException If the {@code oracleNetDescriptor}
    * {@code Option} is provided with any other options that might have
    * conflicting values, such as {@link ConnectionFactoryOptions#HOST}.
    */
@@ -490,7 +490,7 @@ private static void validateDescriptorOptions(
           // Ignore options having a value that can be represented as a
           // zero-length String; It may be necessary to include a zero-length
           // host name in an R2DBC URL:
-          // r2dbc:oracle://user:password@?oracle-net-descriptor=...
+          // r2dbc:oracle://user:password@?oracleNetDescriptor=...
           ! options.getValue(option).toString().isEmpty())
         .toArray(Option[]::new);
 

src/test/java/oracle/r2dbc/impl/OracleReactiveJdbcAdapterTest.java

@@ -200,13 +200,13 @@ public void testTnsAdmin() throws IOException {
       // Expect to connect with the descriptor in the R2DBC URL
       awaitNone(awaitOne(
         ConnectionFactories.get(String.format(
-          "r2dbc:oracle://%s:%s@?oracle-net-descriptor=%s",
+          "r2dbc:oracle://%s:%s@?oracleNetDescriptor=%s",
           user(), password(), descriptor))
           .create())
         .close());
       awaitNone(awaitOne(
         ConnectionFactories.get(ConnectionFactoryOptions.parse(String.format(
-          "r2dbc:oracle://@?oracle-net-descriptor=%s", descriptor))
+          "r2dbc:oracle://@?oracleNetDescriptor=%s", descriptor))
           .mutate()
           .option(USER, user())
           .option(PASSWORD, password())
@@ -218,13 +218,13 @@ public void testTnsAdmin() throws IOException {
       // the file path and an alias
       awaitNone(awaitOne(
         ConnectionFactories.get(String.format(
-          "r2dbc:oracle://%s:%s@?oracle-net-descriptor=%s&TNS_ADMIN=%s",
+          "r2dbc:oracle://%s:%s@?oracleNetDescriptor=%s&TNS_ADMIN=%s",
           user(), password(), "test_alias", System.getProperty("user.dir")))
           .create())
           .close());
       awaitNone(awaitOne(
         ConnectionFactories.get(ConnectionFactoryOptions.parse(String.format(
-          "r2dbc:oracle://@?oracle-net-descriptor=%s&TNS_ADMIN=%s",
+          "r2dbc:oracle://@?oracleNetDescriptor=%s&TNS_ADMIN=%s",
           "test_alias", System.getProperty("user.dir")))
           .mutate()
           .option(USER, user())
@@ -237,25 +237,25 @@ public void testTnsAdmin() throws IOException {
       // are provided with a descriptor
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get(
-          "r2dbc:oracle://"+host()+"?oracle-net-descriptor="+descriptor));
+          "r2dbc:oracle://"+host()+"?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get("r2dbc:oracle://"
-            +host()+":"+port()+"?oracle-net-descriptor="+descriptor));
+            +host()+":"+port()+"?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get("r2dbc:oracle://"+host()+":"+port()+"/"
-          +serviceName()+"?oracle-net-descriptor="+descriptor));
+          +serviceName()+"?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get("r2dbc:oracle://"+host()+"/"
-          +serviceName()+"?oracle-net-descriptor="+descriptor));
+          +serviceName()+"?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get("r2dbc:oracle:///"
-            +serviceName()+"?oracle-net-descriptor="+descriptor));
+            +serviceName()+"?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get("r2dbcs:oracle://" + // r2dbcs is SSL=true
-          "?oracle-net-descriptor="+descriptor));
+          "?oracleNetDescriptor="+descriptor));
       assertThrows(IllegalArgumentException.class, () ->
         ConnectionFactories.get(
-          "r2dbc:oracle://?oracle-net-descriptor="+descriptor+"&ssl=true"));
+          "r2dbc:oracle://?oracleNetDescriptor="+descriptor+"&ssl=true"));
 
       // Create an ojdbc.properties file containing the user name
       Files.writeString(Path.of("ojdbc.properties"),
@@ -267,7 +267,7 @@ public void testTnsAdmin() throws IOException {
         // specifies a user, and a standard option specifies the password.
         awaitNone(awaitOne(
           ConnectionFactories.get(ConnectionFactoryOptions.parse(String.format(
-            "r2dbc:oracle://?oracle-net-descriptor=%s&TNS_ADMIN=%s",
+            "r2dbc:oracle://?oracleNetDescriptor=%s&TNS_ADMIN=%s",
             "test_alias", System.getProperty("user.dir")))
             .mutate()
             .option(PASSWORD, password())