Merge branch 'main' of https://github.com/oracle/oracle-r2dbc into spi-0-9-0-M2

Author: Michael-A-McMahon

README.md

@@ -197,7 +197,7 @@ behavior of that Publisher in regards to deferred execution and multiple Subscri
 subscribes, supports multiple Subscribers, and caches the result of a database call
 (the same result of the same call is emitted to each Subscriber).
 - Typically, a Publisher of multiple items defers execution until a Subscriber 
-signals demand, and does not support mulitple subscribers.
+signals demand, and does not support multiple subscribers.
 
 ### Errors
 - The error code of an R2dbcException is an [Oracle Database 
@@ -224,7 +224,7 @@ of each row affected by an INSERT or UPDATE.
   - This behavior may change in a later release.
   - Programmers are advised not to use the ROWID as if it were a primary key.
     - The ROWID of a row may change.
-    - After a row is deleted, it's ROWID may be reassigned to a new row.
+    - After a row is deleted, its ROWID may be reassigned to a new row.
     - Further Reading: https://asktom.oracle.com/pls/apex/asktom.search?tag=is-it-safe-to-use-rowid-to-locate-a-row
 - A **blocking database call** is executed by a Statement returning generated 
 values for a non-empty set of column names.
@@ -324,7 +324,7 @@ The following security guidelines should be followed when programming with the O
   - Option.sensitiveValueOf(OracleConnection.CONNECTION_PROPERTY_THIN_JAVAX_NET_SSL_KEYSTOREPASSWORD)
   - Option.sensitiveValueOf(OracleConnection.CONNECTION_PROPERTY_THIN_JAVAX_NET_SSL_TRUSTSTOREPASSWORD)
 ### Defend Against Denial-of-Service Attacks
-- Use a connection pool and configure a maximum size to limit the amount of database sessions created by ConnectionFactory.create()
+- Use a connection pool and configure a maximum size to limit the number of database sessions created by ConnectionFactory.create()
 - Enforce a maximum batch size to limit invocations of Statement.add() or Batch.add(String).
 - Enforce a maximum fetch size to limit values supplied to Statement.fetchSize(int).
 - Enforce a maximum buffer size to limit memory usage when reading Blob and Clob objects.

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

@@ -489,7 +489,7 @@ private static void configureStandardOptions(
         oracleDataSource.setLoginTimeout(
           Math.toIntExact(timeout.getSeconds())
             // Round up to nearest whole second
-            + timeout.getNano() == 0 ? 0 : 1));
+            + (timeout.getNano() == 0 ? 0 : 1)));
     }
 
   }

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

@@ -29,10 +29,7 @@
 import io.r2dbc.spi.Result;
 import oracle.jdbc.OracleConnection;
 import oracle.jdbc.datasource.OracleDataSource;
-import oracle.jdbc.driver.DatabaseError;
-import oracle.r2dbc.test.DatabaseConfig;
 import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -58,7 +55,6 @@
 import static io.r2dbc.spi.ConnectionFactoryOptions.PORT;
 import static io.r2dbc.spi.ConnectionFactoryOptions.STATEMENT_TIMEOUT;
 import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
-
 import static oracle.r2dbc.test.DatabaseConfig.connectTimeout;
 import static oracle.r2dbc.test.DatabaseConfig.host;
 import static oracle.r2dbc.test.DatabaseConfig.password;
@@ -67,7 +63,6 @@
 import static oracle.r2dbc.test.DatabaseConfig.sharedConnection;
 import static oracle.r2dbc.test.DatabaseConfig.sqlTimeout;
 import static oracle.r2dbc.test.DatabaseConfig.user;
-
 import static oracle.r2dbc.util.Awaits.awaitError;
 import static oracle.r2dbc.util.Awaits.awaitExecution;
 import static oracle.r2dbc.util.Awaits.awaitNone;
@@ -78,6 +73,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Verifies that
@@ -333,7 +329,19 @@ public void testConnectTimeout()
         .option(HOST, "localhost")
         .option(PORT, listeningChannel.socket().getLocalPort())
         .option(DATABASE, serviceName())
-        .option(CONNECT_TIMEOUT, Duration.ofMillis(500L))
+        .option(CONNECT_TIMEOUT, Duration.ofSeconds(2))
+        .build());
+
+      verifyConnectTimeout(listeningChannel, ConnectionFactoryOptions.parse(
+        "r2dbc:oracle://localhost:" + listeningChannel.socket().getLocalPort()
+          + "?connectTimeout=PT2S")); // The value is parsed as a Duration
+
+      verifyConnectTimeout(listeningChannel, ConnectionFactoryOptions.builder()
+        .option(DRIVER, "oracle")
+        .option(HOST, "localhost")
+        .option(PORT, listeningChannel.socket().getLocalPort())
+        .option(DATABASE, serviceName())
+        .option(CONNECT_TIMEOUT, Duration.ofMillis(500))
         .build());
 
       verifyConnectTimeout(listeningChannel, ConnectionFactoryOptions.parse(
@@ -430,8 +438,27 @@ private void verifyConnectTimeout(
 
     // Try to connect
     try {
+      long start = System.currentTimeMillis();
       awaitError(R2dbcTimeoutException.class,
         ConnectionFactories.get(options).create());
+
+      // Compare the actual duration to the configured timeout
+      Duration timeoutDelta =
+        Duration.ofMillis(System.currentTimeMillis() - start)
+          .minus(Duration.parse(
+            options.getValue(Option.valueOf("connectTimeout")).toString()));
+
+      // Expect the actual duration to be at least as much as the configured
+      // timeout
+      if (timeoutDelta.isNegative())
+        fail("Timeout triggered too soon: " + timeoutDelta);
+
+      // Expect the actual duration to be no more than two seconds longer
+      // than the configured timeout. This should be a generous enough offset
+      // to allow for testing on slow systems
+      if (timeoutDelta.toSeconds() > 2)
+        fail("Timeout triggered too late: " + timeoutDelta);
+
     }
     catch (Throwable unexpected) {
       unexpected.printStackTrace();

src/test/java/oracle/r2dbc/test/DatabaseConfig.java

@@ -21,6 +21,7 @@
 
 package oracle.r2dbc.test;
 
+import io.r2dbc.spi.ColumnMetadata;
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
@@ -189,8 +190,9 @@ public static void showErrors(Connection connection) {
         .execute())
         .flatMap(result ->
           result.map((row, metadata) ->
-            metadata.getColumnNames()
+            metadata.getColumnMetadatas()
               .stream()
+              .map(ColumnMetadata::getName)
               .map(name -> name + ": " + row.get(name))
               .collect(Collectors.joining("\n"))))
       .toStream()