Feature/dubbo32. resteasy filter&intercept support #12492

suncairong163 · 2023-06-11T14:13:06Z

What is the purpose of the change

add resteasy filter&intercept support

Brief changelog

Verifying this change

Checklist

Make sure there is a GitHub_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GitHub issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Check if is necessary to patch to Dubbo 3 if you are work on Dubbo 2.7
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add sample in dubbo samples project.
Add some description to dubbo-website project if you are requesting to add a feature.
GitHub Actions works fine on your own branch.
If this contribution is large, please follow the Software Donation Guide.

suncairong163 · 2023-06-11T14:13:34Z

@AlbumenJ @CrazyHZM

chickenlj · 2023-06-12T05:57:09Z

Please add the newly added SPI extension to shade configuration in dubbo-all/pom.xml and fix the conflicts.

2023-06-11T15:10:59.4344411Z [ERROR] Failures: 
2023-06-11T15:10:59.4346957Z [ERROR]   FileTest.checkDubboAllTransform:379 Newly created SPI interface must be added to dubbo-all(dubbo-distribution/dubbo-all/pom.xml in shade plugin) to being transformed. Found spis: [org.apache.dubbo.rpc.protocol.rest.filter.RestFilter, org.apache.dubbo.rpc.protocol.rest.filter.RestResponseInterceptor] ==> expected: <true> but was: <false>

…to feature/dubbo32._resteasy_filter&intercept_support # Conflicts: # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/handler/NettyHttpHandler.java # dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/JaxrsRestProtocolTest.java

…port

CrazyHZM · 2023-06-13T06:33:05Z

...-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/RestHttpRequestDecoder.java

@@ -58,7 +62,7 @@ protected void decode(ChannelHandlerContext ctx, io.netty.handler.codec.http.Ful

            // business handler
            try {
-                handler.handle(requestFacade, nettyHttpResponse);
+                new NettyHttpHandler(serviceDeployer, url).handle(requestFacade, nettyHttpResponse);


This can result in constant creation of NettyHttpHandler instances

CrazyHZM · 2023-06-13T06:56:37Z

...ubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/handler/NettyHttpHandler.java

+            new RestFilter() {
+                @Override
+                public void filter(URL url, RequestFacade requestFacade, NettyHttpResponse response, RestFilterChain restFilterChain) throws Exception {
+
+                    restFilterChain.filter(url, requestFacade, response, restFilterChain);
+                }
+            }.filter(url, requestFacade, nettyHttpResponse, new RestFilterChain(restFilters));


This looks like RestFilterChain is fixed, because restFilters are fixed, I think the RestFilterChain here is not unnecessary, looking at the RestFilterChain logic, should just iterate through the execution of these restfilter. I don't see much logic at the moment.

CrazyHZM · 2023-06-13T07:02:37Z

...ain/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestResponseInterceptor.java

+public class ServiceInvokeRestResponseInterceptor implements RestResponseInterceptor {
+
+    @Override
+    public void intercept(URL url, RequestFacade request, NettyHttpResponse nettyHttpResponse, Object result, RpcInvocation rpcInvocation, RestResponseInterceptorChain interceptorChain, ServiceDeployer serviceDeployer) throws Exception {
+
+        writeResult(nettyHttpResponse, request, url, result, rpcInvocation.getReturnType());
+        nettyHttpResponse.setStatus(200);
+    }
+}


This does not need to exist and may skew other non-200 results.

...pc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java

.../apache/dubbo/rpc/protocol/rest/extension/resteay/filter/ResteasyContainerFilterAdapter.java

…intercept_support' into feature/dubbo32._resteasy_filter&intercept_support # Conflicts: # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java

codecov-commenter · 2023-06-18T13:46:36Z

Codecov Report

Merging #12492 (1625bd5) into 3.2 (d4856e2) will increase coverage by 0.62%.
The diff coverage is n/a.

@@              Coverage Diff              @@
##                3.2   #12492       +/-   ##
=============================================
+ Coverage     68.73%   69.35%    +0.62%     
+ Complexity      341        2      -339     
=============================================
  Files          3619     1647     -1972     
  Lines        169138    68122   -101016     
  Branches      28109     9961    -18148     
=============================================
- Hits         116249    47248    -69001     
+ Misses        42799    16320    -26479     
+ Partials      10090     4554     -5536

see 2047 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

suncairong163 · 2023-06-18T14:14:27Z

@CrazyHZM change request & response filter

…cept_support

CrazyHZM · 2023-06-26T02:12:11Z

...ubbo/rpc/protocol/rest/extension/resteasy/intercept/DubboServerWriterInterceptorContext.java

+
+    @Override
+    public void proceed() throws IOException, WebApplicationException {
+        LogMessages.LOGGER.debugf("Interceptor Context: %s,  Method : proceed", getClass().getName());


Replace with dubbo's own logger.

ping @suncairong163

CrazyHZM · 2023-06-26T02:22:43Z

...ubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/RestFilterManager.java

+import java.util.ArrayList;
+import java.util.List;
+
+public class RestFilterManager {


Each method should go back to where it was originally used and static classes are not a very good approach.
For example, executeRequestFilters and executeResponseFilters should revert to NettyHttpHandler, and restRequestFilters should be fetched from the FrameworkModel in the context. Such as the url FrameworkModel.

suncairong163 · 2023-06-27T02:10:32Z

@CrazyHZM fix some change request

…port

sonarcloud · 2023-07-12T03:42:33Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
79 Code Smells

63.2% Coverage
2.8% Duplication

suncairong163 and others added 7 commits June 8, 2023 19:14

export path matcher & Invoker to user

2c1e6ed

export path & invoker to user

317d662

add path matcher service method compare ut

f8aba9b

fix httpMethodMatch

c6ad6c9

fix bug

4e70222

add resteasy filter & intercept

e831750

add comment

dd2a6f0

suncairong163 and others added 4 commits June 13, 2023 00:52

add filter & intercept ut

382cd10

add filter & intercept ut

a6bcc38

Merge branch '3.2' into feature/dubbo32._resteay_filter&intercept_sup…

1eed6b3

…port

CrazyHZM requested changes Jun 13, 2023

View reviewed changes

suncairong163 added 5 commits June 14, 2023 02:42

fix content-type add headers

6e2c958

Merge remote-tracking branch 'origin/feature/dubbo32._resteay_filter&…

680446c

…intercept_support' into feature/dubbo32._resteasy_filter&intercept_support # Conflicts: # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java

some modify request

b73c9ed

some change request & add response filter

91c990a

add licence

90c172d

some modify request

02afea2

suncairong163 added 4 commits June 22, 2023 20:47

add rest easy exception mapper

53108af

add filter context ,execute filter by loop

81872d6

Merge branch 'apache-3.2' into feature/dubbo32._resteasy_filter&inter…

3fc0e4f

…cept_support

add test dependency

3ffc9c2

CrazyHZM requested changes Jun 26, 2023

View reviewed changes

suncairong163 added 2 commits June 26, 2023 22:23

response filter on class modify

1082429

fix ClassNoFoundError by add onclass & some chang request

33a8d05

suncairong163 added 3 commits June 27, 2023 22:02

fix change request

a8fb38e

add response intercept ut

91d5cd6

add response intercept ut

4c1dfab

CrazyHZM approved these changes Jun 29, 2023

View reviewed changes

Merge branch '3.2' into feature/dubbo32._resteay_filter&intercept_sup…

c8bf2be

…port

CrazyHZM requested review from AlbumenJ and chickenlj June 29, 2023 02:40

CrazyHZM added 2 commits July 10, 2023 16:29

Merge branch '3.2' into feature/dubbo32._resteay_filter&intercept_sup…

20c000b

…port

Merge branch '3.2' into feature/dubbo32._resteay_filter&intercept_sup…

1625bd5

…port

CrazyHZM merged commit d452ea4 into apache:3.2 Jul 12, 2023
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/dubbo32. resteasy filter&intercept support #12492

Feature/dubbo32. resteasy filter&intercept support #12492

suncairong163 commented Jun 11, 2023

suncairong163 commented Jun 11, 2023

chickenlj commented Jun 12, 2023

CrazyHZM Jun 13, 2023

CrazyHZM Jun 13, 2023

CrazyHZM Jun 13, 2023

codecov-commenter commented Jun 18, 2023 •

edited

suncairong163 commented Jun 18, 2023

CrazyHZM Jun 26, 2023

CrazyHZM Jun 27, 2023

CrazyHZM Jun 26, 2023

suncairong163 commented Jun 27, 2023

sonarcloud bot commented Jul 12, 2023

Feature/dubbo32. resteasy filter&intercept support #12492

Feature/dubbo32. resteasy filter&intercept support #12492

Conversation

suncairong163 commented Jun 11, 2023

What is the purpose of the change

Brief changelog

Verifying this change

Checklist

suncairong163 commented Jun 11, 2023

chickenlj commented Jun 12, 2023

CrazyHZM Jun 13, 2023

Choose a reason for hiding this comment

CrazyHZM Jun 13, 2023

Choose a reason for hiding this comment

CrazyHZM Jun 13, 2023

Choose a reason for hiding this comment

codecov-commenter commented Jun 18, 2023 • edited

Codecov Report

suncairong163 commented Jun 18, 2023

CrazyHZM Jun 26, 2023

Choose a reason for hiding this comment

CrazyHZM Jun 27, 2023

Choose a reason for hiding this comment

CrazyHZM Jun 26, 2023

Choose a reason for hiding this comment

suncairong163 commented Jun 27, 2023

sonarcloud bot commented Jul 12, 2023

codecov-commenter commented Jun 18, 2023 •

edited