[accumulo] branch master updated: Work around compilation bug in Eclipse Oxygen

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new b49865d  Work around compilation bug in Eclipse Oxygen
b49865d is described below

commit b49865d08f3edb425306c3e48689c8836d947ad5
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu May 10 19:17:26 2018 -0400

    Work around compilation bug in Eclipse Oxygen
    
    Fixup generics parameter types in generated SimpleThriftService after
    generating with `-Pthrift` profile activation.
    
    This works around https://bugs.eclipse.org/bugs/show_bug.cgi?id=534559
---
 .../accumulo/test/rpc/thrift/SimpleThriftService.java   |  2 +-
 test/src/main/scripts/generate-thrift.sh                | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
index d76a789..fa0ea29 100644
--- a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+++ b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
@@ -405,7 +405,7 @@ public class SimpleThriftService {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
       processMap.put("echoPass", new echoPass());
       processMap.put("onewayPass", new onewayPass());
       processMap.put("echoFail", new echoFail());
diff --git a/test/src/main/scripts/generate-thrift.sh b/test/src/main/scripts/generate-thrift.sh
index 061ad4f..f1b0d27 100755
--- a/test/src/main/scripts/generate-thrift.sh
+++ b/test/src/main/scripts/generate-thrift.sh
@@ -22,3 +22,20 @@ PACKAGES_TO_GENERATE=(test.rpc)
 
 . ../core/src/main/scripts/generate-thrift.sh
 
+# fix SimpleThriftService compilation error in Eclipse Oxygen
+# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=534559
+patch -p2 <<'EOF'
+diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+index d76a789e0..fa0ea29e6 100644
+--- a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
++++ b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+@@ -405,7 +405,7 @@ public class SimpleThriftService {
+       super(iface, getProcessMap(processMap));
+     }
+ 
+-    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
++    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+       processMap.put("echoPass", new echoPass());
+       processMap.put("onewayPass", new onewayPass());
+       processMap.put("echoFail", new echoFail());
+EOF

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.