From f7a679b4f97634eaa4953124ba56d737383cb7f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Oct 2026 17:23:28 +0000 Subject: [PATCH 1/3] 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] --- lang/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/java/pom.xml b/lang/java/pom.xml index 8998e217edb..defee7ac969 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -57,7 +57,7 @@ 4.0.1 2.0.18 1.1.10.8 - 0.20.0 + 0.25.0 1.12 2.4.1 1.5.7-12 From 2170a4dd97476405e4d26c124ee7bbd559ae49c7 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Mon, 9 Nov 2026 20:16:14 +0000 Subject: [PATCH 2/3] 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. --- .../java/org/apache/avro/thrift/test/Foo.java | 67 +++++++++++++------ 1 file changed, 47 insertions(+), 20 deletions(-) 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 e11a6224706..1d68f615c68 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 static class Processor extends org.apache.thrift.TBasePr public Processor(I iface) { super(iface, getProcessMap( - new java.util.HashMap>())); + new java.util.HashMap>())); } protected Processor(I iface, - java.util.Map> processMap) { + java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } - private static java.util.Map> getProcessMap( - java.util.Map> processMap) { + private static java.util.Map> getProcessMap( + java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("zip", new zip()); return processMap; } - public static class ping extends org.apache.thrift.ProcessFunction { + public static class ping extends org.apache.thrift.ProcessFunction { public ping() { super("ping"); } @@ -268,7 +268,11 @@ public ping_args getEmptyArgsInstance() { return new ping_args(); } - protected boolean isOneway() { + public ping_result getEmptyResultInstance() { + return new ping_result(); + } + + public boolean isOneway() { return false; } @@ -284,7 +288,7 @@ public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.T } } - public static class add extends org.apache.thrift.ProcessFunction { + public static class add extends org.apache.thrift.ProcessFunction { public add() { super("add"); } @@ -293,7 +297,11 @@ public add_args getEmptyArgsInstance() { return new add_args(); } - protected boolean isOneway() { + public add_result getEmptyResultInstance() { + return new add_result(); + } + + public boolean isOneway() { return false; } @@ -310,7 +318,8 @@ public add_result getResult(I iface, add_args args) throws org.apache.thrift.TEx } } - public static class zip extends org.apache.thrift.ProcessFunction { + public static class zip + extends org.apache.thrift.ProcessFunction { public zip() { super("zip"); } @@ -319,7 +328,11 @@ public zip_args getEmptyArgsInstance() { return new zip_args(); } - protected boolean isOneway() { + public org.apache.thrift.TBase getEmptyResultInstance() { + return null; + } + + public boolean isOneway() { return true; } @@ -341,23 +354,24 @@ public static class AsyncProcessor extends org.apache.thri public AsyncProcessor(I iface) { super(iface, getProcessMap( - new java.util.HashMap>())); + new java.util.HashMap>())); } protected AsyncProcessor(I iface, - java.util.Map> processMap) { + java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } - private static java.util.Map> getProcessMap( - java.util.Map> processMap) { + private static java.util.Map> getProcessMap( + java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("zip", new zip()); return processMap; } - public static class ping extends org.apache.thrift.AsyncProcessFunction { + public static class ping + extends org.apache.thrift.AsyncProcessFunction { public ping() { super("ping"); } @@ -366,6 +380,10 @@ public ping_args getEmptyArgsInstance() { return new ping_args(); } + public ping_result getEmptyResultInstance() { + return new ping_result(); + } + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; @@ -411,7 +429,7 @@ public void onError(java.lang.Exception e) { }; } - protected boolean isOneway() { + public boolean isOneway() { return false; } @@ -422,7 +440,7 @@ public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCa } public static class add - extends org.apache.thrift.AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public add() { super("add"); } @@ -431,6 +449,10 @@ public add_args getEmptyArgsInstance() { return new add_args(); } + public add_result getEmptyResultInstance() { + return new add_result(); + } + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; @@ -478,7 +500,7 @@ public void onError(java.lang.Exception e) { }; } - protected boolean isOneway() { + public boolean isOneway() { return false; } @@ -489,7 +511,8 @@ public void start(I iface, add_args args, } } - public static class zip extends org.apache.thrift.AsyncProcessFunction { + public static class zip + extends org.apache.thrift.AsyncProcessFunction { public zip() { super("zip"); } @@ -498,6 +521,10 @@ public zip_args getEmptyArgsInstance() { return new zip_args(); } + public org.apache.thrift.TBase getEmptyResultInstance() { + return null; + } + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; @@ -516,7 +543,7 @@ public void onError(java.lang.Exception e) { }; } - protected boolean isOneway() { + public boolean isOneway() { return true; } From 81ca66b6d467a9ca621ef8a15086a54ca9a0db72 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 10 Nov 2026 07:50:56 +0000 Subject: [PATCH 3/3] Fix @Override placement in Foo.java --- .../test/java/org/apache/avro/thrift/test/Foo.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 1d68f615c68..96e8a0c612e 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 @@ -268,10 +268,12 @@ public ping_args getEmptyArgsInstance() { return new ping_args(); } + @Override public ping_result getEmptyResultInstance() { return new ping_result(); } + @Override public boolean isOneway() { return false; } @@ -297,10 +299,12 @@ public add_args getEmptyArgsInstance() { return new add_args(); } + @Override public add_result getEmptyResultInstance() { return new add_result(); } + @Override public boolean isOneway() { return false; } @@ -328,10 +332,12 @@ public zip_args getEmptyArgsInstance() { return new zip_args(); } + @Override public org.apache.thrift.TBase getEmptyResultInstance() { return null; } + @Override public boolean isOneway() { return true; } @@ -380,6 +386,7 @@ public ping_args getEmptyArgsInstance() { return new ping_args(); } + @Override public ping_result getEmptyResultInstance() { return new ping_result(); } @@ -429,6 +436,7 @@ public void onError(java.lang.Exception e) { }; } + @Override public boolean isOneway() { return false; } @@ -449,6 +457,7 @@ public add_args getEmptyArgsInstance() { return new add_args(); } + @Override public add_result getEmptyResultInstance() { return new add_result(); } @@ -500,6 +509,7 @@ public void onError(java.lang.Exception e) { }; } + @Override public boolean isOneway() { return false; } @@ -521,6 +531,7 @@ public zip_args getEmptyArgsInstance() { return new zip_args(); } + @Override public org.apache.thrift.TBase getEmptyResultInstance() { return null; } @@ -543,6 +554,7 @@ public void onError(java.lang.Exception e) { }; } + @Override public boolean isOneway() { return true; } @@ -2193,4 +2205,4 @@ private static S scheme(org.apache. } } -} +} \ No newline at end of file