Align Statement.bind(…) and Readable.get(…) exceptions with specification.

We now throw the correct exception type according to the spec.

[resolves #456][r2dbc/r2dbc-spi#184]

Signed-off-by: Mark Paluch <[email protected]>

Author: mp911de

pom.xml

@@ -47,7 +47,7 @@
         <postgresql.version>42.2.24</postgresql.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <r2dbc-spi.version>0.9.0.M2</r2dbc-spi.version>
+        <r2dbc-spi.version>0.9.0.BUILD-SNAPSHOT</r2dbc-spi.version>
         <reactor.version>2020.0.11</reactor.version>
         <scram-client.version>2.1</scram-client.version>
         <spring-framework.version>5.3.10</spring-framework.version>

src/main/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatement.java

@@ -36,6 +36,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
@@ -252,7 +253,7 @@ private int getIndex(String identifier) {
         Matcher matcher = PARAMETER_SYMBOL.matcher(identifier);
 
         if (!matcher.find()) {
-            throw new IllegalArgumentException(String.format("Identifier '%s' is not a valid identifier. Should be of the pattern '%s'.", identifier, PARAMETER_SYMBOL.pattern()));
+            throw new NoSuchElementException(String.format("Identifier '%s' is not a valid identifier. Should be of the pattern '%s'.", identifier, PARAMETER_SYMBOL.pattern()));
         }
 
         return Integer.parseInt(matcher.group(1)) - 1;

src/main/java/io/r2dbc/postgresql/PostgresqlRow.java

@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
@@ -172,7 +173,7 @@ private int getColumn(String name) {
             }
         }
 
-        throw new IllegalArgumentException(String.format("Column name '%s' does not exist in column names %s", name, toColumnNames()));
+        throw new NoSuchElementException(String.format("Column name '%s' does not exist in column names %s", name, toColumnNames()));
     }
 
     private List<String> toColumnNames() {
@@ -187,7 +188,7 @@ private List<String> toColumnNames() {
 
     private int getColumn(int index) {
         if (index >= this.fields.size()) {
-            throw new IllegalArgumentException(String.format("Column index %d is larger than the number of columns %d", index, this.fields.size()));
+            throw new IndexOutOfBoundsException(String.format("Column index %d is larger than the number of columns %d", index, this.fields.size()));
         }
 
         return index;

src/main/java/io/r2dbc/postgresql/PostgresqlRowMetadata.java

@@ -30,6 +30,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
@@ -55,7 +56,7 @@ final class PostgresqlRowMetadata extends AbstractCollection<String> implements
     @Override
     public PostgresqlColumnMetadata getColumnMetadata(int index) {
         if (index >= this.columnMetadatas.size()) {
-            throw new IllegalArgumentException(String.format("Column index %d is larger than the number of columns %d", index, this.columnMetadatas.size()));
+            throw new IndexOutOfBoundsException(String.format("Column index %d is larger than the number of columns %d", index, this.columnMetadatas.size()));
         }
 
         return this.columnMetadatas.get(index);
@@ -72,7 +73,7 @@ public PostgresqlColumnMetadata getColumnMetadata(String name) {
             }
         }
 
-        throw new IllegalArgumentException(String.format("Column name '%s' does not exist in column names %s", name, getColumnNames()));
+        throw new NoSuchElementException(String.format("Column name '%s' does not exist in column names %s", name, getColumnNames()));
     }
 
     @Override

src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementUnitTests.java

@@ -44,6 +44,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
+import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 
@@ -52,6 +53,7 @@
 import static io.r2dbc.postgresql.message.Format.FORMAT_BINARY;
 import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.ArgumentMatchers.any;
@@ -128,13 +130,13 @@ void bindNullNoType() {
 
     @Test
     void bindNullWrongIdentifierFormat() {
-        assertThatIllegalArgumentException().isThrownBy(() -> this.statement.bindNull("foo", Integer.class))
+        assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(() -> this.statement.bindNull("foo", Integer.class))
             .withMessage("Identifier 'foo' is not a valid identifier. Should be of the pattern '\\$([\\d]+)'.");
     }
 
     @Test
     void bindWrongIdentifierFormat() {
-        assertThatIllegalArgumentException().isThrownBy(() -> this.statement.bind("foo", ""))
+        assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(() -> this.statement.bind("foo", ""))
             .withMessage("Identifier 'foo' is not a valid identifier. Should be of the pattern '\\$([\\d]+)'.");
     }
 

src/test/java/io/r2dbc/postgresql/PostgresqlRowMetadataUnitTests.java

@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -55,13 +56,13 @@ void getColumnMetadataIndex() {
 
     @Test
     void getColumnMetadataInvalidIndex() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new PostgresqlRowMetadata(this.columnMetadatas).getColumnMetadata(2))
+        assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> new PostgresqlRowMetadata(this.columnMetadatas).getColumnMetadata(2))
             .withMessage("Column index 2 is larger than the number of columns 2");
     }
 
     @Test
     void getColumnMetadataInvalidName() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new PostgresqlRowMetadata(this.columnMetadatas).getColumnMetadata("test-name-3"))
+        assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(() -> new PostgresqlRowMetadata(this.columnMetadatas).getColumnMetadata("test-name-3"))
             .withMessage("Column name 'test-name-3' does not exist in column names [test-name-2, test-name-1]");
     }
 

src/test/java/io/r2dbc/postgresql/PostgresqlRowUnitTests.java

@@ -25,11 +25,13 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 import static io.r2dbc.postgresql.message.Format.FORMAT_BINARY;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
 import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.Mockito.mock;
@@ -98,15 +100,17 @@ void getIndex() {
 
     @Test
     void getInvalidIndex() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new PostgresqlRow(MockContext.empty(), new PostgresqlRowMetadata(Collections.emptyList()), this.columns, new ByteBuf[0]).get(3,
-            Object.class))
+        assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> new PostgresqlRow(MockContext.empty(), new PostgresqlRowMetadata(Collections.emptyList()), this.columns,
+                new ByteBuf[0]).get(3,
+                Object.class))
             .withMessage("Column index 3 is larger than the number of columns 3");
     }
 
     @Test
     void getInvalidName() {
-        assertThatIllegalArgumentException().isThrownBy(() -> new PostgresqlRow(MockContext.empty(), new PostgresqlRowMetadata(Collections.emptyList()), this.columns, new ByteBuf[0]).get("test-name" +
-            "-4", Object.class))
+        assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(() -> new PostgresqlRow(MockContext.empty(), new PostgresqlRowMetadata(Collections.emptyList()), this.columns,
+                new ByteBuf[0]).get("test-name" +
+                "-4", Object.class))
             .withMessageMatching("Column name 'test-name-4' does not exist in column names \\[test-name-[\\d], test-name-[\\d], test-name-[\\d]\\]");
     }