Refactor ColumnSource to NamedCollectionSupport

Signed-off-by: Mark Paluch <mpaluch@vmware.com>

[#199]

Author: mp911de

src/main/java/io/r2dbc/mssql/ColumnSource.java

@@ -26,10 +26,10 @@
  *
  * @author Mark Paluch
  */
-final class EscapeAwareColumnMatcher {
+final class EscapeAwareNameMatcher {
 
     @Nullable
-    public static String findColumn(String name, Collection<String> names) {
+    public static String find(String name, Collection<String> names) {
 
         for (String s : names) {
             if (matches(name, s)) {

src/main/java/io/r2dbc/mssql/EscapeAwareColumnMatcher.java renamed to src/main/java/io/r2dbc/mssql/EscapeAwareNameMatcher.java

@@ -17,7 +17,7 @@
 package io.r2dbc.mssql;
 
 import io.r2dbc.mssql.codec.Codecs;
-import io.r2dbc.mssql.message.token.Column;
+import io.r2dbc.mssql.codec.Decodable;
 import io.r2dbc.mssql.message.type.TypeInformation;
 import io.r2dbc.mssql.util.Assert;
 import io.r2dbc.spi.ColumnMetadata;
@@ -27,30 +27,30 @@
 import javax.annotation.Nonnull;
 
 /**
- * Microsoft SQL Server-specific {@link ColumnMetadata} based on {@link Column}.
+ * Microsoft SQL Server-specific {@link ColumnMetadata} based on {@link Decodable}.
  *
  * @author Mark Paluch
  */
 public final class MssqlColumnMetadata implements ColumnMetadata {
 
-    private final Column column;
+    private final Decodable decodable;
 
     private final Codecs codecs;
 
     /**
      * Creates a new {@link MssqlColumnMetadata}.
      *
-     * @param column the column.
-     * @param codecs the {@link Codecs codec registry}
+     * @param decodable the column.
+     * @param codecs    the {@link Codecs codec registry}
      */
-    MssqlColumnMetadata(Column column, Codecs codecs) {
-        this.column = Assert.requireNonNull(column, "Column must not be null");
+    MssqlColumnMetadata(Decodable decodable, Codecs codecs) {
+        this.decodable = Assert.requireNonNull(decodable, "Decodable must not be null");
         this.codecs = Assert.requireNonNull(codecs, "Codecs must not be null");
     }
 
     @Override
     public String getName() {
-        return this.column.getName();
+        return this.decodable.getName();
     }
 
     @Override
@@ -81,7 +81,7 @@ public Type getType() {
     @Override
     @Nonnull
     public TypeInformation getNativeTypeMetadata() {
-        return this.column.getType();
+        return this.decodable.getType();
     }
 
 }

src/main/java/io/r2dbc/mssql/MssqlColumnMetadata.java

@@ -95,7 +95,7 @@ public <T> T get(int index, Class<T> type) {
         Assert.requireNonNull(type, "Type must not be null");
         requireNotReleased();
 
-        Column column = this.metadata.getColumn(index);
+        Column column = this.metadata.get(index);
         return doGet(column, type);
     }
 
@@ -106,7 +106,7 @@ public <T> T get(String name, Class<T> type) {
         Assert.requireNonNull(type, "Type must not be null");
         requireNotReleased();
 
-        Column column = this.metadata.getColumn(name);
+        Column column = this.metadata.get(name);
         return doGet(column, type);
     }