Polishing

Adopt to ConnectionContext. Tweak log message wording. Defer Objects.toString(…) until actual logging happens.

[#278][#309]

Author: mp911de

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

@@ -1,20 +1,48 @@
 package io.r2dbc.postgresql;
 
+import io.r2dbc.postgresql.client.ConnectionContext;
 import reactor.util.Logger;
 import reactor.util.Loggers;
 
+import java.util.Objects;
+
 /**
  * Binding logger to log parameter bindings
+ *
+ * @since 0.8.6
  */
 final class BindingLogger {
 
     private static final Logger BINDING_LOGGER = Loggers.getLogger("io.r2dbc.postgresql.PARAM");
 
-    static void logBinding(int index, String bindValue) {
-        BINDING_LOGGER.debug("Parameter {} value bound: {}", index, bindValue);
+    private static final boolean LOGGING_ENABLED = BINDING_LOGGER.isDebugEnabled();
+
+    static void logBind(ConnectionContext connectionContext, int index, Object bindValue) {
+
+        if (LOGGING_ENABLED) {
+            BINDING_LOGGER.debug(connectionContext.getMessage("Bind parameter [{}] to: {}"), index, Objects.toString(bindValue));
+        }
     }
 
-    static void logBinding(String name, String bindValue) {
-        BINDING_LOGGER.debug("Parameter {} value bound: {}", name, bindValue);
+    static void logBind(ConnectionContext connectionContext, String name, Object bindValue) {
+
+        if (LOGGING_ENABLED) {
+            BINDING_LOGGER.debug(connectionContext.getMessage("Bind parameter [{}] to: {}"), name, Objects.toString(bindValue));
+        }
     }
+
+    static void logBindNull(ConnectionContext connectionContext, int index, Class<?> type) {
+
+        if (LOGGING_ENABLED) {
+            BINDING_LOGGER.debug(connectionContext.getMessage("Bind parameter [{}] to null, type: {}"), index, type.getName());
+        }
+    }
+
+    static void logBindNull(ConnectionContext connectionContext, String name, Class<?> type) {
+
+        if (LOGGING_ENABLED) {
+            BINDING_LOGGER.debug(connectionContext.getMessage("Bind parameter [{}] to null, type: {}"), name, type.getName());
+        }
+    }
+
 }

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

@@ -18,6 +18,7 @@
 
 import io.r2dbc.postgresql.api.PostgresqlStatement;
 import io.r2dbc.postgresql.client.Binding;
+import io.r2dbc.postgresql.client.ConnectionContext;
 import io.r2dbc.postgresql.client.ExtendedQueryMessageFlow;
 import io.r2dbc.postgresql.message.backend.BackendMessage;
 import io.r2dbc.postgresql.message.backend.BindComplete;
@@ -31,7 +32,6 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -49,19 +49,22 @@ final class ExtendedQueryPostgresqlStatement implements PostgresqlStatement {
 
     private final Bindings bindings;
 
-    private final ConnectionResources context;
+    private final ConnectionResources resources;
+
+    private final ConnectionContext connectionContext;
 
     private final String sql;
 
     private int fetchSize;
 
     private String[] generatedColumns;
 
-    ExtendedQueryPostgresqlStatement(ConnectionResources context, String sql) {
-        this.context = Assert.requireNonNull(context, "context must not be null");
+    ExtendedQueryPostgresqlStatement(ConnectionResources resources, String sql) {
+        this.resources = Assert.requireNonNull(resources, "context must not be null");
+        this.connectionContext = resources.getClient().getContext();
         this.sql = Assert.requireNonNull(sql, "sql must not be null");
         this.bindings = new Bindings(expectedSize(sql));
-        fetchSize(this.context.getConfiguration().getFetchSize(sql));
+        fetchSize(this.resources.getConfiguration().getFetchSize(sql));
     }
 
     @Override
@@ -75,16 +78,16 @@ public ExtendedQueryPostgresqlStatement bind(String identifier, Object value) {
         Assert.requireNonNull(identifier, "identifier must not be null");
         Assert.requireType(identifier, String.class, "identifier must be a String");
 
-        BindingLogger.logBinding(identifier, Objects.toString(value));
+        BindingLogger.logBind(this.connectionContext, identifier, value);
         return bind(getIndex(identifier), value);
     }
 
     @Override
     public ExtendedQueryPostgresqlStatement bind(int index, Object value) {
         Assert.requireNonNull(value, "value must not be null");
 
-        BindingLogger.logBinding(index, Objects.toString(value));
-        this.bindings.getCurrent().add(index, this.context.getCodecs().encode(value));
+        BindingLogger.logBind(this.connectionContext, index, value);
+        this.bindings.getCurrent().add(index, this.resources.getCodecs().encode(value));
 
         return this;
     }
@@ -95,7 +98,7 @@ public ExtendedQueryPostgresqlStatement bindNull(String identifier, Class<?> typ
         Assert.requireType(identifier, String.class, "identifier must be a String");
         Assert.requireNonNull(type, "type must not be null");
 
-        BindingLogger.logBinding(identifier, "null of type " + type.getName());
+        BindingLogger.logBindNull(this.connectionContext, identifier, type);
         bindNull(getIndex(identifier), type);
         return this;
     }
@@ -104,8 +107,8 @@ public ExtendedQueryPostgresqlStatement bindNull(String identifier, Class<?> typ
     public ExtendedQueryPostgresqlStatement bindNull(int index, Class<?> type) {
         Assert.requireNonNull(type, "type must not be null");
 
-        BindingLogger.logBinding(index, "null of type " + type.getName());
-        this.bindings.getCurrent().add(index, this.context.getCodecs().encodeNull(type));
+        BindingLogger.logBindNull(this.connectionContext, index, type);
+        this.bindings.getCurrent().add(index, this.resources.getCodecs().encodeNull(type));
         return this;
     }
 
@@ -145,7 +148,7 @@ public ExtendedQueryPostgresqlStatement fetchSize(int rows) {
     public String toString() {
         return "ExtendedQueryPostgresqlStatement{" +
             "bindings=" + this.bindings +
-            ", context=" + this.context +
+            ", context=" + this.resources +
             ", sql='" + this.sql + '\'' +
             ", generatedColumns=" + Arrays.toString(this.generatedColumns) +
             '}';
@@ -179,9 +182,9 @@ private Flux<io.r2dbc.postgresql.api.PostgresqlResult> execute(String sql) {
         this.bindings.finish();
 
         ExceptionFactory factory = ExceptionFactory.withSql(sql);
-        return this.context.getStatementCache().getName(this.bindings.first(), sql)
+        return this.resources.getStatementCache().getName(this.bindings.first(), sql)
             .flatMapMany(name -> Flux.fromIterable(this.bindings.bindings).map(binding -> {
-                return createPostgresqlResult(sql, factory, name, binding, this.context, this.fetchSize);
+                return createPostgresqlResult(sql, factory, name, binding, this.resources, this.fetchSize);
             }))
             .cast(io.r2dbc.postgresql.api.PostgresqlResult.class);
     }

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

@@ -19,6 +19,7 @@
 import io.r2dbc.postgresql.api.PostgresqlConnection;
 import io.r2dbc.postgresql.client.Client;
 import io.r2dbc.postgresql.client.PortalNameSupplier;
+import io.r2dbc.postgresql.client.TestClient;
 import io.r2dbc.postgresql.codec.Codecs;
 import io.r2dbc.postgresql.codec.MockCodecs;
 
@@ -39,7 +40,7 @@ public static final class Builder {
 
         private Codecs codecs = MockCodecs.empty();
 
-        private Client client;
+        private Client client = TestClient.NO_OP;
 
         private PostgresqlConnection connection;