Merge pull request #124 from lt-schmidt-jr/master

Issue #123 update grpc to version 1.24 protoc to version 3.9.1

Author: rmichela

contrib/grpc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java

@@ -11,6 +11,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -70,17 +71,19 @@ public void handleReturnValue(Object returnValue, MethodParameter returnType, Mo
         final DeferredResult<Object> deferredResult = new DeferredResult<>();
         @SuppressWarnings("unchecked")
         ListenableFuture<Object> futureValue = (ListenableFuture<Object>) returnValue;
-        Futures.addCallback(futureValue, new FutureCallback<Object>() {
-            @Override
-            public void onSuccess(@Nullable Object result) {
-                deferredResult.setResult(result);
-            }
+        Futures.addCallback(futureValue,
+                new FutureCallback<Object>() {
+                    @Override
+                    public void onSuccess(@Nullable Object result) {
+                        deferredResult.setResult(result);
+                    }
 
-            @Override
-            public void onFailure(Throwable ex) {
-                deferredResult.setErrorResult(ex);
-            }
-        });
+                    @Override
+                    public void onFailure(Throwable ex) {
+                        deferredResult.setErrorResult(ex);
+                    }
+                },
+                MoreExecutors.directExecutor());
 
         startDeferredResultProcessing(mavContainer, webRequest, deferredResult);
     }

contrib/pom.xml

@@ -59,8 +59,8 @@
         <mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
 
         <!-- Dependency Versions -->
-        <grpc.version>1.12.0</grpc.version>
-        <protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
+        <grpc.version>1.24.0</grpc.version>
+        <protoc.version>3.9.1</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>1.7.21</slf4j.version>
         <gson.version>2.7</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>

demos/pom.xml

@@ -59,8 +59,8 @@
         <contrib.version>0.8.1</contrib.version>
         <jprotoc.version>0.8.1</jprotoc.version>
 
-        <grpc.version>1.12.0</grpc.version>
-        <protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
+        <grpc.version>1.24.0</grpc.version>
+        <protoc.version>3.9.1</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>1.7.21</slf4j.version>
         <gson.version>2.7</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>

jprotoc/jprotoc/pom.xml

@@ -31,6 +31,12 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+            <version>${protoc.version}</version>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>

jprotoc/pom.xml

@@ -58,10 +58,10 @@
         <mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
 
         <!-- Dependency Versions -->
-        <contrib.version>0.8.1</contrib.version>
+        <contrib.version>0.8.2-SNAPSHOT</contrib.version>
 
-        <grpc.version>1.12.0</grpc.version>
-        <protoc.version>3.5.1</protoc.version> <!-- Same version as grpc-proto -->
+        <grpc.version>1.24.0</grpc.version>
+        <protoc.version>3.9.1</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>1.7.21</slf4j.version>
         <gson.version>2.7</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>