Native OO API implementations

.classpath

@@ -7,6 +7,8 @@
 	<classpathentry excluding="org/firebirdsql/hibernate/" kind="src" path="src/test"/>
 	<classpathentry kind="src" path="src/jdbc_42"/>
 	<classpathentry kind="src" path="src/jna-client"/>
+	<classpathentry kind="src" path="src/nativeoo"/>
+	<classpathentry kind="src" path="src/nativeoo-test"/>
 	<classpathentry kind="src" path="src/test_42"/>
 	<classpathentry kind="src" path="src/jna-test"/>
 	<classpathentry kind="src" path="src/extern"/>

build/archive.xml

@@ -76,6 +76,9 @@
             <fileset dir="${source.jna-client}">
                 <include name="**/*.java"/>
             </fileset>
+            <fileset dir="${source.nativeoo}">
+                <include name="**/*.java"/>
+            </fileset>
             <fileset dir="${toString:source.java.openoffice}">
                 <include name="**/*.java"/>
             </fileset>

build/compile.xml

@@ -55,6 +55,7 @@
             <src path="${source.java}"/>
             <src path="${source.extern}"/>
             <src path="${source.jna-client}"/>
+            <src path="${source.nativeoo}"/>
             <src refid="source.java.openoffice"/>
             <src refid="source.java.additional"/>
         </javac>
@@ -87,6 +88,7 @@
             <classpath refid="javac.test.classpath"/>
             <src path="${source.test}"/>
             <src path="${source.test.jna}"/>
+            <src path="${source.test.nativeoo}"/>
             <src refid="source.test.additional"/>
         </javac>
 

build/dist.xml

@@ -19,6 +19,7 @@
                 <pathelement path="${source.java}"/>
                 <pathelement path="${source.extern}"/>
                 <pathelement path="${source.jna-client}"/>
+                <pathelement path="${source.nativeoo}"/>
             </sourcepath>
             <sourcepath refid="source.java.openoffice"/>
             <sourcepath refid="source.java.additional"/>

build/init.xml

@@ -116,12 +116,14 @@
         <property name="source.jdbc.41" value="${module.source}/jdbc_41"/>
         <property name="source.jdbc.42" value="${module.source}/jdbc_42"/>
         <property name="source.jna-client" value="${module.source}/jna-client"/>
+        <property name="source.nativeoo" value="${module.source}/nativeoo"/>
         <property name="source.etc" value="${module.source}/etc"/>
         <property name="source.resources" value="${module.source}/resources"/>
         <property name="source.stylesheets" value="${module.source}/stylesheets"/>
         <property name="source.test" value="${module.source}/test"/>
         <property name="source.test.42" value="${module.source}/test_42"/>
         <property name="source.test.jna" value="${module.source}/jna-test"/>
+        <property name="source.test.nativeoo" value="${module.source}/nativeoo-test"/>
         <property name="source.documentation" value="${module.source}/documentation"/>
 
         <property name="thirdparty" value="${module.root}/thirdparty"/>

src/jna-client/org/firebirdsql/gds/ng/jna/AbstractNativeDatabaseFactory.java

@@ -18,10 +18,7 @@
  */
 package org.firebirdsql.gds.ng.jna;
 
-import org.firebirdsql.gds.ng.FbDatabaseFactory;
-import org.firebirdsql.gds.ng.IAttachProperties;
-import org.firebirdsql.gds.ng.IConnectionProperties;
-import org.firebirdsql.gds.ng.IServiceProperties;
+import org.firebirdsql.gds.ng.*;
 import org.firebirdsql.jna.fbclient.FbClientLibrary;
 
 import java.sql.SQLException;
@@ -35,14 +32,14 @@
 public abstract class AbstractNativeDatabaseFactory implements FbDatabaseFactory {
 
     @Override
-    public JnaDatabase connect(IConnectionProperties connectionProperties) throws SQLException {
+    public FbDatabase connect(IConnectionProperties connectionProperties) throws SQLException {
         final JnaDatabaseConnection jnaDatabaseConnection = new JnaDatabaseConnection(getClientLibrary(),
                 filterProperties(connectionProperties));
         return jnaDatabaseConnection.identify();
     }
 
     @Override
-    public JnaService serviceConnect(IServiceProperties serviceProperties) throws SQLException {
+    public FbService serviceConnect(IServiceProperties serviceProperties) throws SQLException {
         final JnaServiceConnection jnaServiceConnection = new JnaServiceConnection(getClientLibrary(),
                 filterProperties(serviceProperties));
         return jnaServiceConnection.identify();

src/jna-client/org/firebirdsql/gds/ng/jna/JnaDatabase.java

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

src/jna-client/org/firebirdsql/jna/fbclient/CryptoObjectInfo.java

@@ -0,0 +1,8 @@
+package org.firebirdsql.jna.fbclient;
+
+/**
+ * @author <a href="mailto:[email protected]">Vasiliy Yashkov</a>
+ * @since 4.0
+ */
+public class CryptoObjectInfo {
+}

src/jna-client/org/firebirdsql/jna/fbclient/FB_DEC16.java

@@ -0,0 +1,41 @@
+package org.firebirdsql.jna.fbclient;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This file was autogenerated by <a href="http://jnaerator.googlecode.com/">JNAerator</a>,<br>
+ * a tool written by <a href="http://ochafik.com/">Olivier Chafik</a> that <a href="http://code.google.com/p/jnaerator/wiki/CreditsAndLicense">uses a few opensource projects.</a>.<br>
+ * For help, please visit <a href="http://nativelibs4java.googlecode.com/">NativeLibs4Java</a> , <a href="http://rococoa.dev.java.net/">Rococoa</a>, or <a href="http://jna.dev.java.net/">JNA</a>.
+ * @since 4.0
+ */
+public class FB_DEC16 extends Structure {
+
+	public long[] fb_data = new long[1];
+	public FB_DEC16() {
+		super();
+	}
+
+	protected List getFieldOrder() {
+		return Arrays.asList("fb_data");
+	}
+	public FB_DEC16(long fb_data[]) {
+		super();
+		if ((fb_data.length != this.fb_data.length))
+			throw new IllegalArgumentException("Wrong array size !");
+		this.fb_data = fb_data;
+	}
+
+	public FB_DEC16(Pointer peer) {
+		super(peer);
+	}
+
+	public static class ByReference extends FB_DEC16 implements Structure.ByReference {
+
+	};
+	public static class ByValue extends FB_DEC16 implements Structure.ByValue {
+
+	};
+}

src/jna-client/org/firebirdsql/jna/fbclient/FB_DEC34.java

@@ -0,0 +1,37 @@
+package org.firebirdsql.jna.fbclient;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This file was autogenerated by <a href="http://jnaerator.googlecode.com/">JNAerator</a>,<br>
+ * a tool written by <a href="http://ochafik.com/">Olivier Chafik</a> that <a href="http://code.google.com/p/jnaerator/wiki/CreditsAndLicense">uses a few opensource projects.</a>.<br>
+ * For help, please visit <a href="http://nativelibs4java.googlecode.com/">NativeLibs4Java</a> , <a href="http://rococoa.dev.java.net/">Rococoa</a>, or <a href="http://jna.dev.java.net/">JNA</a>.
+ * @since 4.0
+ */
+public class FB_DEC34 extends Structure {
+	public long[] fb_data = new long[2];
+	public FB_DEC34() {
+		super();
+	}
+	protected List getFieldOrder() {
+		return Arrays.asList("fb_data");
+	}
+	public FB_DEC34(long fb_data[]) {
+		super();
+		if ((fb_data.length != this.fb_data.length)) 
+			throw new IllegalArgumentException("Wrong array size !");
+		this.fb_data = fb_data;
+	}
+	public FB_DEC34(Pointer peer) {
+		super(peer);
+	}
+	public static class ByReference extends FB_DEC34 implements Structure.ByReference {
+
+	};
+	public static class ByValue extends FB_DEC34 implements Structure.ByValue {
+
+	};
+}

src/jna-client/org/firebirdsql/jna/fbclient/FbClientLibrary.java

@@ -26,6 +26,7 @@
 import com.sun.jna.ptr.LongByReference;
 import com.sun.jna.ptr.PointerByReference;
 import com.sun.jna.ptr.ShortByReference;
+import org.firebirdsql.nativeoo.gds.ng.FbInterface;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -752,4 +753,10 @@ ISC_STATUS fb_shutdown_callback(ISC_STATUS[] statusVector, FbShutdownCallback FB
 	 * <i>native declaration : C:\Program Files\Firebird\Firebird_2_5\include\ibase.h:1306</i>
 	 */
 	int isc_get_client_minor_version();
+
+	/**
+	 * Original signature : <code>extern "C" IMaster* ISC_EXPORT fb_get_master_interface();</code><br>
+	 * <i>native declaration : firebird/include/firebird/interface.h:364</i>
+	 */
+	FbInterface.IMaster fb_get_master_interface();
 }

src/jna-client/org/firebirdsql/jna/fbclient/ISC_DATE.java

@@ -0,0 +1,17 @@
+package org.firebirdsql.jna.fbclient;
+
+import com.sun.jna.Structure;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ISC_DATE extends Structure implements Structure.ByValue
+{
+    public int value;
+
+    @Override
+    protected List<String> getFieldOrder()
+    {
+        return Arrays.asList("value");
+    }
+}

src/jna-client/org/firebirdsql/jna/fbclient/ISC_QUAD.java

@@ -0,0 +1,4 @@
+package org.firebirdsql.jna.fbclient;
+
+public class ISC_QUAD extends GDS_QUAD_t {
+}

src/jna-client/org/firebirdsql/jna/fbclient/ISC_TIME.java

@@ -0,0 +1,17 @@
+package org.firebirdsql.jna.fbclient;
+
+import com.sun.jna.Structure;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ISC_TIME extends Structure implements Structure.ByValue
+{
+    public int value;
+
+    @Override
+    protected List<String> getFieldOrder()
+    {
+        return Arrays.asList("value");
+    }
+}

src/jna-test/org/firebirdsql/gds/ng/jna/TestJnaBlob.java

@@ -437,7 +437,7 @@ public void testOutputBlobDoubleOpen() throws Exception {
 
     @Override
     protected JnaDatabase createFbDatabase(FbConnectionProperties connectionInfo) throws SQLException {
-        final JnaDatabase db = factory.connect(connectionInfo);
+        final JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
         db.attach();
         return db;
     }

src/jna-test/org/firebirdsql/gds/ng/jna/TestJnaDatabase.java

@@ -84,7 +84,7 @@ public class TestJnaDatabase {
     public void testBasicAttach() throws Exception {
         FBManager fbManager = createFBManager();
         defaultDatabaseSetUp(fbManager);
-        try (JnaDatabase db = factory.connect(connectionInfo)) {
+        try (JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo)) {
             db.attach();
 
             assertTrue("Expected isAttached() to return true", db.isAttached());
@@ -104,7 +104,7 @@ public void doubleAttach() throws Exception {
         FBManager fbManager = createFBManager();
         defaultDatabaseSetUp(fbManager);
 
-        try (JnaDatabase db = factory.connect(connectionInfo)) {
+        try (JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo)) {
             db.attach();
 
             //Second attach should throw exception
@@ -120,7 +120,7 @@ public void basicStatusVectorProcessing_wrongLogin() throws Exception {
                 FBTestProperties.GDS_TYPE, not(isEmbeddedType()));
         // set invalid password
         connectionInfo.setPassword("abcd");
-        try (JnaDatabase db = factory.connect(connectionInfo)) {
+        try (JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo)) {
 
             expectedException.expect(allOf(
                     isA(SQLException.class),
@@ -137,7 +137,7 @@ public void testBasicStatusVectorProcessing_wrongDatabase() throws Exception {
         // set invalid database
         final String invalidDatabaseName = FBTestProperties.getDatabasePath() + "doesnotexist";
         connectionInfo.setDatabaseName(invalidDatabaseName);
-        try (JnaDatabase db = factory.connect(connectionInfo)) {
+        try (JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo)) {
 
             expectedException.expect(allOf(
                     isA(SQLException.class),
@@ -166,7 +166,7 @@ public void testBasicStatusVectorProcessing_wrongDatabase() throws Exception {
     public void testBasicCreateAndDrop() throws Exception {
         connectionInfo.getExtraDatabaseParameters()
                 .addArgument(ISCConstants.isc_dpb_sql_dialect, 3);
-        JnaDatabase db = factory.connect(connectionInfo);
+        JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
         File dbFile = new File(connectionInfo.getDatabaseName());
         try {
             db.createDatabase();
@@ -194,7 +194,7 @@ public void testDrop_NotAttached() throws Exception {
         FBManager fbManager = createFBManager();
         defaultDatabaseSetUp(fbManager);
         try {
-            JnaDatabase db = factory.connect(connectionInfo);
+            JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
             db.dropDatabase();
         } finally {
             defaultDatabaseTearDown(fbManager);
@@ -203,7 +203,7 @@ public void testDrop_NotAttached() throws Exception {
 
     @Test
     public void testDetach_NotConnected() throws Exception {
-        JnaDatabase db = factory.connect(connectionInfo);
+        JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
 
         // Note: the error is different from the one in the pure java implementation as we cannot discern between
         // not connected and not attached
@@ -219,7 +219,7 @@ public void testBasicDetach() throws Exception {
         FBManager fbManager = createFBManager();
         defaultDatabaseSetUp(fbManager);
         try {
-            JnaDatabase db = factory.connect(connectionInfo);
+            JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
             try {
                 db.attach();
 
@@ -240,7 +240,7 @@ public void testDetach_openTransactions() throws Exception {
         defaultDatabaseSetUp(fbManager);
 
         try {
-            JnaDatabase db = factory.connect(connectionInfo);
+            JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
             FbTransaction transaction = null;
             try {
                 db.attach();
@@ -274,7 +274,7 @@ FBTestProperties.GDS_TYPE, not(
         FBManager fbManager = createFBManager();
         defaultDatabaseSetUp(fbManager);
         try {
-            JnaDatabase db = factory.connect(connectionInfo);
+            JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
             try {
                 db.attach();
                 assumeTrue("expected database attached", db.isAttached());
@@ -293,7 +293,7 @@ FBTestProperties.GDS_TYPE, not(
 
     @Test
     public void testExecuteImmediate_createDatabase() throws Exception {
-        JnaDatabase db = factory.connect(connectionInfo);
+        JnaDatabase db = (JnaDatabase) factory.connect(connectionInfo);
         try {
             String createDb = String.format("CREATE DATABASE '%s' USER '%s' PASSWORD '%s'",
                     getDatabasePath(), DB_USER, DB_PASSWORD);

src/jna-test/org/firebirdsql/gds/ng/jna/TestJnaEvents.java

@@ -95,7 +95,7 @@ public final void tearDown() throws Exception {
 
     @Test
     public void testCreateEventHandle() throws Exception {
-        db = factory.connect(connectionInfo);
+        db = (JnaDatabase) factory.connect(connectionInfo);
         db.attach();
 
         JnaEventHandle eventHandle = db.createEventHandle("TEST_EVENT", new EventHandler() {
@@ -109,7 +109,7 @@ public void eventOccurred(EventHandle eventHandle) {
 
     @Test
     public void testQueueEvent_andNotification() throws Exception {
-        db = factory.connect(connectionInfo);
+        db = (JnaDatabase) factory.connect(connectionInfo);
         db.attach();
 
         FbTransaction transaction = getTransaction(db);
@@ -176,7 +176,7 @@ public void testQueueEvent_andNotification() throws Exception {
 
     @Test
     public void cancelAfterCallback_directJNA() throws Exception {
-        db = factory.connect(connectionInfo);
+        db = (JnaDatabase) factory.connect(connectionInfo);
         db.attach();
 
         FbClientLibrary lib = db.getClientLibrary();