Fixed exception handling for ReactiveClient and THeader(NettyRpcClient)

Summary: - Current Netty 4 THeader client(NettyRpcClient), returns ClientResponsePayload even in case of exceptions and it is thrown in AbstractThriftClient. - RSocketRpcClient throws exception in SPI implementation itself. This is in-consistent to THeader approach. - Fixed this by moving exception throwing to generated ReactiveClient. Removed throw from RSocketRpcClient Differential Revision: D26867352 fbshipit-source-id: ce7ac33b1e58ba5761101d9f6278f42bce3d6e7b
facebook · Mar 9, 2021 · 78f7bd9 · 78f7bd9
1 parent 4e5bb5a
commit 78f7bd9
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 41 deletions.
diff --git a/thrift/compiler/generate/templates/java/swift/ReactiveClient.mustache b/thrift/compiler/generate/templates/java/swift/ReactiveClient.mustache
@@ -231,7 +231,8 @@ public class {{service:javaCapitalName}}ReactiveClient {{#service:extends}} exte
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                {{#function:oneway?}}.singleRequestNoResponse(_crp, rpcOptions).thenReturn(ResponseWrapper.create(null, java.util.Collections.emptyMap())){{/function:oneway?}}{{!
+                }}{{^function:oneway?}}.singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());}){{/function:oneway?}};
       });
   }
 
@@ -336,9 +337,10 @@ public class {{service:javaCapitalName}}ReactiveClient {{#service:extends}} exte
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestStreamingResponse(_crp, rpcOptions){{#function:returnType}}{{^type:streamHasFirstResponse?}}
-                .filter((_p) -> ((com.facebook.swift.transport.model.StreamResponse)_p.getData()).isSetData())
-                .map(_p -> ResponseWrapper.create((({{#function:returnType}}{{> StreamResponseGeneric}}{{/function:returnType}})_p.getData()).getData(), _p.getHeaders())){{/type:streamHasFirstResponse?}}{{/function:returnType}};
+                .singleRequestStreamingResponse(_crp, rpcOptions)
+                .doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());}){{#function:returnType}}{{^type:streamHasFirstResponse?}}
+                .filter((_p) -> ((com.facebook.swift.transport.model.StreamResponse)_p.getData()).isSetData()){{/type:streamHasFirstResponse?}}{{/function:returnType}}
+                .map(_p -> ResponseWrapper.create((({{#function:returnType}}{{> StreamResponseGeneric}}{{/function:returnType}})_p.getData()){{#function:returnType}}{{^type:streamHasFirstResponse?}}.getData(){{/type:streamHasFirstResponse?}}{{/function:returnType}}, _p.getHeaders()));
       });
   }
 
@@ -472,6 +474,7 @@ public class {{service:javaCapitalName}}ReactiveClient {{#service:extends}} exte
 
             return _rpc
                 .streamingRequestStreamingResponse(_sink, rpcOptions)
+                .doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());})
                 .limitRequest(2){{#function:returnType}}{{^type:sinkHasFirstResponse?}}
                 .filter((_p) -> ((com.facebook.swift.transport.model.StreamResponse)_p.getData()).isSetData()){{/type:sinkHasFirstResponse?}}{{/function:returnType}}
                 .map(_p -> ResponseWrapper.create((({{#function:returnType}}{{> SinkResponseGeneric}}{{/function:returnType}})_p.getData()){{#function:returnType}}{{^type:sinkHasFirstResponse?}}.getData(){{/type:sinkHasFirstResponse?}}{{/function:returnType}}, _p.getHeaders()));

diff --git a/...nnotations/gen-swift/test/fixtures/basicannotations/MyServicePrioChildReactiveClient.java b/...nnotations/gen-swift/test/fixtures/basicannotations/MyServicePrioChildReactiveClient.java
@@ -84,7 +84,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...notations/gen-swift/test/fixtures/basicannotations/MyServicePrioParentReactiveClient.java b/...notations/gen-swift/test/fixtures/basicannotations/MyServicePrioParentReactiveClient.java
@@ -85,7 +85,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -141,7 +141,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...s/basic-annotations/gen-swift/test/fixtures/basicannotations/MyServiceReactiveClient.java b/...s/basic-annotations/gen-swift/test/fixtures/basicannotations/MyServiceReactiveClient.java
@@ -96,7 +96,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -153,7 +153,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -219,7 +219,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -285,7 +285,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -359,7 +359,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -433,7 +433,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestNoResponse(_crp, rpcOptions).thenReturn(ResponseWrapper.create(null, java.util.Collections.emptyMap()));
       });
   }
 
@@ -489,7 +489,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...asic-swift-bean/gen-swift/test/fixtures/basic_swift_bean/LegacyServiceReactiveClient.java b/...asic-swift-bean/gen-swift/test/fixtures/basic_swift_bean/LegacyServiceReactiveClient.java
@@ -135,7 +135,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...est/fixtures/basic/gen-swift/test/fixtures/basic/DbMixedStackArgumentsReactiveClient.java b/...est/fixtures/basic/gen-swift/test/fixtures/basic/DbMixedStackArgumentsReactiveClient.java
@@ -97,7 +97,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -163,7 +163,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...t/compiler/test/fixtures/basic/gen-swift/test/fixtures/basic/MyServiceReactiveClient.java b/...t/compiler/test/fixtures/basic/gen-swift/test/fixtures/basic/MyServiceReactiveClient.java
@@ -99,7 +99,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -156,7 +156,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -221,7 +221,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -295,7 +295,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -361,7 +361,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -427,7 +427,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -492,7 +492,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -566,7 +566,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestNoResponse(_crp, rpcOptions).thenReturn(ResponseWrapper.create(null, java.util.Collections.emptyMap()));
       });
   }
 

diff --git a/...ler/test/fixtures/exceptions/gen-swift/test/fixtures/exceptions/RaiserReactiveClient.java b/...ler/test/fixtures/exceptions/gen-swift/test/fixtures/exceptions/RaiserReactiveClient.java
@@ -153,7 +153,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -209,7 +209,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -266,7 +266,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -323,7 +323,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...iler/test/fixtures/includes/gen-swift/test/fixtures/includes/MyServiceReactiveClient.java b/...iler/test/fixtures/includes/gen-swift/test/fixtures/includes/MyServiceReactiveClient.java
@@ -107,7 +107,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -181,7 +181,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyLeafReactiveClient.java b/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyLeafReactiveClient.java
@@ -84,7 +84,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyNodeReactiveClient.java b/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyNodeReactiveClient.java
@@ -84,7 +84,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyRootReactiveClient.java b/...r/test/fixtures/inheritance/gen-swift/test/fixtures/inheritance/MyRootReactiveClient.java
@@ -84,7 +84,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...t/fixtures/interactions/gen-swift/test/fixtures/interactions/MyServiceReactiveClient.java b/...t/fixtures/interactions/gen-swift/test/fixtures/interactions/MyServiceReactiveClient.java
@@ -84,7 +84,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 

diff --git a/...r/test/fixtures/params/gen-swift/test/fixtures/params/NestedContainersReactiveClient.java b/...r/test/fixtures/params/gen-swift/test/fixtures/params/NestedContainersReactiveClient.java
@@ -112,7 +112,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -187,7 +187,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -261,7 +261,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -334,7 +334,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }
 
@@ -423,7 +423,7 @@ public reactor.core.publisher.Mono<com.facebook.swift.transport.client.ResponseW
                     java.util.Collections.emptyMap());
 
             return _rpc
-                .singleRequestSingleResponse(_crp, rpcOptions);
+                .singleRequestSingleResponse(_crp, rpcOptions).doOnNext(_p -> {if(_p.getException() != null) throw reactor.core.Exceptions.propagate(_p.getException());});
       });
   }