Netty ByteBufProxy should be accessed via a static final field (#152)

benalexau · benalexau · commit c3920de8e8e2 · 2020-05-20T09:13:07.000+10:00
diff --git a/src/main/java/org/lmdbjava/ByteBufProxy.java b/src/main/java/org/lmdbjava/ByteBufProxy.java
@@ -38,6 +38,13 @@
  */
 public final class ByteBufProxy extends BufferProxy<ByteBuf> {
 
+  /**
+   * A proxy for using Netty {@link ByteBuf}. Guaranteed to never be null,
+   * although a class initialization exception will occur if an attempt is made
+   * to access this field when Netty is unavailable.
+   */
+  public static final BufferProxy<ByteBuf> PROXY_NETTY = new ByteBufProxy();
+
   private static final long ADDRESS_OFFSET;
 
   /**
@@ -66,6 +73,9 @@ public final class ByteBufProxy extends BufferProxy<ByteBuf> {
     }
   }
 
+  private ByteBufProxy() {
+  }
+
   static Field findField(final String c, final String name) {
     Class<?> clazz;
     try {
diff --git a/src/test/java/org/lmdbjava/ComparatorTest.java b/src/test/java/org/lmdbjava/ComparatorTest.java
@@ -208,7 +208,7 @@ public int compare(final byte[] o1, final byte[] o2) {
       final ByteBuf o2b = DEFAULT.directBuffer(o2.length);
       o1b.writeBytes(o1);
       o2b.writeBytes(o2);
-      return new ByteBufProxy().compare(o1b, o2b);
+      return ByteBufProxy.PROXY_NETTY.compare(o1b, o2b);
     }
   }
 
diff --git a/src/test/java/org/lmdbjava/CursorParamTest.java b/src/test/java/org/lmdbjava/CursorParamTest.java
@@ -40,6 +40,7 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 import static org.lmdbjava.ByteArrayProxy.PROXY_BA;
+import static org.lmdbjava.ByteBufProxy.PROXY_NETTY;
 import static org.lmdbjava.ByteBufferProxy.PROXY_OPTIMAL;
 import static org.lmdbjava.ByteBufferProxy.PROXY_SAFE;
 import static org.lmdbjava.DbiFlags.MDB_CREATE;
@@ -287,7 +288,7 @@ public void set(final DirectBuffer buff, final int val) {
   private static class NettyBufferRunner extends AbstractBufferRunner<ByteBuf> {
 
     NettyBufferRunner() {
-      super(new ByteBufProxy());
+      super(PROXY_NETTY);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public int compare(final byte[] o1, final byte[] o2) {`
`208`	`208`	`final ByteBuf o2b = DEFAULT.directBuffer(o2.length);`
`209`	`209`	`o1b.writeBytes(o1);`
`210`	`210`	`o2b.writeBytes(o2);`
`211`		`- return new ByteBufProxy().compare(o1b, o2b);`
	`211`	`+ return ByteBufProxy.PROXY_NETTY.compare(o1b, o2b);`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`