Move async API to it's own package

diff --git a/src/main/java/org/yaz4j/AsyncConnection.java b/src/main/java/org/yaz4j/AsyncConnection.java
deleted file mode 100644 (file)
index d8e9d0c..0000000
--- a/src/main/java/org/yaz4j/AsyncConnection.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 1995-2015, Index Data
- * All rights reserved.
- * See the file LICENSE for details.
- */
-package org.yaz4j;
-
-import org.yaz4j.exception.ZoomException;
-import static org.yaz4j.jni.yaz4jlib.*;
-import org.yaz4j.util.Unstable;
-
-/**
- *
- * @author jakub
- */
-@Unstable
-public class AsyncConnection extends Connection {
-  private ResultSet lastResultSet;
-  ErrorHandler eh;
-  //make sure error is only handled once
-  boolean errorHandled = false;
-  int handledRecordOffset = 0;
-  ErrorHandler reh;
-  SearchHandler sh;
-  RecordHandler rh;
-  
-  public interface SearchHandler {
-    public void handle(ResultSet rs);
-  }
-  
-  public interface RecordHandler {
-    public void handle(Record r);
-  }
-  
-  public interface ErrorHandler {
-    public void handle(ZoomException e);
-  }
-
-  public AsyncConnection(String host, int port) {
-    super(host, port);
-    ZOOM_connection_option_set(zoomConnection, "async", "1");
-    closed = false;
-  }
-
-  @Override
-  public ResultSet search(Query query) throws ZoomException {
-    errorHandled = false;
-    lastResultSet = super.search(query);
-    return null;
-  }
-  
-  public AsyncConnection onSearch(SearchHandler sh) {
-    this.sh = sh;
-    return this;
-  }
-  
-  public AsyncConnection onRecord(RecordHandler rh) {
-    this.rh = rh;
-    return this;
-  }
-  
-  public AsyncConnection onError(ErrorHandler eh) {
-    this.eh = eh;
-    return this;
-  }
-  
-  public AsyncConnection onRecordError(ErrorHandler reh) {
-    this.reh = reh;
-    return this;
-  }
-  
-  //actuall handler, pkg-private
-  
-  void handleSearch() {
-    handleError();
-    //handle search
-    if (sh != null) sh.handle(lastResultSet);
-  }
-  
-  void handleRecord() {
-    //TODO clone the record to detach it from the result set
-    try {
-      if (rh != null) rh.handle(lastResultSet.getRecord(handledRecordOffset));
-    } catch (ZoomException ex) {
-      if (reh != null) reh.handle(ex);
-    } finally {
-      handledRecordOffset++;
-    }
-  }
-  
-  void handleError() {
-    //handle error
-    if (!errorHandled) {
-      ZoomException err = getZoomException();
-      if (err != null) {
-        if (eh != null) {
-          eh.handle(err);
-          errorHandled = true;
-        }
-      }
-    }
-  }
-  
-}

diff --git a/src/main/java/org/yaz4j/AsyncConnections.java b/src/main/java/org/yaz4j/AsyncConnections.java
deleted file mode 100644 (file)
index 5eb0c49..0000000
--- a/src/main/java/org/yaz4j/AsyncConnections.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995-2015, Index Data
- * All rights reserved.
- * See the file LICENSE for details.
- */
-package org.yaz4j;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.yaz4j.jni.SWIGTYPE_p_p_ZOOM_connection_p;
-import static org.yaz4j.jni.yaz4jlib.*;
-import static java.lang.System.out;
-import org.yaz4j.util.Unstable;
-
-/**
- *
- * @author jakub
- */
-@Unstable
-public class AsyncConnections {
-  private List<AsyncConnection> conns = new ArrayList<AsyncConnection>();
-  
-  public void add(AsyncConnection conn) {
-    conns.add(conn);
-  }
-
-  public List<AsyncConnection> getConnections() {
-    return conns;
-  }
-  
-  public void start() {
-    SWIGTYPE_p_p_ZOOM_connection_p c_conns = new_zoomConnectionArray(conns.size());
-    try {
-      for (int i=0; i<conns.size(); i++) {
-        Connection conn = conns.get(i);
-        zoomConnectionArray_setitem(c_conns, i, conn.zoomConnection);
-      }
-      int ret = 0;
-      while ((ret = ZOOM_event(conns.size(), c_conns)) != 0) {
-        int idx = ret - 1;
-        int last = ZOOM_connection_last_event(zoomConnectionArray_getitem(c_conns, idx));
-        AsyncConnection conn = conns.get(idx);
-        String event = ZOOM_get_event_str(last);
-        out.println("Received event " + event + " on connection #"+idx);
-        switch (last) {
-          case ZOOM_EVENT_RECV_SEARCH: conn.handleSearch(); break;
-          case ZOOM_EVENT_RECV_RECORD: conn.handleRecord(); break;
-          case ZOOM_EVENT_END: conn.handleError(); break;
-        }
-      }
-    } finally {
-      delete_zoomConnectionArray(c_conns);
-    }
-  }
-
-}

diff --git a/src/main/java/org/yaz4j/Connection.java b/src/main/java/org/yaz4j/Connection.java
index 6f5f617..dd34b6c 100644 (file)
--- a/src/main/java/org/yaz4j/Connection.java
+++ b/src/main/java/org/yaz4j/Connection.java
@@ -217,7 +217,7 @@ public class Connection implements Closeable {
    *
    * @return null if no error
    */
-  ZoomException getZoomException() {
+  protected ZoomException getZoomException() {
     ZoomException err = ExceptionUtil.getError(zoomConnection, host, port);
     return err;
   }

diff --git a/src/main/java/org/yaz4j/async/AsyncConnection.java b/src/main/java/org/yaz4j/async/AsyncConnection.java
new file mode 100644 (file)
index 0000000..3fa0c81
--- /dev/null
+++ b/src/main/java/org/yaz4j/async/AsyncConnection.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 1995-2015, Index Data
+ * All rights reserved.
+ * See the file LICENSE for details.
+ */
+package org.yaz4j.async;
+
+import org.yaz4j.Connection;
+import org.yaz4j.Query;
+import org.yaz4j.Record;
+import org.yaz4j.ResultSet;
+import org.yaz4j.exception.ZoomException;
+import org.yaz4j.jni.SWIGTYPE_p_ZOOM_connection_p;
+import static org.yaz4j.jni.yaz4jlib.*;
+import org.yaz4j.util.Unstable;
+
+/**
+ *
+ * @author jakub
+ */
+@Unstable
+public class AsyncConnection extends Connection {
+  private ResultSet lastResultSet;
+  ErrorHandler eh;
+  //make sure error is only handled once
+  boolean errorHandled = false;
+  int handledRecordOffset = 0;
+  ErrorHandler reh;
+  SearchHandler sh;
+  RecordHandler rh;
+  
+  public interface SearchHandler {
+    public void handle(ResultSet rs);
+  }
+  
+  public interface RecordHandler {
+    public void handle(Record r);
+  }
+  
+  public interface ErrorHandler {
+    public void handle(ZoomException e);
+  }
+
+  public AsyncConnection(String host, int port) {
+    super(host, port);
+    ZOOM_connection_option_set(zoomConnection, "async", "1");
+    closed = false;
+  }
+
+  @Override
+  public ResultSet search(Query query) throws ZoomException {
+    errorHandled = false;
+    lastResultSet = super.search(query);
+    return null;
+  }
+  
+  public AsyncConnection onSearch(SearchHandler sh) {
+    this.sh = sh;
+    return this;
+  }
+  
+  public AsyncConnection onRecord(RecordHandler rh) {
+    this.rh = rh;
+    return this;
+  }
+  
+  public AsyncConnection onError(ErrorHandler eh) {
+    this.eh = eh;
+    return this;
+  }
+  
+  public AsyncConnection onRecordError(ErrorHandler reh) {
+    this.reh = reh;
+    return this;
+  }
+  
+  //actuall handler, pkg-private
+  
+  void handleSearch() {
+    handleError();
+    //handle search
+    if (sh != null) sh.handle(lastResultSet);
+  }
+  
+  void handleRecord() {
+    //TODO clone the record to detach it from the result set
+    try {
+      if (rh != null) rh.handle(lastResultSet.getRecord(handledRecordOffset));
+    } catch (ZoomException ex) {
+      if (reh != null) reh.handle(ex);
+    } finally {
+      handledRecordOffset++;
+    }
+  }
+  
+  void handleError() {
+    //handle error
+    if (!errorHandled) {
+      ZoomException err = getZoomException();
+      if (err != null) {
+        if (eh != null) {
+          eh.handle(err);
+          errorHandled = true;
+        }
+      }
+    }
+  }
+  
+  /**
+   * Expose native connection to the async package, keep it package private.
+   */
+  SWIGTYPE_p_ZOOM_connection_p getNativeConnection() {
+    return zoomConnection;
+  }
+  
+}

diff --git a/src/main/java/org/yaz4j/async/AsyncConnections.java b/src/main/java/org/yaz4j/async/AsyncConnections.java
new file mode 100644 (file)
index 0000000..23a48ed
--- /dev/null
+++ b/src/main/java/org/yaz4j/async/AsyncConnections.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1995-2015, Index Data
+ * All rights reserved.
+ * See the file LICENSE for details.
+ */
+package org.yaz4j.async;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.yaz4j.Connection;
+import org.yaz4j.jni.SWIGTYPE_p_p_ZOOM_connection_p;
+import static org.yaz4j.jni.yaz4jlib.*;
+import static java.lang.System.out;
+import org.yaz4j.util.Unstable;
+
+/**
+ *
+ * @author jakub
+ */
+@Unstable
+public class AsyncConnections {
+  private List<AsyncConnection> conns = new ArrayList<AsyncConnection>();
+  
+  public void add(AsyncConnection conn) {
+    conns.add(conn);
+  }
+
+  public List<AsyncConnection> getConnections() {
+    return conns;
+  }
+  
+  public void start() {
+    SWIGTYPE_p_p_ZOOM_connection_p c_conns = new_zoomConnectionArray(conns.size());
+    try {
+      for (int i=0; i<conns.size(); i++) {
+        AsyncConnection conn = conns.get(i);
+        zoomConnectionArray_setitem(c_conns, i, conn.getNativeConnection());
+      }
+      int ret = 0;
+      while ((ret = ZOOM_event(conns.size(), c_conns)) != 0) {
+        int idx = ret - 1;
+        int last = ZOOM_connection_last_event(zoomConnectionArray_getitem(c_conns, idx));
+        AsyncConnection conn = conns.get(idx);
+        String event = ZOOM_get_event_str(last);
+        out.println("Received event " + event + " on connection #"+idx);
+        switch (last) {
+          case ZOOM_EVENT_RECV_SEARCH: conn.handleSearch(); break;
+          case ZOOM_EVENT_RECV_RECORD: conn.handleRecord(); break;
+          case ZOOM_EVENT_END: conn.handleError(); break;
+        }
+      }
+    } finally {
+      delete_zoomConnectionArray(c_conns);
+    }
+  }
+
+}

diff --git a/src/test/java/org/yaz4j/AsyncConnectionsTest.java b/src/test/java/org/yaz4j/AsyncConnectionsTest.java
index 648da66..f6b394e 100644 (file)
--- a/src/test/java/org/yaz4j/AsyncConnectionsTest.java
+++ b/src/test/java/org/yaz4j/AsyncConnectionsTest.java
@@ -5,6 +5,8 @@
  */
 package org.yaz4j;
 
+import org.yaz4j.async.AsyncConnections;
+import org.yaz4j.async.AsyncConnection;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;