This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from d974a5499e Bump aspectjweaver from 1.9.5 to 1.9.19 (#11996)
add 912deb69a8 Feature/3.2 rest protocol provider (#11640)
No new revisions were added by this update.
Summary of changes:
.../org/apache/dubbo/common/utils/PathUtils.java | 5 +-
.../java/org/apache/dubbo/common/vo/UserVo.java | 84 +++++++
.../config/deploy/DefaultApplicationDeployer.java | 7 -
.../apache/dubbo/config/ReferenceConfigTest.java | 2 +-
dubbo-dependencies-bom/pom.xml | 8 -
dubbo-distribution/dubbo-all/pom.xml | 7 +
.../apache/dubbo/metadata/MetadataConstants.java | 15 +-
.../AbstractNoAnnotatedParameterProcessor.java | 7 +-
.../rest/AbstractServiceRestMetadataResolver.java | 18 +-
.../org/apache/dubbo/metadata/rest/ArgInfo.java | 17 ++
.../NoAnnotatedParameterRequestTagProcessor.java | 2 +-
.../org/apache/dubbo/metadata/rest/ParamType.java | 22 +-
.../apache/dubbo/metadata/rest/PathMatcher.java | 101 ++++++--
.../dubbo/metadata/rest/RequestMetadata.java | 13 ++
.../dubbo/metadata/rest/RestMethodMetadata.java | 37 ++-
.../dubbo/metadata/rest/ServiceRestMetadata.java | 58 ++++-
.../dubbo/metadata/rest/media/MediaType.java | 10 +
.../springmvc/FormBodyNoAnnotatedProcessor.java | 4 +-
.../springmvc/JsonBodyNoAnnotatedProcessor.java | 4 +-
.../rest/springmvc/ParamNoAnnotatedProcessor.java | 4 +-
.../apache/dubbo/metadata/rest/tag/BodyTag.java | 5 +-
.../apache/dubbo/metadata/rest/tag/ParamTag.java | 8 +-
.../org/apache/dubbo/metadata/PathMatcherTest.java | 44 +++-
.../{PathMatcherTest.java => TestMediaType.java} | 14 +-
...RestDoubleCheckContainsPathVariableService.java | 33 ++-
.../rest/api/JaxrsRestDoubleCheckService.java | 30 ++-
.../dubbo/metadata/rest/api/JaxrsRestService.java | 6 +
.../metadata/rest/api/JaxrsRestServiceImpl.java | 5 +
.../dubbo/metadata/rest/api/SpringRestService.java | 11 +-
.../metadata/rest/api/SpringRestServiceImpl.java | 15 ++
.../JAXRSServiceRestMetadataResolverTest.java | 12 +-
.../rest/jaxrs/JaxrsRestDoubleCheckTest.java | 48 ++++
.../SpringMvcServiceRestMetadataResolverTest.java | 40 +++-
.../rest/AbstractServiceRestMetadataResolver.java | 15 +-
.../org/apache/dubbo/metrics/model/MetricsKey.java | 6 +
.../dubbo/metrics/filter/MetricsFilterTest.java | 20 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 1 -
.../apache/dubbo/remoting/http/HttpHandler.java | 8 +-
.../dubbo/remoting/http/RequestTemplate.java | 16 +-
.../org/apache/dubbo/remoting/http/RestResult.java | 7 +
.../http/restclient/HttpClientRestClient.java | 3 +-
.../remoting/http/restclient/OKHttpRestClient.java | 4 +-
.../http/restclient/URLConnectionRestClient.java | 101 ++++----
.../remoting/http/jetty/JettyHttpBinderTest.java | 2 +-
.../http/jetty/JettyLoggerAdapterTest.java | 2 +-
.../dubbo/remoting/http/rest/RestClientTest.java | 199 ++++++++++++++++
.../remoting/http/tomcat/TomcatHttpBinderTest.java | 2 +-
.../dubbo/rpc/protocol/AbstractProtocol.java | 14 +-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 12 -
dubbo-rpc/dubbo-rpc-rest/pom.xml | 6 -
.../rpc/protocol/rest/BaseRestProtocolServer.java | 90 --------
.../apache/dubbo/rpc/protocol/rest/Constants.java | 11 +-
.../rpc/protocol/rest/DubboHttpProtocolServer.java | 130 -----------
.../rpc/protocol/rest/DubboResourceFactory.java | 60 -----
.../rpc/protocol/rest/NettyHttpRestServer.java | 216 ++++++++++++++++++
.../rpc/protocol/rest/NettyRestProtocolServer.java | 74 ------
.../rpc/protocol/rest/PathAndInvokerMapper.java | 124 ++++++++++
.../dubbo/rpc/protocol/rest/RestHeaderEnum.java} | 52 ++---
.../dubbo/rpc/protocol/rest/RestInvoker.java | 140 ++++++++++++
.../dubbo/rpc/protocol/rest/RestProtocol.java | 210 +++++------------
.../rpc/protocol/rest/RestProtocolServer.java | 11 +-
.../rpc/protocol/rest/RestRPCInvocationUtil.java | 142 ++++++++++++
.../dubbo/rpc/protocol/rest/RestServerFactory.java | 11 +-
.../dubbo/rpc/protocol/rest/RpcContextFilter.java | 116 ----------
.../rpc/protocol/rest/RpcExceptionMapper.java | 27 +--
.../rest/annotation/ParamParserManager.java | 33 ++-
.../annotation/consumer/HttpConnectionConfig.java | 51 -----
.../consumer/HttpConnectionCreateContext.java | 16 +-
.../consumer/HttpConnectionPreBuildIntercept.java | 3 +
.../inercept/AddMustAttachmentIntercept.java | 13 +-
.../consumer/inercept/AttachmentIntercept.java | 42 +---
.../consumer/inercept/ParamParseIntercept.java | 6 +-
.../consumer/inercept/PathVariableIntercept.java | 3 +
.../consumer/inercept/RequestHeaderIntercept.java | 22 +-
.../consumer/inercept/SerializeBodyIntercept.java | 16 +-
.../rest/annotation/metadata/MetadataResolver.java | 25 +-
.../parse/consumer/BodyConsumerParamParser.java | 2 +-
.../parse/consumer/FormConsumerParamParser.java | 32 ++-
.../parse/consumer/HeaderConsumerParamParser.java | 21 +-
.../consumer/ParameterConsumerParamParser.java | 22 +-
.../parse/provider/BaseProviderParamParser.java} | 8 +-
.../parse/provider/BodyProviderParamParser.java | 57 +++++
.../parse/provider/HeaderProviderParamParser.java | 65 ++++++
.../parse/provider/ParamProviderParamParser.java | 65 ++++++
.../PathProviderParamParser.java} | 27 +--
.../ProviderParamParser.java} | 38 ++--
.../param/parse/provider/ProviderParseContext.java | 70 ++++++
.../rpc/protocol/rest/constans/RestConstant.java | 33 +--
.../exception/CodeStyleNotSupportException.java | 5 +-
...xception.java => DoublePathCheckException.java} | 7 +-
...ption.java => MediaTypeUnSupportException.java} | 5 +-
...ientException.java => ParamParseException.java} | 6 +-
...ortException.java => PathNoFoundException.java} | 7 +-
.../exception/RemoteServerInternalException.java | 5 +-
...NotSupportException.java => RestException.java} | 7 +-
.../exception/UnSupportContentTypeException.java | 2 +-
.../rest/exception/mapper/ExceptionHandler.java | 8 +-
.../rest/exception/mapper/ExceptionMapper.java | 113 +++++++++
.../protocol/rest/handler/NettyHttpHandler.java | 210 +++++++++++++++++
.../protocol/rest/message/HttpMessageCodec.java | 22 +-
.../rest/message/HttpMessageCodecManager.java | 49 +++-
.../protocol/rest/message/HttpMessageDecode.java | 2 +-
.../protocol/rest/message/MediaTypeMatcher.java | 1 -
.../rest/message/codec/ByteArrayCodec.java | 17 +-
.../rpc/protocol/rest/message/codec/JsonCodec.java | 19 +-
.../rest/message/codec/MultiValueCodec.java | 63 ++++-
.../protocol/rest/message/codec/StringCodec.java | 17 +-
.../rpc/protocol/rest/message/codec/TextCodec.java | 17 +-
.../rpc/protocol/rest/message/codec/XMLCodec.java | 18 +-
.../rpc/protocol/rest/netty/ChunkOutputStream.java | 91 ++++++++
.../StreamUtils.java => netty/HttpResponse.java} | 58 +++--
.../rpc/protocol/rest/netty/NettyHttpResponse.java | 214 +++++++++++++++++
.../dubbo/rpc/protocol/rest/netty/NettyServer.java | 184 +++++++++++++++
.../rest/netty/RestHttpRequestDecoder.java | 77 +++++++
.../UnSharedHandlerCreator.java} | 12 +-
.../pair/InvokerAndRestMethodMetadataPair.java | 37 ++-
.../MessageCodecResultPair.java} | 34 ++-
.../protocol/rest/request/NettyRequestFacade.java | 253 +++++++++++++++++++++
.../rpc/protocol/rest/request/RequestFacade.java | 135 +++++++++++
.../rpc/protocol/rest/support/LoggingFilter.java | 148 ------------
.../rpc/protocol/rest/util/DataParseUtils.java | 53 +++--
.../rpc/protocol/rest/util/HttpHeaderUtil.java | 217 ++++++++++++++++++
.../rpc/protocol/rest/util/MediaTypeUtil.java | 21 +-
.../rpc/protocol/rest/util/MultiValueCreator.java | 73 +++++-
.../dubbo/rpc/protocol/rest/util/NumberUtils.java | 32 +--
.../dubbo/rpc/protocol/rest/util/ReflectUtils.java | 192 ++++------------
.../dubbo/rpc/protocol/rest/util/TypeUtil.java | 38 ----
...on.param.parse.provider.BaseProviderParamParser | 4 +
.../rpc/protocol/rest/DataParseUtilsTest.java | 62 +++++
.../dubbo/rpc/protocol/rest/DemoService.java | 123 ++++++++--
.../dubbo/rpc/protocol/rest/DemoServiceImpl.java | 99 +++++++-
.../rpc/protocol/rest/ExceptionMapperTest.java | 75 ++++++
.../protocol/rest/HttpMessageCodecManagerTest.java | 57 +++++
.../rpc/protocol/rest/JaxrsRestProtocolTest.java | 217 +++++++++++++++++-
.../dubbo/rpc/protocol/rest/MediaTypeUtilTest.java | 58 +++++
.../rpc/protocol/rest/NettyRequestFacadeTest.java | 102 +++++++++
.../dubbo/rpc/protocol/rest/NumberUtilsTest.java | 177 ++++++++++++++
.../rpc/protocol/rest/RpcExceptionMapperTest.java | 56 ++++-
.../protocol/rest/SpringMvcRestProtocolTest.java | 223 +++++++++++++-----
.../org/apache/dubbo/rpc/protocol/rest/User.java | 8 +
.../protocol/rest/mvc/SpringDemoServiceImpl.java | 28 ++-
...DemoService.java => SpringRestDemoService.java} | 22 +-
.../protocol/rest/rest/AnotherUserRestService.java | 7 +
.../rest/rest/AnotherUserRestServiceImpl.java | 9 +
.../rpc/protocol/rest/rest/RegistrationResult.java | 14 ++
...oService.java => RestDemoForTestException.java} | 22 +-
.../rpc/protocol/rest/rest/RestDemoService.java | 12 +-
.../protocol/rest/rest/RestDemoServiceImpl.java | 5 +
148 files changed, 5295 insertions(+), 1752 deletions(-)
create mode 100644
dubbo-common/src/test/java/org/apache/dubbo/common/vo/UserVo.java
copy
dubbo-test/dubbo-test-common/src/main/java/org/apache/dubbo/test/common/api/SpringmvcDemoService.java
=>
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/rest/tag/ParamTag.java
(85%)
copy
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/{PathMatcherTest.java
=> TestMediaType.java} (73%)
copy
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/rest/RestDemoService.java
=>
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/rest/api/JaxrsRestDoubleCheckContainsPathVariableService.java
(63%)
copy
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/rest/RestDemoService.java
=>
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/rest/api/JaxrsRestDoubleCheckService.java
(67%)
create mode 100644
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/rest/jaxrs/JaxrsRestDoubleCheckTest.java
create mode 100644
dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/rest/RestClientTest.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/BaseRestProtocolServer.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboHttpProtocolServer.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboResourceFactory.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyHttpRestServer.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyRestProtocolServer.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java
copy
dubbo-rpc/dubbo-rpc-rest/src/{test/java/org/apache/dubbo/rpc/protocol/rest/User.java
=> main/java/org/apache/dubbo/rpc/protocol/rest/RestHeaderEnum.java} (56%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestInvoker.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestRPCInvocationUtil.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcContextFilter.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/consumer/HttpConnectionConfig.java
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/{consumer/HttpConnectionPreBuildIntercept.java
=> param/parse/provider/BaseProviderParamParser.java} (80%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/BodyProviderParamParser.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/HeaderProviderParamParser.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/ParamProviderParamParser.java
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/{consumer/BodyConsumerParamParser.java
=> provider/PathProviderParamParser.java} (62%)
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/{consumer/BodyConsumerParamParser.java
=> provider/ProviderParamParser.java} (55%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/ProviderParseContext.java
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/{CodeStyleNotSupportException.java
=> DoublePathCheckException.java} (83%)
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/{CodeStyleNotSupportException.java
=> MediaTypeUnSupportException.java} (87%)
rename
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/{HttpClientException.java
=> ParamParseException.java} (83%)
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/{CodeStyleNotSupportException.java
=> PathNoFoundException.java} (84%)
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/{CodeStyleNotSupportException.java
=> RestException.java} (87%)
rename
dubbo-test/dubbo-test-common/src/main/java/org/apache/dubbo/test/common/api/SpringmvcDemoService.java
=>
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/mapper/ExceptionHandler.java
(84%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/exception/mapper/ExceptionMapper.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/handler/NettyHttpHandler.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/ChunkOutputStream.java
rename
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/{util/StreamUtils.java
=> netty/HttpResponse.java} (53%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/NettyHttpResponse.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/NettyServer.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/RestHttpRequestDecoder.java
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/{message/HttpMessageDecode.java
=> netty/UnSharedHandlerCreator.java} (72%)
copy
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/rest/springmvc/JsonBodyNoAnnotatedProcessor.java
=>
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/pair/InvokerAndRestMethodMetadataPair.java
(52%)
copy
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/{exception/UnSupportContentTypeException.java
=> pair/MessageCodecResultPair.java} (56%)
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/request/NettyRequestFacade.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/request/RequestFacade.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/LoggingFilter.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/util/HttpHeaderUtil.java
delete mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/util/TypeUtil.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.rest.annotation.param.parse.provider.BaseProviderParamParser
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DataParseUtilsTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/ExceptionMapperTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/HttpMessageCodecManagerTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/MediaTypeUtilTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/NettyRequestFacadeTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/NumberUtilsTest.java
rename
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/mvc/{DemoService.java
=> SpringRestDemoService.java} (59%)
copy
dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/rest/{RestDemoService.java
=> RestDemoForTestException.java} (82%)
