This is an automated email from the ASF dual-hosted git repository.
Fokko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new 08d2fd7828 Bump org.apache.thrift:libthrift from 0.20.0 to 0.25.0 in
/lang/java (#4026)
08d2fd7828 is described below
commit 08d2fd78286896beb922528c79e7a7d870fce504
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Nov 10 19:07:32 2026 +0100
Bump org.apache.thrift:libthrift from 0.20.0 to 0.25.0 in /lang/java (#4026)
* Bump org.apache.thrift:libthrift from 0.20.0 to 0.25.0 in /lang/java
Bumps [org.apache.thrift:libthrift](https://github.com/apache/thrift) from
0.20.0 to 0.25.0.
- [Release notes](https://github.com/apache/thrift/releases)
- [Changelog](https://github.com/apache/thrift/blob/master/CHANGES.md)
- [Commits](https://github.com/apache/thrift/compare/v0.20.0...v0.25.0)
---
updated-dependencies:
- dependency-name: org.apache.thrift:libthrift
dependency-version: 0.25.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* AVRO: adapt thrift test code to libthrift 0.25 API
ProcessFunction now takes a third type parameter (result type) and
AsyncProcessFunction likewise; getEmptyResultInstance() is required.
The zip oneway case returns TBase/null as before.
* Fix @Override placement in Foo.java
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fokko Driesprong <[email protected]>
---
lang/java/pom.xml | 2 +-
.../test/java/org/apache/avro/thrift/test/Foo.java | 81 ++++++++++++++++------
2 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index aeebad1ea2..b7b2267bb6 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -57,7 +57,7 @@
<servlet-api.version>4.0.1</servlet-api.version>
<slf4j.version>2.0.20</slf4j.version>
<snappy.version>1.1.10.12</snappy.version>
- <thrift.version>0.20.0</thrift.version>
+ <thrift.version>0.25.0</thrift.version>
<tukaani.version>1.12</tukaani.version>
<velocity.version>2.4.1</velocity.version>
<zstd-jni.version>1.5.7-25</zstd-jni.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 e11a622470..96e8a0c612 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
@@ -243,23 +243,23 @@ public class Foo {
public Processor(I iface) {
super(iface, getProcessMap(
- new java.util.HashMap<java.lang.String,
org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+ new java.util.HashMap<java.lang.String,
org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase, ?
extends org.apache.thrift.TBase>>()));
}
protected Processor(I iface,
- java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ?
extends org.apache.thrift.TBase>> processMap) {
+ java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ?
extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>
processMap) {
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, ? extends org.apache.thrift.TBase, ?
extends org.apache.thrift.TBase>> getProcessMap(
+ java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ?
extends org.apache.thrift.TBase, ? extends org.apache.thrift.TBase>>
processMap) {
processMap.put("ping", new ping());
processMap.put("add", new add());
processMap.put("zip", new zip());
return processMap;
}
- public static class ping<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, ping_args> {
+ public static class ping<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, ping_args, ping_result> {
public ping() {
super("ping");
}
@@ -268,7 +268,13 @@ public class Foo {
return new ping_args();
}
- protected boolean isOneway() {
+ @Override
+ public ping_result getEmptyResultInstance() {
+ return new ping_result();
+ }
+
+ @Override
+ public boolean isOneway() {
return false;
}
@@ -284,7 +290,7 @@ public class Foo {
}
}
- public static class add<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, add_args> {
+ public static class add<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, add_args, add_result> {
public add() {
super("add");
}
@@ -293,7 +299,13 @@ public class Foo {
return new add_args();
}
- protected boolean isOneway() {
+ @Override
+ public add_result getEmptyResultInstance() {
+ return new add_result();
+ }
+
+ @Override
+ public boolean isOneway() {
return false;
}
@@ -310,7 +322,8 @@ public class Foo {
}
}
- public static class zip<I extends Iface> extends
org.apache.thrift.ProcessFunction<I, zip_args> {
+ public static class zip<I extends Iface>
+ extends org.apache.thrift.ProcessFunction<I, zip_args,
org.apache.thrift.TBase> {
public zip() {
super("zip");
}
@@ -319,7 +332,13 @@ public class Foo {
return new zip_args();
}
- protected boolean isOneway() {
+ @Override
+ public org.apache.thrift.TBase getEmptyResultInstance() {
+ return null;
+ }
+
+ @Override
+ public boolean isOneway() {
return true;
}
@@ -341,23 +360,24 @@ public class Foo {
public AsyncProcessor(I iface) {
super(iface, getProcessMap(
- new java.util.HashMap<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,
?>>()));
+ new java.util.HashMap<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?,
? extends org.apache.thrift.TBase>>()));
}
protected AsyncProcessor(I iface,
- java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,
?>> processMap) {
+ java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?,
? extends org.apache.thrift.TBase>> processMap) {
super(iface, getProcessMap(processMap));
}
- private static <I extends AsyncIface> java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,
?>> getProcessMap(
- java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,
?>> processMap) {
+ private static <I extends AsyncIface> java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?,
? extends org.apache.thrift.TBase>> getProcessMap(
+ java.util.Map<java.lang.String,
org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?,
? extends org.apache.thrift.TBase>> processMap) {
processMap.put("ping", new ping());
processMap.put("add", new add());
processMap.put("zip", new zip());
return processMap;
}
- public static class ping<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, ping_args, Void> {
+ public static class ping<I extends AsyncIface>
+ extends org.apache.thrift.AsyncProcessFunction<I, ping_args, Void,
ping_result> {
public ping() {
super("ping");
}
@@ -366,6 +386,11 @@ public class Foo {
return new ping_args();
}
+ @Override
+ public ping_result getEmptyResultInstance() {
+ return new ping_result();
+ }
+
public org.apache.thrift.async.AsyncMethodCallback<Void>
getResultHandler(
final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
@@ -411,7 +436,8 @@ public class Foo {
};
}
- protected boolean isOneway() {
+ @Override
+ public boolean isOneway() {
return false;
}
@@ -422,7 +448,7 @@ public class Foo {
}
public static class add<I extends AsyncIface>
- extends org.apache.thrift.AsyncProcessFunction<I, add_args,
java.lang.Integer> {
+ extends org.apache.thrift.AsyncProcessFunction<I, add_args,
java.lang.Integer, add_result> {
public add() {
super("add");
}
@@ -431,6 +457,11 @@ public class Foo {
return new add_args();
}
+ @Override
+ public add_result getEmptyResultInstance() {
+ return new add_result();
+ }
+
public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer>
getResultHandler(
final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
@@ -478,7 +509,8 @@ public class Foo {
};
}
- protected boolean isOneway() {
+ @Override
+ public boolean isOneway() {
return false;
}
@@ -489,7 +521,8 @@ public class Foo {
}
}
- public static class zip<I extends AsyncIface> extends
org.apache.thrift.AsyncProcessFunction<I, zip_args, Void> {
+ public static class zip<I extends AsyncIface>
+ extends org.apache.thrift.AsyncProcessFunction<I, zip_args, Void,
org.apache.thrift.TBase> {
public zip() {
super("zip");
}
@@ -498,6 +531,11 @@ public class Foo {
return new zip_args();
}
+ @Override
+ public org.apache.thrift.TBase getEmptyResultInstance() {
+ return null;
+ }
+
public org.apache.thrift.async.AsyncMethodCallback<Void>
getResultHandler(
final
org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final
int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
@@ -516,7 +554,8 @@ public class Foo {
};
}
- protected boolean isOneway() {
+ @Override
+ public boolean isOneway() {
return true;
}
@@ -2166,4 +2205,4 @@ public class Foo {
}
}
-}
+}
\ No newline at end of file
