This is an automated email from the ASF dual-hosted git repository.
iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new b124940 AVRO-2218: Update thrift to version 0.11.0 and tukaani to
version 1.8
b124940 is described below
commit b1249403bc0e9e62af8e87f61bb4a33e44007b4d
Author: Rajkumar Natarajan <[email protected]>
AuthorDate: Thu Dec 20 13:26:11 2018 -0500
AVRO-2218: Update thrift to version 0.11.0 and tukaani to version 1.8
---
doc/src/content/xdocs/gettingstartedjava.xml | 8 +-------
lang/java/pom.xml | 4 ++--
.../test/java/org/apache/avro/thrift/test/Foo.java | 22 ++++++++++++----------
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/doc/src/content/xdocs/gettingstartedjava.xml
b/doc/src/content/xdocs/gettingstartedjava.xml
index 900e1eb..20bbb74 100644
--- a/doc/src/content/xdocs/gettingstartedjava.xml
+++ b/doc/src/content/xdocs/gettingstartedjava.xml
@@ -41,13 +41,7 @@
Releases</a> page. This guide uses Avro &AvroVersion;, the latest
version at the time of writing. For the examples in this guide,
download <em>avro-&AvroVersion;.jar</em> and
- <em>avro-tools-&AvroVersion;.jar</em>. The Avro Java implementation
- also depends on the <a href="http://jackson.codehaus.org/";>Jackson</a>
- JSON library. From the Jackson <a
- href="http://wiki.fasterxml.com/JacksonDownload";>download page</a>,
- download the core-asl and mapper-asl jars. Add
- <em>avro-&AvroVersion;.jar</em> and the Jackson jars to your project's
- classpath (avro-tools will be used for code generation).
+ <em>avro-tools-&AvroVersion;.jar</em>.
</p>
<p>
Alternatively, if you are using Maven, add the following dependency to
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 9ea9941..97c3b8e 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -45,7 +45,7 @@
<junit.version>4.12</junit.version>
<netty.version>3.10.6.Final</netty.version>
<protobuf.version>2.6.1</protobuf.version>
- <thrift.version>0.9.3</thrift.version>
+ <thrift.version>0.11.0</thrift.version>
<slf4j.version>1.7.25</slf4j.version>
<snappy.version>1.1.7.2</snappy.version>
<velocity.version>2.0</velocity.version>
@@ -56,7 +56,7 @@
<commons-compress.version>1.18</commons-compress.version>
<commons-lang.version>3.8.1</commons-lang.version>
<commons-logging.version>1.2</commons-logging.version>
- <tukaani.version>1.6</tukaani.version>
+ <tukaani.version>1.8</tukaani.version>
<easymock.version>4.0.2</easymock.version>
<hamcrest.version>1.3</hamcrest.version>
<joda.version>2.10.1</joda.version>
diff --git
a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
index d10658f..d775eba 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
@@ -31,21 +31,21 @@ public class Foo {
public interface Iface {
- public void ping() throws org.apache.thrift.TException;
+ void ping() throws org.apache.thrift.TException;
- public int add(int num1, int num2) throws org.apache.thrift.TException;
+ int add(int num1, int num2) throws org.apache.thrift.TException;
- public void zip() throws org.apache.thrift.TException;
+ void zip() throws org.apache.thrift.TException;
}
public interface AsyncIface {
- public void ping(org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException;
+ void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler)
throws org.apache.thrift.TException;
- public void add(int num1, int num2,
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws
org.apache.thrift.TException;
+ void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback
resultHandler) throws org.apache.thrift.TException;
- public void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler)
throws org.apache.thrift.TException;
+ void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws
org.apache.thrift.TException;
}
@@ -160,13 +160,14 @@ public class Foo {
prot.writeMessageEnd();
}
- public void getResult() throws org.apache.thrift.TException {
+ public Object getResult() throws org.apache.thrift.TException {
if (getState() !=
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport =
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot =
client.getProtocolFactory().getProtocol(memoryTransport);
(new Client(prot)).recv_ping();
+ return null;
}
}
@@ -195,7 +196,7 @@ public class Foo {
prot.writeMessageEnd();
}
- public int getResult() throws org.apache.thrift.TException {
+ public Object getResult() throws org.apache.thrift.TException {
if (getState() !=
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -213,7 +214,7 @@ public class Foo {
}
public static class zip_call extends
org.apache.thrift.async.TAsyncMethodCall {
- public zip_call(org.apache.thrift.async.AsyncMethodCallback
resultHandler, org.apache.thrift.async.TAsyncClient client,
org.apache.thrift.protocol.TProtocolFactory protocolFactory,
org.apache.thrift.transport.TNonblockingTransport transport) throws
org.apache.thrift.TException {
+ public zip_call(org.apache.thrift.async.AsyncMethodCallback
resultHandler, org.apache.thrift.async.TAsyncClient client,
org.apache.thrift.protocol.TProtocolFactory protocolFactory,
org.apache.thrift.transport.TNonblockingTransport transport) {
super(client, protocolFactory, transport, resultHandler, true);
}
@@ -224,12 +225,13 @@ public class Foo {
prot.writeMessageEnd();
}
- public void getResult() throws org.apache.thrift.TException {
+ public Object getResult() {
if (getState() !=
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport =
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot =
client.getProtocolFactory().getProtocol(memoryTransport);
+ return prot;
}
}
