Java 8 version: replace FutureImpl with CompletableFuture and add composable version of async interface via CompletionStage

Joyfolk · Joyfolk · commit 836206324643 · 2017-09-28T20:14:54.000+03:00
diff --git a/README.md b/README.md
@@ -74,10 +74,11 @@ TarantoolClient client = new TarantoolClientImpl(socketChannelProvider, config);
 >   resolution, you could create a function that returns necessary name-to-ID
 >   mappings.
 
-`TarantoolClient` provides three interfaces to execute queries:
+`TarantoolClient` provides four interfaces to execute queries:
 
 * `SyncOps` - returns the operation result
 * `AsyncOps` - returns the operation result as a `Future`
+* `ComposableAsyncOps`- return the operation result as a `CompletionStage` 
 * `FireAndForgetOps` - returns the query ID
 
 Feel free to override any method of `TarantoolClientImpl`. For example, to hook
diff --git a/pom.xml b/pom.xml
@@ -37,10 +37,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.7.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/org/tarantool/FutureImpl.java b/src/main/java/org/tarantool/FutureImpl.java
diff --git a/src/main/java/org/tarantool/TarantoolClient.java b/src/main/java/org/tarantool/TarantoolClient.java
@@ -1,6 +1,7 @@
 package org.tarantool;
 
 import java.util.List;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -9,6 +10,8 @@ public interface TarantoolClient {
 
     TarantoolClientOps<Integer, List<?>, Object, Future<List<?>>> asyncOps();
 
+    TarantoolClientOps<Integer, List<?>, Object, CompletionStage<List<?>>> composableAsyncOps();
+
     TarantoolClientOps<Integer, List<?>, Object, Long> fireAndForgetOps();
 
     void close();
diff --git a/src/main/java/org/tarantool/TarantoolClientImpl.java b/src/main/java/org/tarantool/TarantoolClientImpl.java
@@ -8,6 +8,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -31,7 +33,7 @@ public class TarantoolClientImpl extends TarantoolBase<Future<List<?>>> implemen
     protected volatile Exception thumbstone;
     protected volatile CountDownLatch alive;
 
-    protected Map<Long, FutureImpl<List<?>>> futures;
+    protected Map<Long, CompletableFuture<List<?>>> futures;
     protected AtomicInteger wait = new AtomicInteger();
     /**
      * Write properties
@@ -49,6 +51,7 @@ public class TarantoolClientImpl extends TarantoolBase<Future<List<?>>> implemen
      */
     protected SyncOps syncOps;
     protected FireAndForgetOps fireAndForgetOps;
+    protected ComposableAsyncOps composableAsyncOps;
 
     /**
      * Inner
@@ -77,7 +80,7 @@ public TarantoolClientImpl(SocketChannelProvider socketProvider, TarantoolClient
         this.alive = new CountDownLatch(1);
         this.socketProvider = socketProvider;
         this.stats = new TarantoolClientStats();
-        this.futures = new ConcurrentHashMap<Long, FutureImpl<List<?>>>(config.predictedFutures);
+        this.futures = new ConcurrentHashMap<>(config.predictedFutures);
         this.sharedBuffer = ByteBuffer.allocateDirect(config.sharedBufferSize);
         this.writerBuffer = ByteBuffer.allocateDirect(sharedBuffer.capacity());
         this.connector.setDaemon(true);
@@ -197,21 +200,22 @@ protected void configureThreads(String threadName) {
     }
 
 
-    public Future<List<?>> exec(Code code, Object... args) {
+    public CompletableFuture<List<?>> exec(Code code, Object... args) {
         validateArgs(args);
-        FutureImpl<List<?>> q = new FutureImpl<List<?>>(syncId.incrementAndGet());
+        long sid = syncId.incrementAndGet();
+        CompletableFuture<List<?>> q = new CompletableFuture<>();
         if (isDead(q)) {
             return q;
         }
-        futures.put(q.getId(), q);
+        futures.put(sid, q);
         if (isDead(q)) {
-            futures.remove(q.getId());
+            futures.remove(sid);
             return q;
         }
         try {
-            write(code, q.getId(), null, args);
+            write(code, sid, null, args);
         } catch (Exception e) {
-            futures.remove(q.getId());
+            futures.remove(sid);
             fail(q, e);
         }
         return q;
@@ -225,11 +229,11 @@ protected synchronized void die(String message, Exception cause) {
         this.thumbstone = new CommunicationException(message, cause);
         this.alive = new CountDownLatch(1);
         while (!futures.isEmpty()) {
-            Iterator<Map.Entry<Long, FutureImpl<List<?>>>> iterator = futures.entrySet().iterator();
+            Iterator<Map.Entry<Long, CompletableFuture<List<?>>>> iterator = futures.entrySet().iterator();
             while (iterator.hasNext()) {
-                Map.Entry<Long, FutureImpl<List<?>>> elem = iterator.next();
+                Map.Entry<Long, CompletableFuture<List<?>>> elem = iterator.next();
                 if (elem != null) {
-                    FutureImpl<List<?>> future = elem.getValue();
+                    CompletableFuture<List<?>> future = elem.getValue();
                     fail(future, cause);
                 }
                 iterator.remove();
@@ -333,7 +337,7 @@ protected void readThread() {
                     readPacket(is);
                     code = (Long) headers.get(Key.CODE.getId());
                     Long syncId = (Long) headers.get(Key.SYNC.getId());
-                    FutureImpl<List<?>> future = futures.remove(syncId);
+                    CompletableFuture<List<?>> future = futures.remove(syncId);
                     stats.received++;
                     wait.decrementAndGet();
                     complete(code, future);
@@ -381,14 +385,14 @@ protected void writeThread() {
     }
 
 
-    protected void fail(FutureImpl<List<?>> q, Exception e) {
-        q.setError(e);
+    protected void fail(CompletableFuture<List<?>> q, Exception e) {
+        q.completeExceptionally(e);
     }
 
-    protected void complete(long code, FutureImpl<List<?>> q) {
+    protected void complete(long code, CompletableFuture<List<?>> q) {
         if (q != null) {
             if (code == 0) {
-                q.setValue((List) body.get(Key.DATA.getId()));
+                q.complete((List) body.get(Key.DATA.getId()));
             } else {
                 Object error = body.get(Key.ERROR.getId());
                 fail(q, serverError(code, error));
@@ -488,6 +492,11 @@ public TarantoolClientOps<Integer, List<?>, Object, Future<List<?>>> asyncOps()
         return this;
     }
 
+    @Override
+    public TarantoolClientOps<Integer, List<?>, Object, CompletionStage<List<?>>> composableAsyncOps() {
+        return composableAsyncOps;
+    }
+
     @Override
     public TarantoolClientOps<Integer, List<?>, Object, Long> fireAndForgetOps() {
         return fireAndForgetOps;
@@ -529,7 +538,19 @@ public void close() {
         }
     }
 
-    protected boolean isDead(FutureImpl<List<?>> q) {
+    protected class ComposableAsyncOps extends AbstractTarantoolOps<Integer, List<?>, Object, CompletionStage<List<?>>> {
+        @Override
+        public CompletionStage<List<?>> exec(Code code, Object... args) {
+            return TarantoolClientImpl.this.exec(code, args);
+        }
+
+        @Override
+        public void close() {
+            TarantoolClientImpl.this.close();
+        }
+    }
+
+    protected boolean isDead(CompletableFuture<List<?>> q) {
         if (TarantoolClientImpl.this.thumbstone != null) {
             fail(q, new CommunicationException("Connection is dead", thumbstone));
             return true;
