Polishing.

Fix benchmarks after polishing.

[#444][#409]

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

Author: mp911de

src/jmh/java/io/r2dbc/postgresql/CodecRegistryBenchmarks.java renamed to src/jmh/java/io/r2dbc/postgresql/codec/CodecRegistryBenchmarks.java

@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package io.r2dbc.postgresql;
+package io.r2dbc.postgresql.codec;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.UnpooledByteBufAllocator;
-import io.r2dbc.postgresql.codec.CodecFinderCacheImpl;
-import io.r2dbc.postgresql.codec.CodecFinderDefaultImpl;
-import io.r2dbc.postgresql.codec.Codecs;
-import io.r2dbc.postgresql.codec.DefaultCodecs;
+import io.r2dbc.postgresql.BenchmarkSettings;
 import io.r2dbc.postgresql.util.ByteBufUtils;
 import org.junit.platform.commons.annotation.Testable;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -65,9 +62,9 @@ public static class CodecRegistryHolder {
 
         final ByteBufAllocator byteBufAllocator = new UnpooledByteBufAllocator(false, true);
 
-        DefaultCodecs cacheEnabledRegistry = new DefaultCodecs(byteBufAllocator, false, new CodecFinderCacheImpl());
+        DefaultCodecs cacheEnabledRegistry = new DefaultCodecs(this.byteBufAllocator, false, CachedCodecLookup::new);
 
-        DefaultCodecs cacheDisabledRegistry = new DefaultCodecs(byteBufAllocator, false, new CodecFinderDefaultImpl());
+        DefaultCodecs cacheDisabledRegistry = new DefaultCodecs(this.byteBufAllocator, false, DefaultCodecLookup::new);
 
     }
 
@@ -135,4 +132,4 @@ public void encodeWithCacheDisabledRegistry(CodecRegistryHolder holder, Blackhol
         encode(holder.cacheDisabledRegistry, holder.iterations, voodoo);
     }
 
-}
+}

src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java

@@ -32,6 +32,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Function;
 
 import static io.r2dbc.postgresql.client.EncodedParameter.NULL_VALUE;
 
@@ -74,13 +75,13 @@ public DefaultCodecs(ByteBufAllocator byteBufAllocator, boolean preferAttachedBu
      *
      * @param byteBufAllocator      the {@link ByteBufAllocator} to use for encoding
      * @param preferAttachedBuffers whether to prefer attached (pooled) {@link ByteBuf buffers}. Use {@code false} (default) to use detached buffers which minimize the risk of memory leaks.
-     * @param codecLookup           the {@link CodecLookup} to use for finding relevant codecs
+     * @param codecLookupFunction   provides the {@link CodecLookup} to use for finding relevant codecs
      */
-    DefaultCodecs(ByteBufAllocator byteBufAllocator, boolean preferAttachedBuffers, CodecLookup codecLookup) {
+    DefaultCodecs(ByteBufAllocator byteBufAllocator, boolean preferAttachedBuffers, Function<CodecRegistry, CodecLookup> codecLookupFunction) {
         Assert.requireNonNull(byteBufAllocator, "byteBufAllocator must not be null");
-        Assert.requireNonNull(codecLookup, "codecFinder must not be null");
+        Assert.requireNonNull(codecLookupFunction, "codecLookupFunction must not be null");
 
-        this.codecLookup = codecLookup;
+        this.codecLookup = codecLookupFunction.apply(this);
         this.codecs = getDefaultCodecs(byteBufAllocator, preferAttachedBuffers);
         this.codecLookup.afterCodecAdded();
     }