From 7497cf5a186211058b27e62e5861e839e649336b Mon Sep 17 00:00:00 2001
From: Greg Burd <gburd@onshape.com>
Date: Thu, 3 Aug 2017 15:38:13 -0400
Subject: [PATCH] Add compatibility with Java 8 CompletableFuture converting
 our Guava-supplied ListenableFuture.

---
 helenus-core.iml                                    |  4 ++++
 pom.xml                                             | 13 ++++++++++++-
 .../helenus/core/operation/AbstractOperation.java   |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/helenus-core.iml b/helenus-core.iml
index 42b1cc5..386e779 100644
--- a/helenus-core.iml
+++ b/helenus-core.iml
@@ -32,6 +32,10 @@
     <orderEntry type="library" name="Maven: com.github.jnr:jnr-constants:0.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.10" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.10" level="project" />
+    <orderEntry type="library" name="Maven: net.javacrumbs.future-converter:future-converter-java8-guava:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.javacrumbs.future-converter:future-converter-common:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.javacrumbs.future-converter:future-converter-java8-common:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.javacrumbs.future-converter:future-converter-guava-common:1.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
diff --git a/pom.xml b/pom.xml
index cd51b84..6215c57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
@@ -50,6 +50,11 @@
         </repository>
     </repositories>
 
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
     <profiles>
 
         <profile>
@@ -127,6 +132,12 @@
             <version>1.8.10</version>
         </dependency>
 
+        <dependency>
+            <groupId>net.javacrumbs.future-converter</groupId>
+            <artifactId>future-converter-java8-guava</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/src/main/java/net/helenus/core/operation/AbstractOperation.java b/src/main/java/net/helenus/core/operation/AbstractOperation.java
index 64d7523..cb90747 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOperation.java
@@ -26,6 +26,9 @@ import net.helenus.core.AbstractSessionOperations;
 import net.helenus.support.Fun;
 import net.helenus.support.Scala;
 import scala.concurrent.Future;
+import java.util.concurrent.CompletableFuture;
+import static net.javacrumbs.futureconverter.java8guava.FutureConverter.*;
+
 
 public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> extends AbstractStatementOperation<E, O> {
 
@@ -96,6 +99,10 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>> ex
 		return future;
 	}
 
+    public CompletableFuture<E> completable() {
+        return toCompletableFuture(async());
+    }
+
 	public Future<E> future() {
 		return Scala.asFuture(async());
 	}