Invert creation of datatype coder to avoid issue with modularization …

…without needing to export org.firebirdsql.gds.ng.jna
FirebirdSQL · Jul 7, 2023 · 4589a7f · 4589a7f
1 parent 4635594
commit 4589a7f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 38 deletions.
diff --git a/jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/BigEndianDatatypeCoder.java b/jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/BigEndianDatatypeCoder.java
@@ -40,7 +40,7 @@ public final class BigEndianDatatypeCoder extends DefaultDatatypeCoder {
      * @return datatype coder, this might be a cached instance
      */
     public static BigEndianDatatypeCoder forEncodingFactory(IEncodingFactory encodingFactory) {
-        return encodingFactory.getOrCreateDatatypeCoder(BigEndianDatatypeCoder.class);
+        return encodingFactory.getOrCreateDatatypeCoder(BigEndianDatatypeCoder.class, BigEndianDatatypeCoder::new);
     }
 
     /**

diff --git a/jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/LittleEndianDatatypeCoder.java b/jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/LittleEndianDatatypeCoder.java
@@ -40,7 +40,8 @@ public final class LittleEndianDatatypeCoder extends DefaultDatatypeCoder {
      * @return datatype coder, this might be a cached instance
      */
     public static LittleEndianDatatypeCoder forEncodingFactory(IEncodingFactory encodingFactory) {
-        return encodingFactory.getOrCreateDatatypeCoder(LittleEndianDatatypeCoder.class);
+        return encodingFactory
+                .getOrCreateDatatypeCoder(LittleEndianDatatypeCoder.class, LittleEndianDatatypeCoder::new);
     }
 
     /**

diff --git a/src/docs/asciidoc/release_notes.adoc b/src/docs/asciidoc/release_notes.adoc
@@ -1135,6 +1135,9 @@ use `StringArgument(int, ArgumentType, String, Encoding)`
 * `FBConnection`
 ** `checkClientInfoSupport()` was removed;
 there is no replacement
+* `IEncodingFactory`
+** `<T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T>)` was removed;
+its replacements is `<T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T>, Function<IEncodingFactory, T>)` where the function is a factory for the desired `DatatypeCoder` instance if it doesn't already exist.
 
 [#breaking-changes-unlikely]
 === Unlikely breaking changes

diff --git a/src/main/org/firebirdsql/encodings/ConnectionEncodingFactory.java b/src/main/org/firebirdsql/encodings/ConnectionEncodingFactory.java
@@ -24,6 +24,7 @@
 import java.nio.charset.Charset;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 /**
  * Implementation of {@link IEncodingFactory} that wraps an {@link EncodingFactory} to
@@ -176,13 +177,11 @@ public IEncodingFactory withDefaultEncodingDefinition(Charset charset) {
         return withDefaultEncodingDefinition(getEncodingDefinitionByCharset(charset));
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass) {
-        return (T) datatypeCoderCache.computeIfAbsent(datatypeCoderClass, this::createNewDatatypeCoder);
+    public <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass,
+            Function<IEncodingFactory, T> datatypeCoderFactory) {
+        return datatypeCoderClass.cast(
+                datatypeCoderCache.computeIfAbsent(datatypeCoderClass, clazz -> datatypeCoderFactory.apply(this)));
     }
 
-    private <T extends DatatypeCoder> T createNewDatatypeCoder(Class<T> datatypeCoderClass) {
-        return EncodingFactory.createNewDatatypeCoder(datatypeCoderClass, this);
-    }
 }
diff --git a/src/main/org/firebirdsql/encodings/EncodingFactory.java b/src/main/org/firebirdsql/encodings/EncodingFactory.java
@@ -20,16 +20,15 @@
 
 import org.firebirdsql.gds.ISCConstants;
 import org.firebirdsql.gds.ng.DatatypeCoder;
-import org.firebirdsql.gds.ng.DefaultDatatypeCoder;
 import org.firebirdsql.jaybird.util.PluginLoader;
 
-import java.lang.reflect.Constructor;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.WARNING;
@@ -314,31 +313,11 @@ public IEncodingFactory withDefaultEncodingDefinition(Charset charset) {
         return withDefaultEncodingDefinition(getEncodingDefinitionByCharset(charset));
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass) {
-        return (T) datatypeCoderCache.computeIfAbsent(datatypeCoderClass, this::createNewDatatypeCoder);
-    }
-
-    private <T extends DatatypeCoder> T createNewDatatypeCoder(Class<T> datatypeCoderClass) {
-        return createNewDatatypeCoder(datatypeCoderClass, this);
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    static <T extends DatatypeCoder> T createNewDatatypeCoder(Class<T> datatypeCoderClass,
-            IEncodingFactory encodingFactory) {
-        // Avoid reflection if we can:
-        if (datatypeCoderClass == DefaultDatatypeCoder.class) {
-            return (T) new DefaultDatatypeCoder(encodingFactory);
-        } else {
-            try {
-                Constructor<T> datatypeCoderConstructor = datatypeCoderClass.getConstructor(IEncodingFactory.class);
-                return datatypeCoderConstructor.newInstance(encodingFactory);
-            } catch (ReflectiveOperationException e) {
-                throw new IllegalArgumentException("Type " + datatypeCoderClass +
-                        " has no single arg constructor accepting an IEncodingFactory");
-            }
-        }
+    public <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass,
+            Function<IEncodingFactory, T> datatypeCoderFactory) {
+        return datatypeCoderClass.cast(
+                datatypeCoderCache.computeIfAbsent(datatypeCoderClass, clazz -> datatypeCoderFactory.apply(this)));
     }
 
     /**

diff --git a/src/main/org/firebirdsql/encodings/IEncodingFactory.java b/src/main/org/firebirdsql/encodings/IEncodingFactory.java
@@ -21,6 +21,7 @@
 import org.firebirdsql.gds.ng.DatatypeCoder;
 
 import java.nio.charset.Charset;
+import java.util.function.Function;
 
 /**
  * Interface for the EncodingFactory.
@@ -228,10 +229,15 @@ public interface IEncodingFactory {
      * </p>
      *
      * @param datatypeCoderClass
-     *         Type of datatype coder, needs to have a single-arg constructor accepting an {@code IEncodingFactory}.
+     *         type of datatype coder
+     * @param datatypeCoderFactory
+     *         function for creating the datatype coder if it doesn't already exist
      * @param <T>
-     *         Type parameter of type {@link DatatypeCoder}
+     *         type parameter of type {@link DatatypeCoder}
      * @return New or cached instance of datatype coder
+     * @since 6
      */
-    <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass);
+    <T extends DatatypeCoder> T getOrCreateDatatypeCoder(Class<T> datatypeCoderClass,
+            Function<IEncodingFactory, T> datatypeCoderFactory);
+
 }
diff --git a/src/main/org/firebirdsql/gds/ng/DefaultDatatypeCoder.java b/src/main/org/firebirdsql/gds/ng/DefaultDatatypeCoder.java
@@ -83,7 +83,7 @@ public class DefaultDatatypeCoder implements DatatypeCoder {
      * @return datatype coder, this might be a cached instance
      */
     public static DefaultDatatypeCoder forEncodingFactory(IEncodingFactory encodingFactory) {
-        return encodingFactory.getOrCreateDatatypeCoder(DefaultDatatypeCoder.class);
+        return encodingFactory.getOrCreateDatatypeCoder(DefaultDatatypeCoder.class, DefaultDatatypeCoder::new);
     }
 
     /**