Upgrade to R2DBC SPI 0.9 M2

[closes #212]

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

Author: mp911de

pom.xml

@@ -45,8 +45,8 @@
         <mssql-jdbc.version>9.2.0.jre8</mssql-jdbc.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <r2dbc-spi.version>0.9.0.BUILD-SNAPSHOT</r2dbc-spi.version>
-        <r2dbc-pool.version>0.9.0.M1</r2dbc-pool.version>
+        <r2dbc-spi.version>0.9.0.M2</r2dbc-spi.version>
+        <r2dbc-pool.version>0.9.0.BUILD-SNAPSHOT</r2dbc-pool.version>
         <reactor.version>2020.0.4</reactor.version>
         <spring-framework.version>5.2.9.RELEASE</spring-framework.version>
         <testcontainers.version>1.15.3</testcontainers.version>

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

@@ -313,6 +313,16 @@ public Mono<Void> setAutoCommit(boolean autoCommit) {
         });
     }
 
+    @Override
+    public Publisher<Void> setLockWaitTimeout(Duration timeout) {
+        throw new UnsupportedOperationException("https://github.com/r2dbc/r2dbc-mssql/issues/214");
+    }
+
+    @Override
+    public Publisher<Void> setStatementTimeout(Duration timeout) {
+        throw new UnsupportedOperationException("https://github.com/r2dbc/r2dbc-mssql/issues/213");
+    }
+
     @Override
     public MssqlConnectionMetadata getMetadata() {
         return this.metadata;

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

@@ -153,16 +153,16 @@ public MssqlConnectionFactory create(ConnectionFactoryOptions connectionFactoryO
 
         OptionMapper mapper = OptionMapper.create(connectionFactoryOptions);
 
-        mapper.from(APPLICATION_NAME).to(builder::applicationName);
+        mapper.fromTyped(APPLICATION_NAME).to(builder::applicationName);
         mapper.from(CONNECTION_ID).map(OptionMapper::toUuid).to(builder::connectionId);
         mapper.from(CONNECT_TIMEOUT).map(OptionMapper::toDuration).to(builder::connectTimeout);
-        mapper.from(DATABASE).to(builder::database);
-        mapper.from(HOSTNAME_IN_CERTIFICATE).to(builder::hostNameInCertificate);
+        mapper.fromTyped(DATABASE).to(builder::database);
+        mapper.fromTyped(HOSTNAME_IN_CERTIFICATE).to(builder::hostNameInCertificate);
         mapper.from(PORT).map(OptionMapper::toInteger).to(builder::port);
         mapper.from(PREFER_CURSORED_EXECUTION).map(OptionMapper::toStringPredicate).to(builder::preferCursoredExecution);
         mapper.from(SEND_STRING_PARAMETERS_AS_UNICODE).map(OptionMapper::toBoolean).to(builder::sendStringParametersAsUnicode);
         mapper.from(SSL).to(builder::enableSsl);
-        mapper.from(SSL_CONTEXT_BUILDER_CUSTOMIZER).to(builder::sslContextBuilderCustomizer);
+        mapper.fromTyped(SSL_CONTEXT_BUILDER_CUSTOMIZER).to(builder::sslContextBuilderCustomizer);
         mapper.from(SSL_TUNNEL).map(it -> {
 
             if (it instanceof Boolean) {
@@ -185,12 +185,12 @@ public MssqlConnectionFactory create(ConnectionFactoryOptions connectionFactoryO
         mapper.from(TCP_NODELAY).map(OptionMapper::toBoolean).to(builder::tcpNoDelay);
         mapper.from(TRUST_SERVER_CERTIFICATE).map(OptionMapper::toBoolean).to((Consumer<Boolean>) builder::trustServerCertificate);
         mapper.from(TRUST_STORE).map(OptionMapper::toFile).to(builder::trustStore);
-        mapper.from(TRUST_STORE_TYPE).to(builder::trustStoreType);
+        mapper.fromTyped(TRUST_STORE_TYPE).to(builder::trustStoreType);
         mapper.from(TRUST_STORE_PASSWORD).map(it -> it instanceof String ? ((String) it).toCharArray() : (char[]) it).to(builder::trustStorePassword);
 
-        builder.host(connectionFactoryOptions.getRequiredValue(HOST));
-        builder.password(connectionFactoryOptions.getRequiredValue(PASSWORD));
-        builder.username(connectionFactoryOptions.getRequiredValue(USER));
+        builder.host(connectionFactoryOptions.getRequiredValue(HOST).toString());
+        builder.password((CharSequence) connectionFactoryOptions.getRequiredValue(PASSWORD));
+        builder.username(connectionFactoryOptions.getRequiredValue(USER).toString());
 
         MssqlConnectionConfiguration configuration = builder.build();
         if (this.logger.isDebugEnabled()) {
@@ -204,7 +204,7 @@ public boolean supports(ConnectionFactoryOptions connectionFactoryOptions) {
 
         Assert.requireNonNull(connectionFactoryOptions, "connectionFactoryOptions must not be null");
 
-        String driver = connectionFactoryOptions.getValue(DRIVER);
+        Object driver = connectionFactoryOptions.getValue(DRIVER);
         if (driver == null || !(driver.equals(MSSQL_DRIVER) || driver.equals(ALTERNATE_MSSQL_DRIVER))) {
             return false;
         }

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

@@ -59,7 +59,7 @@ public static OptionMapper create(ConnectionFactoryOptions options) {
      * @param <T>    inferred option type.
      * @return the source object.
      */
-    public <T> Source<T> from(Option<T> option) {
+    public Source<Object> from(Option<?> option) {
 
         if (this.options.hasOption(option)) {
 
@@ -71,6 +71,26 @@ public <T> Source<T> from(Option<T> option) {
         return NullSource.instance();
     }
 
+    /**
+     * Construct a new {@link Source} for a {@link Option} using type inference. Options without a value are not bound or mapped in the later stages of {@link Source}.
+     *
+     * @param option the option to apply.
+     * @param <T>    inferred option type.
+     * @return the source object.
+     */
+    @SuppressWarnings("unchecked")
+    public <T> Source<T> fromTyped(Option<T> option) {
+
+        if (this.options.hasOption(option)) {
+
+            return new AvailableSource<>(() -> {
+                return (T) this.options.getRequiredValue(option);
+            }, option.name());
+        }
+
+        return NullSource.instance();
+    }
+
     /**
      * Parse an {@link Option} to boolean.
      */