Native OO API implementations

build.gradle

@@ -69,7 +69,7 @@ sourceSets {
     }
     test {
         java {
-            srcDirs = ['src/test', 'src/jna-test']
+            srcDirs = ['src/test', 'src/jna-test', 'src/nativeoo-test']
         }
         resources {
             srcDirs = ['src/test_resources']
@@ -201,10 +201,11 @@ test {
     )
     if (project.hasProperty('test.jna.library.path')) {
         systemProperty 'jna.library.path', project.'test.jna.library.path'
-    } else if (project.'test.gds_type' == 'NATIVE' || project.'test.gds_type' == 'EMBEDDED') {
+    } else if (project.'test.gds_type' == 'NATIVE' || project.'test.gds_type' == 'EMBEDDED' ||
+            project.'test.gds_type' == 'FBOONATIVE' || project.'test.gds_type' == 'FBOOEMBEDDED') {
         println "Running test type ${project.'test.gds_type'} without explicit native library path. " +
-                "Specify property 'test.jna.library.path' to point to a Firebird client location (NATIVE) or " +
-                "Firebird install (EMBEDDED)."
+                "Specify property 'test.jna.library.path' to point to a Firebird client location (NATIVE/FBOONATIVE) or " +
+                "Firebird install (EMBEDDED/FBOOEMBEDDED)."
     }
 
     doFirst {

gradle.properties

@@ -21,7 +21,7 @@ test.db.dir=build/tmp/db
 test.db.host=localhost
 test.db.port=3050
 test.db.lc_ctype=NONE
-test.gds_type=PURE_JAVA
+test.gds_type=FBOONATIVE
 test.use.firebird.autocommit=false
 test.enableProtocol=*
 

jaybird-native/src/main/java/org/firebirdsql/gds/impl/jni/FbOOEmbeddedGDSFactoryPlugin.java

@@ -0,0 +1,70 @@
+package org.firebirdsql.gds.impl.jni;
+
+import org.firebirdsql.gds.impl.BaseGDSFactoryPlugin;
+import org.firebirdsql.gds.ng.nativeoo.FbOOEmbeddedDatabaseFactory;
+
+import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
+import java.util.List;
+
+/**
+ * GDS factory plugin implementation for embedded OO API
+ *
+ * @since 6.0
+ */
+public class FbOOEmbeddedGDSFactoryPlugin extends BaseGDSFactoryPlugin {
+
+    public static final String EMBEDDED_TYPE_NAME = "FBOOEMBEDDED";
+    private static final String DEFAULT_PROTOCOL = "jdbc:firebirdsql:fboo:embedded:";
+    private static final List<String> JDBC_PROTOCOLS = List.of(DEFAULT_PROTOCOL, "jdbc:firebird:fboo:embedded:");
+
+    public String getPluginName() {
+        return "GDS implementation for embedded server via OO API.";
+    }
+
+    public String getTypeName() {
+        return EMBEDDED_TYPE_NAME;
+    }
+
+    @SuppressWarnings("removal")
+    @Deprecated(since = "6", forRemoval = true)
+    @Override
+    public String[] getTypeAliases() {
+        return new String[0];
+    }
+
+    @Override
+    public List<String> getTypeAliasList() {
+        return List.of();
+    }
+
+    @SuppressWarnings("removal")
+    @Deprecated(since = "6", forRemoval = true)
+    @Override
+    public String[] getSupportedProtocols() {
+        return JDBC_PROTOCOLS.toArray(new String[0]);
+    }
+
+    @Override
+    public List<String> getSupportedProtocolList() {
+        return JDBC_PROTOCOLS;
+    }
+
+    @Override
+    public String getDefaultProtocol() {
+        return DEFAULT_PROTOCOL;
+    }
+
+    public String getDatabasePath(String server, Integer port, String path) throws SQLException {
+        if (path == null) {
+            throw new SQLNonTransientConnectionException("Database name/path is required.");
+        }
+
+        return path;
+    }
+
+    @Override
+    public FbOOEmbeddedDatabaseFactory getDatabaseFactory() {
+        return FbOOEmbeddedDatabaseFactory.getInstance();
+    }
+}

jaybird-native/src/main/java/org/firebirdsql/gds/impl/jni/FbOONativeGDSFactoryPlugin.java

@@ -0,0 +1,78 @@
+package org.firebirdsql.gds.impl.jni;
+
+import org.firebirdsql.gds.impl.BaseGDSFactoryPlugin;
+import org.firebirdsql.gds.ng.nativeoo.FbOOClientDatabaseFactory;
+
+import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
+import java.util.List;
+
+/**
+ * GDS factory plugin implementation for native OO API
+ *
+ * @since 6.0
+ */
+public class FbOONativeGDSFactoryPlugin extends BaseGDSFactoryPlugin {
+
+    public static final String NATIVE_TYPE_NAME = "FBOONATIVE";
+    private static final String DEFAULT_PROTOCOL = "jdbc:firebirdsql:fboo:native:";
+    private static final List<String> JDBC_PROTOCOLS = List.of(DEFAULT_PROTOCOL, "jdbc:firebird:fboo:native:");
+
+    @Override
+    public String getPluginName() {
+        return "JNA-based GDS implementation via OO API.";
+    }
+
+    @Override
+    public String getTypeName() {
+        return NATIVE_TYPE_NAME;
+    }
+
+    @SuppressWarnings("removal")
+    @Deprecated(since = "6", forRemoval = true)
+    @Override
+    public String[] getTypeAliases() {
+        return new String[0];
+    }
+
+    @SuppressWarnings("removal")
+    @Deprecated(since = "6", forRemoval = true)
+    @Override
+    public String[] getSupportedProtocols() {
+        return JDBC_PROTOCOLS.toArray(new String[0]);
+    }
+
+    @Override
+    public List<String> getSupportedProtocolList() {
+        return JDBC_PROTOCOLS;
+    }
+
+    @Override
+    public String getDefaultProtocol() {
+        return DEFAULT_PROTOCOL;
+    }
+
+    @Override
+    public String getDatabasePath(String server, Integer port, String path) throws SQLException {
+        if (path == null) {
+            throw new SQLNonTransientConnectionException("Server name/address is required for native implementation.");
+        }
+        if (server == null) {
+            return path;
+        }
+
+        var sb = new StringBuilder();
+        sb.append(server);
+        if (port != null) {
+            sb.append('/').append(port.intValue());
+        }
+        sb.append(':').append(path);
+
+        return sb.toString();
+    }
+
+    @Override
+    public FbOOClientDatabaseFactory getDatabaseFactory() {
+        return FbOOClientDatabaseFactory.getInstance();
+    }
+}

jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/JnaDatabase.java

@@ -478,6 +478,21 @@ public void cancelEvent(EventHandle eventHandle) throws SQLException {
         }
     }
 
+    @Override
+    public FbBatch createBatch(FbTransaction transaction, String statement, FbMessageMetadata metadata, BatchParameterBuffer parameters) throws SQLException {
+        throw new FBDriverNotCapableException();
+    }
+
+    @Override
+    public FbBatch createBatch(FbTransaction transaction, String statement, BatchParameterBuffer parameters) throws SQLException {
+        throw new FBDriverNotCapableException();
+    }
+
+    @Override
+    public FbMetadataBuilder getMetadataBuilder(int fieldCount) throws SQLException  {
+        throw new FBDriverNotCapableException();
+    }
+
     private void processStatusVector() throws SQLException {
         processStatusVector(statusVector, getDatabaseWarningCallback());
     }