Add support for Query controller and timeouts; remove vestigial support for interrupts.

1 files changed, 41 insertions, 0 deletions

diff --git a/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java b/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java
index 7e857c3..44735ae 100644
--- a/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java
+++ b/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java
@@ -61,6 +61,13 @@ public abstract class AbstractQuery<S extends Storable> implements Query<S>, App
     }

 

     @Override

+    public <T extends S> Cursor<S> fetchAfter(T start, Controller controller)

+        throws FetchException

+    {

+        return after(start).fetch(controller);

+    }

+

+    @Override

     public S loadOne() throws FetchException {

         S obj = tryLoadOne();

         if (obj == null) {

@@ -70,6 +77,15 @@ public abstract class AbstractQuery<S extends Storable> implements Query<S>, App
     }

 

     @Override

+    public S loadOne(Controller controller) throws FetchException {

+        S obj = tryLoadOne(controller);

+        if (obj == null) {

+            throw new FetchNoneException(toString());

+        }

+        return obj;

+    }

+

+    @Override

     public S tryLoadOne() throws FetchException {

         Cursor<S> cursor = fetch();

         try {

@@ -88,6 +104,24 @@ public abstract class AbstractQuery<S extends Storable> implements Query<S>, App
     }

 

     @Override

+    public S tryLoadOne(Controller controller) throws FetchException {

+        Cursor<S> cursor = fetch(controller);

+        try {

+            if (cursor.hasNext()) {

+                S obj = cursor.next();

+                if (cursor.hasNext()) {

+                    throw new FetchMultipleException(toString());

+                }

+                return obj;

+            } else {

+                return null;

+            }

+        } finally {

+            cursor.close();

+        }

+    }

+

+    @Override

     public void deleteOne() throws PersistException {

         if (!tryDeleteOne()) {

             throw new PersistNoneException(toString());

@@ -95,6 +129,13 @@ public abstract class AbstractQuery<S extends Storable> implements Query<S>, App
     }

 

     @Override

+    public void deleteOne(Controller controller) throws PersistException {

+        if (!tryDeleteOne(controller)) {

+            throw new PersistNoneException(toString());

+        }

+    }

+

+    @Override

     public boolean printNative() {

         try {

             return printNative(System.out);