Subtyping OracleR2dbcWarning as a Message

Author: Michael-A-McMahon

src/main/java/oracle/r2dbc/OracleR2dbcWarning.java

@@ -53,29 +53,6 @@
  * }</pre>
  * @since 1.1.0
  */
-public interface OracleR2dbcWarning extends Result.Segment {
+public interface OracleR2dbcWarning extends Result.Message {
 
-  /**
-   * Returns the warning as an {@link R2dbcException}.
-   * @return The warning as an {@link R2dbcException}. Not null.
-   */
-  R2dbcException exception();
-
-  /**
-   * Returns the error code of the warning.
-   * @return The error code of the warning.
-   */
-  int errorCode();
-
-  /**
-   * Returns the SQLState of the warning.
-   * @return The SQLState of the warning. Not null.
-   */
-  String sqlState();
-
-  /**
-   * Returns the text of the warning message.
-   * @return The text of the warning message. Not null.
-   */
-  String message();
 }

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

@@ -151,6 +151,8 @@ private <T extends Segment, U> Publisher<U> publishSegments(
       Flux.from(publishSegments(segment -> {
         if (type.isInstance(segment))
           return mappingFunction.apply(type.cast(segment));
+        else if (segment instanceof OracleR2dbcWarning)
+          return (U)FILTERED;
         else if (segment instanceof Message)
           throw ((Message)segment).exception();
         else
@@ -784,7 +786,7 @@ public long value() {
   /**
    * Implementation of {@link Message}.
    */
-  private static final class MessageImpl implements Message {
+  private static class MessageImpl implements Message {
 
     private final R2dbcException exception;
 
@@ -811,38 +813,24 @@ public String sqlState() {
     public String message() {
       return exception.getMessage();
     }
+
+    @Override
+    public String toString() {
+      return exception.toString();
+    }
   }
 
   /**
    * Implementation of {@link OracleR2dbcWarning}.
    */
-  private static final class WarningImpl implements OracleR2dbcWarning {
-
-    private final R2dbcException warning;
+  private static final class WarningImpl
+    extends MessageImpl
+    implements OracleR2dbcWarning {
 
     private WarningImpl(R2dbcException exception) {
-      this.warning = exception;
-    }
-
-    @Override
-    public R2dbcException exception() {
-      return warning;
-    }
-
-    @Override
-    public int errorCode() {
-      return warning.getErrorCode();
-    }
-
-    @Override
-    public String sqlState() {
-      return warning.getSqlState();
+      super(exception);
     }
 
-    @Override
-    public String message() {
-      return warning.getMessage();
-    }
   }
 
   /**

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

@@ -54,13 +54,13 @@
 import static oracle.r2dbc.util.Awaits.awaitMany;
 import static oracle.r2dbc.util.Awaits.awaitNone;
 import static oracle.r2dbc.util.Awaits.awaitOne;
+import static oracle.r2dbc.util.Awaits.awaitUpdate;
 import static oracle.r2dbc.util.Awaits.consumeOne;
 import static oracle.r2dbc.util.Awaits.tryAwaitExecution;
 import static oracle.r2dbc.util.Awaits.tryAwaitNone;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -631,8 +631,8 @@ else if (index == 1) {
   }
 
   /**
-   * Verifies that a warnings are emitted as {@code Message} segments with an
-   * {@link oracle.r2dbc.OracleR2dbcWarning}.
+   * Verifies that a warnings are emitted as
+   * {@link oracle.r2dbc.OracleR2dbcWarning} segments.
    */
   @Test
   public void testOracleR2dbcWarning() {
@@ -642,7 +642,7 @@ public void testOracleR2dbcWarning() {
       // Expect a warning for forcing a view that references a non-existent
       // table
       String sql = "CREATE OR REPLACE FORCE VIEW testOracleR2dbcWarning AS" +
-          " SELECT x FROM thisdoesnotexist";
+        " SELECT x FROM thisdoesnotexist";
       Statement warningStatement = connection.createStatement(sql);
 
       // Collect the segments
@@ -684,4 +684,68 @@ public void testOracleR2dbcWarning() {
     }
   }
 
+  /**
+   * Verifies that a warnings are not emitted as onError signals
+   */
+  @Test
+  public void testOracleR2dbcWarningIgnored() {
+    Connection connection = awaitOne(sharedConnection());
+    try {
+
+      // Expect a warning for forcing a view that references a non-existent
+      // table
+      String sql =
+        "CREATE OR REPLACE FORCE VIEW testOracleR2dbcWarningIgnored AS" +
+          " SELECT x FROM thisdoesnotexist";
+      Statement warningStatement = connection.createStatement(sql);
+
+      // Verify that an update count of 0 is returned.
+      awaitUpdate(0, warningStatement);
+
+      // Verify that no rows are returned
+      awaitNone(
+        awaitOne(warningStatement.execute())
+          .map(row -> "UNEXPECTED ROW"));
+
+      // Verify that no rows are returned
+      awaitNone(
+        awaitOne(warningStatement.execute())
+          .map((row, metadata) -> "UNEXPECTED ROW WITH METADATA"));
+    }
+    finally {
+      tryAwaitExecution(
+        connection.createStatement("DROP VIEW testOracleR2dbcWarningIgnored"));
+      tryAwaitNone(connection.close());
+    }
+  }
+
+  /**
+   * Verifies that {@link Result#flatMap(Function)} may be used to convert
+   * warnings into onError signals
+   */
+  @Test
+  public void testOracleR2dbcWarningNotIgnored() {
+    Connection connection = awaitOne(sharedConnection());
+    try {
+
+      // Expect a warning for forcing a view that references a non-existent
+      // table
+      String sql =
+        "CREATE OR REPLACE FORCE VIEW testOracleR2dbcWarningIgnored AS" +
+          " SELECT x FROM thisdoesnotexist";
+      Statement warningStatement = connection.createStatement(sql);
+      awaitError(
+        R2dbcException.class,
+        awaitOne(warningStatement.execute())
+          .flatMap(segment ->
+            Mono.error(
+              assertInstanceOf(OracleR2dbcWarning.class, segment).exception())));
+    }
+    finally {
+      tryAwaitExecution(
+        connection.createStatement("DROP VIEW testOracleR2dbcWarningIgnored"));
+      tryAwaitNone(connection.close());
+    }
+  }
+
 }