Leave OOB enabled by default

Author: Michael-A-McMahon

README.md

@@ -174,6 +174,9 @@ Options. For Options having any of the following names, a CharSequence value may
   - [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.jdbc.defaultLobPrefetchSize](https://docs.oracle.com/en/database/oracle/oracle-database/21/jajdb/oracle/jdbc/OracleConnection.html?is-external=true#CONNECTION_PROPERTY_DEFAULT_LOB_PREFETCH_SIZE)
+  - [oracle.net.disableOob](https://docs.oracle.com/en/database/oracle/oracle-database/21/jajdb/oracle/jdbc/OracleConnection.html?is-external=true#CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK)
+    - Out of band (oob) breaks effect statement timeouts. Set this to  "true"
+    if statement timeouts are not working correctly.
 - 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=...)`

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

@@ -199,13 +199,12 @@ final class OracleReactiveJdbcAdapter implements ReactiveJdbcAdapter {
       Option.valueOf(
         OracleConnection.CONNECTION_PROPERTY_DEFAULT_LOB_PREFETCH_SIZE),
 
-      // Allow out-of-band (OOB) breaks to be enabled. Oracle JDBC uses OOB
-      // breaks to interrupt a SQL call after a timeout expires. OOB is
-      // disabled by default to support databases older than 19.x which are
-      // running on systems that don't support OOB. Starting in 19.x, the
-      // database automatically checks if it is running on a system that
-      // supports OOB, and will disable OOB if it's not supported. This option
-      // can be set to "true" when connecting to database versions 19.x or newer.
+      // Allow out-of-band (OOB) breaks to be disabled. Oracle JDBC uses OOB
+      // breaks to interrupt a SQL call after a timeout expires. This option 
+      // may need to be disabled when connecting to an 18.x database. Starting
+      // in 19.x, the database can detect when it's running on a system where
+      // OOB is not supported and automatically disable OOB. This automated 
+      // detection is not impleneted in 18.x.
       Option.valueOf(
         OracleConnection.CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK)
 
@@ -635,14 +634,6 @@ private static void configureJdbcDefaults(OracleDataSource oracleDataSource) {
       OracleConnection.CONNECTION_PROPERTY_DEFAULT_LOB_PREFETCH_SIZE,
       "1048576");
 
-    // Disable out-of-band breaks by default in case the database version is
-    // 18.x. See the comment above, in the set of
-    // SUPPORTED_CONNECTION_PROPERTY_OPTIONS, for details. The default setting
-    // can be "false" once the 18.x database is no longer supported.
-    setPropertyIfAbsent(oracleDataSource,
-      OracleConnection.CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK,
-      "true");
-
     // TODO: Disable the result set cache? This is needed to support the
     //  SERIALIZABLE isolation level, which requires result set caching to be
     //  disabled.

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

@@ -104,9 +104,6 @@ public void testCreateDataSource() throws SQLException {
     defaultProperties.setProperty(
       OracleConnection.CONNECTION_PROPERTY_DEFAULT_LOB_PREFETCH_SIZE,
       "1048576");
-    defaultProperties.setProperty(
-      OracleConnection.CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK,
-      "true");
 
     // Expect only default connection properties when no extended
     // options are supplied
@@ -367,6 +364,10 @@ public void testStatementTimeout() {
         .option(USER, user())
         .option(PASSWORD, password())
         .option(STATEMENT_TIMEOUT, Duration.ofSeconds(2))
+        // Disable OOB to support testing with an 18.x database
+        .option(Option.valueOf(
+          OracleConnection.CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK),
+          "true")
         .build())
         .create())
         .block(connectTimeout());

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

@@ -248,6 +248,14 @@ public static void showErrors(Connection connection) {
           .option(Option.valueOf(
             OracleConnection.CONNECTION_PROPERTY_IMPLICIT_STATEMENT_CACHE_SIZE),
             0)
+          // Disable out-of-band breaks to support testing with the 18.x
+          // database. The 19.x database will automatically detect when it's
+          // running on a system where OOB is not supported, but the 18.x
+          // database does not do this and so statement timeout tests will
+          // hang if the database system does not support OOB
+          .option(Option.valueOf(
+            OracleConnection.CONNECTION_PROPERTY_THIN_NET_DISABLE_OUT_OF_BAND_BREAK),
+            "true")
           .build());
 
       SHARED_CONNECTION_FACTORY = new SharedConnectionFactory(