This is an automated email from the ASF dual-hosted git repository. Fokko pushed a commit to branch dependabot/github_actions in repository https://gitbox.apache.org/repos/asf/avro.git
commit 2170a4dd97476405e4d26c124ee7bbd559ae49c7 Author: Fokko Driesprong <[email protected]> AuthorDate: Mon Nov 9 20:16:14 2026 +0000 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. --- .../test/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 e11a622470..1d68f615c6 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,11 @@ public class Foo { 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 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 +297,11 @@ public class Foo { 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 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 +328,11 @@ public class Foo { 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 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 +380,10 @@ public class Foo { return new ping_args(); } + 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 +429,7 @@ public class Foo { }; } - protected boolean isOneway() { + public boolean isOneway() { return false; } @@ -422,7 +440,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 +449,10 @@ public class Foo { return new add_args(); } + 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 +500,7 @@ public class Foo { }; } - protected boolean isOneway() { + public boolean isOneway() { return false; } @@ -489,7 +511,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 +521,10 @@ public class Foo { return new zip_args(); } + 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 +543,7 @@ public class Foo { }; } - protected boolean isOneway() { + public boolean isOneway() { return true; }
