study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor to unify parameters resolving

Browse Source
This commit is contained in:
mercyblitz 2019-02-21 14:47:28 +08:00
parent 5becc06535
commit 3e39f03380
22 changed files with 475 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
View File

@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.dubbo.autoconfigure;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestBodyServerParameterResolver;
import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestBodyServiceParameterResolver;
import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestParamServiceParameterResolver;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -43,7 +43,7 @@ public class DubboServiceAutoConfiguration {
@Import(value = {
DubboGenericServiceExecutionContextFactory.class,
RequestParamServiceParameterResolver.class,
RequestBodyServerParameterResolver.class,
RequestBodyServiceParameterResolver.class,
})
static class ParameterResolversConfiguration {
}

20
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboAdapterLoadBalancerInterceptor.java
View File

@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
import com.alibaba.dubbo.rpc.service.GenericException;
import com.alibaba.dubbo.rpc.service.GenericService;
import org.springframework.cloud.alibaba.dubbo.http.DefaultServerHttpRequest;
import org.springframework.cloud.alibaba.dubbo.http.DefaultHttpServerRequest;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
@ -35,12 +35,13 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
import java.io.IOException;
import java.net.URI;
import java.util.List;
import static org.springframework.web.util.UriComponentsBuilder.fromUri;
/**
* Dubbo {@link ClientHttpRequestInterceptor} implementation to adapt {@link LoadBalancerInterceptor}
*
@ -81,13 +82,11 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
URI originalUri = request.getURI();
UriComponents uriComponents = UriComponentsBuilder.fromUri(originalUri).build(true);
String serviceName = originalUri.getHost();
repository.initialize(serviceName);
RequestMetadata clientMetadata = buildRequestMetadata(request, uriComponents);
RequestMetadata clientMetadata = buildRequestMetadata(request);
DubboServiceMetadata dubboServiceMetadata = repository.get(serviceName, clientMetadata);
@ -95,12 +94,12 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
return loadBalancerInterceptor.intercept(request, body, execution);
}
RestMethodMetadata restMethodMetadata = dubboServiceMetadata.getRestMethodMetadata();
RestMethodMetadata dubboRestMethodMetadata = dubboServiceMetadata.getRestMethodMetadata();
GenericService genericService = serviceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
DubboGenericServiceExecutionContext context = contextFactory.create(restMethodMetadata,
new DefaultServerHttpRequest(request, body));
DubboGenericServiceExecutionContext context = contextFactory.create(dubboRestMethodMetadata,
new DefaultHttpServerRequest(request, body));
Object result = null;
GenericException exception = null;
@ -111,10 +110,11 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
exception = e;
}
return clientHttpResponseFactory.build(result, exception, clientMetadata, restMethodMetadata);
return clientHttpResponseFactory.build(result, exception, clientMetadata, dubboRestMethodMetadata);
}
public static RequestMetadata buildRequestMetadata(HttpRequest request, UriComponents uriComponents) {
public static RequestMetadata buildRequestMetadata(HttpRequest request) {
UriComponents uriComponents = fromUri(request.getURI()).build(true);
RequestMetadata requestMetadata = new RequestMetadata();
requestMetadata.setPath(uriComponents.getPath());
requestMetadata.setMethod(request.getMethod().name());

46
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultServerHttpRequest.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpServerRequest.java
View File

@ -16,41 +16,50 @@
*/
package org.springframework.cloud.alibaba.dubbo.http;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
import org.springframework.http.server.ServerHttpAsyncRequestControl;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.util.MultiValueMap;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
import java.net.URI;
import java.security.Principal;
import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.getParameters;
import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.parseCookies;
import static org.springframework.http.HttpHeaders.readOnlyHttpHeaders;
/**
* Default {@link ServerHttpRequest} implementation
* Default {@link HttpServerRequest} implementation
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class DefaultServerHttpRequest implements ServerHttpRequest {
public class DefaultHttpServerRequest implements HttpServerRequest {
private final HttpMethod httpMethod;
private final URI uri;
private final String path;
private final MultiValueMap<String, String> queryParams;
private final HttpHeaders httpHeaders;
private final MultiValueMap<String, HttpCookie> cookies;
private final HttpInputMessage httpInputMessage;
public DefaultServerHttpRequest(HttpRequest httpRequest, byte[] body) {
public DefaultHttpServerRequest(HttpRequest httpRequest, byte[] body) {
this.httpMethod = httpRequest.getMethod();
this.uri = httpRequest.getURI();
this.httpHeaders = httpRequest.getHeaders();
this.path = uri.getPath();
this.httpHeaders = readOnlyHttpHeaders(httpRequest.getHeaders());
this.queryParams = getParameters(httpRequest);
this.httpInputMessage = new ByteArrayHttpInputMessage(body);
this.cookies = parseCookies(httpHeaders);
}
@Override
@ -79,22 +88,17 @@ public class DefaultServerHttpRequest implements ServerHttpRequest {
}
@Override
public Principal getPrincipal() {
throw new UnsupportedOperationException();
public String getPath() {
return path;
}
@Override
public InetSocketAddress getLocalAddress() {
throw new UnsupportedOperationException();
public MultiValueMap<String, String> getQueryParams() {
return queryParams;
}
@Override
public InetSocketAddress getRemoteAddress() {
throw new UnsupportedOperationException();
}
@Override
public ServerHttpAsyncRequestControl getAsyncRequestControl(ServerHttpResponse response) {
throw new UnsupportedOperationException();
public MultiValueMap<String, HttpCookie> getCookies() {
return cookies;
}
}

48
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.http;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpRequest;
import org.springframework.util.MultiValueMap;
/**
* HTTP Server Request
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public interface HttpServerRequest extends HttpRequest, HttpInputMessage {
/**
* Return a path of current HTTP request
*
* @return
*/
String getPath();
/**
* Return a read-only map with parsed and decoded query parameter values.
*/
MultiValueMap<String, String> getQueryParams();
/**
* Return a read-only map of cookies sent by the client.
*/
MultiValueMap<String, HttpCookie> getCookies();
}

35
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtils.java
View File

@ -16,6 +16,8 @@
*/
package org.springframework.cloud.alibaba.dubbo.http.util;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@ -31,8 +33,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.springframework.http.HttpHeaders.COOKIE;
import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
import static org.springframework.util.StringUtils.delimitedListToStringArray;
import static org.springframework.util.StringUtils.trimAllWhitespace;
import static org.springframework.util.StringUtils.trimWhitespace;
/**
* Http Utilities class
@ -47,6 +52,8 @@ public abstract class HttpUtils {
private static final String AND = "&";
private static final String SEMICOLON = ";";
/**
* The empty value
*/
@ -71,7 +78,6 @@ public abstract class HttpUtils {
* @return The query parameters
*/
public static MultiValueMap<String, String> getParameters(String queryString) {
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
return getParameters(delimitedListToStringArray(queryString, AND));
}
@ -93,7 +99,7 @@ public abstract class HttpUtils {
addParam(parameters, name, value);
}
}
return parameters;
return unmodifiableMultiValueMap(parameters);
}
/**
@ -107,6 +113,31 @@ public abstract class HttpUtils {
return getParameters(Arrays.asList(pairs));
}
/**
* Parse a read-only {@link MultiValueMap} of {@link HttpCookie} from {@link HttpHeaders}
*
* @param httpHeaders {@link HttpHeaders}
* @return non-null, the key is a cookie name , the value is {@link HttpCookie}
*/
public static MultiValueMap<String, HttpCookie> parseCookies(HttpHeaders httpHeaders) {
String cookie = httpHeaders.getFirst(COOKIE);
String[] cookieNameAndValues = StringUtils.delimitedListToStringArray(cookie, SEMICOLON);
MultiValueMap<String, HttpCookie> cookies = new LinkedMultiValueMap<>(cookieNameAndValues.length);
for (String cookeNameAndValue : cookieNameAndValues) {
String[] nameAndValue = delimitedListToStringArray(trimWhitespace(cookeNameAndValue), EQUAL);
String name = nameAndValue[0];
String value = nameAndValue.length < 2 ? null : nameAndValue[1];
HttpCookie httpCookie = new HttpCookie(name, value);
cookies.add(name, httpCookie);
}
return unmodifiableMultiValueMap(cookies);
}
/**
* To the name and value line sets
*

10
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java
View File

@ -123,4 +123,14 @@ public class MethodMetadata {
public int hashCode() {
return Objects.hash(name, returnType, params);
}
@Override
public String toString() {
return "MethodMetadata{" +
"name='" + name + '\'' +
", returnType='" + returnType + '\'' +
", params=" + params +
", method=" + method +
'}';
}
}

9
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java
View File

@ -73,4 +73,13 @@ public class MethodParameterMetadata {
public int hashCode() {
return Objects.hash(index, name, type);
}
@Override
public String toString() {
return "MethodParameterMetadata{" +
"index=" + index +
", name='" + name + '\'' +
", type='" + type + '\'' +
'}';
}
}

21
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java
View File

@ -41,7 +41,7 @@ public class RestMethodMetadata {
@JsonProperty("url-index")
private Integer urlIndex;
@JsonProperty("body-index")
@JsonProperty("setBody-index")
private Integer bodyIndex;
@JsonProperty("header-map-index")
@ -56,7 +56,7 @@ public class RestMethodMetadata {
@JsonProperty("return-type")
private String returnType;
@JsonProperty("body-type")
@JsonProperty("setBody-type")
private String bodyType;
@JsonProperty("index-to-name")
@ -214,4 +214,21 @@ public class RestMethodMetadata {
return resolvableType.resolve().getName();
}
@Override
public String toString() {
return "RestMethodMetadata{" +
"method=" + method +
", request=" + request +
", urlIndex=" + urlIndex +
", bodyIndex=" + bodyIndex +
", headerMapIndex=" + headerMapIndex +
", queryMapIndex=" + queryMapIndex +
", queryMapEncoded=" + queryMapEncoded +
", returnType='" + returnType + '\'' +
", bodyType='" + bodyType + '\'' +
", indexToName=" + indexToName +
", formParams=" + formParams +
", indexToEncoded=" + indexToEncoded +
'}';
}
}

59
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java
View File

@ -68,7 +68,7 @@ public class DubboServiceMetadataRepository {
if (isEmpty(serviceRestMetadataSet)) {
if (logger.isWarnEnabled()) {
logger.warn("The Spring Cloud application[name : {}] does not expose The REST metadata in the Dubbo services."
logger.warn("The Spring application[name : {}] does not expose The REST metadata in the Dubbo services."
, serviceName);
}
return;
@ -85,6 +85,10 @@ public class DubboServiceMetadataRepository {
metadataMap.put(matcher, metadata);
});
}
if (logger.isInfoEnabled()) {
logger.info("The REST metadata in the dubbo services has been loaded in the Spring application[name : {}]", serviceName);
}
}
/**
@ -98,31 +102,42 @@ public class DubboServiceMetadataRepository {
return match(repository, serviceName, requestMetadata);
}
private static <T> T match(Map<String, Map<RequestMetadataMatcher, T>> repository, String serviceName,
RequestMetadata requestMetadata) {
Map<RequestMetadataMatcher, T> map = repository.get(serviceName);
if (isEmpty(map)) {
return null;
}
RequestMetadataMatcher matcher = new RequestMetadataMatcher(requestMetadata);
T object = map.get(matcher);
if (object == null) { // Can't match exactly
// Require to match one by one
for (Map.Entry<RequestMetadataMatcher, T> entry : map.entrySet()) {
RequestMetadataMatcher possibleMatcher = entry.getKey();
HttpRequest request = builder()
.method(requestMetadata.getMethod())
.path(requestMetadata.getPath())
.params(requestMetadata.getParams())
.headers(requestMetadata.getHeaders())
.build();
private <T> T match(Map<String, Map<RequestMetadataMatcher, T>> repository, String serviceName,
RequestMetadata requestMetadata) {
if (possibleMatcher.match(request)) {
object = entry.getValue();
break;
Map<RequestMetadataMatcher, T> map = repository.get(serviceName);
T object = null;
if (!isEmpty(map)) {
RequestMetadataMatcher matcher = new RequestMetadataMatcher(requestMetadata);
object = map.get(matcher);
if (object == null) { // Can't match exactly
// Require to match one by one
for (Map.Entry<RequestMetadataMatcher, T> entry : map.entrySet()) {
RequestMetadataMatcher possibleMatcher = entry.getKey();
HttpRequest request = builder()
.method(requestMetadata.getMethod())
.path(requestMetadata.getPath())
.params(requestMetadata.getParams())
.headers(requestMetadata.getHeaders())
.build();
if (possibleMatcher.match(request)) {
object = entry.getValue();
break;
}
}
}
}
if (object == null) {
if (logger.isWarnEnabled()) {
logger.warn("DubboServiceMetadata can't be found in the Spring application [%s] and %s",
serviceName, requestMetadata);
}
}
return object;
}

21
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java
View File

@ -20,7 +20,7 @@ import feign.Contract;
import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.env.PropertyResolver;
@ -51,14 +51,17 @@ public class DubboTransportedMethodMetadataResolver {
this.contract = contract;
}
public Map<DubboTransportedMethodMetadata, RequestMetadata> resolve(Class<?> targetType) {
public Map<DubboTransportedMethodMetadata, RestMethodMetadata> resolve(Class<?> targetType) {
Set<DubboTransportedMethodMetadata> dubboTransportedMethodMetadataSet =
resolveDubboTransportedMethodMetadataSet(targetType);
Map<String, RequestMetadata> requestMetadataMap = resolveRequestMetadataMap(targetType);
Map<String, RestMethodMetadata> restMethodMetadataMap = resolveRestRequestMetadataMap(targetType);
return dubboTransportedMethodMetadataSet
.stream()
.collect(Collectors.toMap(methodMetadata -> methodMetadata, methodMetadata ->
requestMetadataMap.get(configKey(targetType, methodMetadata.getMethod()))
.collect(Collectors.toMap(methodMetadata -> methodMetadata, methodMetadata -> {
RestMethodMetadata restMethodMetadata = restMethodMetadataMap.get(configKey(targetType, methodMetadata.getMethod()));
restMethodMetadata.setMethod(methodMetadata.getMethodMetadata());
return restMethodMetadata;
}
));
}
@ -79,13 +82,13 @@ public class DubboTransportedMethodMetadataResolver {
}
private Map<String, RequestMetadata> resolveRequestMetadataMap(Class<?> targetType) {
private Map<String, RestMethodMetadata> resolveRestRequestMetadataMap(Class<?> targetType) {
return contract.parseAndValidatateMetadata(targetType)
.stream().collect(Collectors.toMap(feign.MethodMetadata::configKey, this::requestMetadata));
.stream().collect(Collectors.toMap(feign.MethodMetadata::configKey, this::restMethodMetadata));
}
private RequestMetadata requestMetadata(feign.MethodMetadata methodMetadata) {
return new RequestMetadata(methodMetadata.template());
private RestMethodMetadata restMethodMetadata(feign.MethodMetadata methodMetadata) {
return new RestMethodMetadata(methodMetadata);
}
private DubboTransportedMethodMetadata createDubboTransportedMethodMetadata(Method method,

1
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/MetadataResolver.java
View File

@ -17,6 +17,7 @@
package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
import com.alibaba.dubbo.config.spring.ServiceBean;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;

28
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java
View File

@ -33,41 +33,39 @@ import java.util.Map;
*/
public class DubboInvocationHandler implements InvocationHandler {
private final Map<Method, GenericService> genericServicesMap;
private final Map<Method, RestMethodMetadata> restMethodMetadataMap;
private final Map<Method, FeignMethodMetadata> feignMethodMetadataMap;
private final InvocationHandler defaultInvocationHandler;
private final DubboGenericServiceExecutionContextFactory contextFactory;
public DubboInvocationHandler(Map<Method, GenericService> genericServicesMap,
Map<Method, RestMethodMetadata> restMethodMetadataMap,
public DubboInvocationHandler(Map<Method, FeignMethodMetadata> feignMethodMetadataMap,
InvocationHandler defaultInvocationHandler,
DubboGenericServiceExecutionContextFactory contextFactory) {
this.genericServicesMap = genericServicesMap;
this.restMethodMetadataMap = restMethodMetadataMap;
this.feignMethodMetadataMap = feignMethodMetadataMap;
this.defaultInvocationHandler = defaultInvocationHandler;
this.contextFactory = contextFactory;
}
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
public Object invoke(Object proxy, Method feignMethod, Object[] args) throws Throwable {
GenericService genericService = genericServicesMap.get(method);
FeignMethodMetadata feignMethodMetadata = feignMethodMetadataMap.get(feignMethod);
RestMethodMetadata restMethodMetadata = restMethodMetadataMap.get(method);
if (genericService == null || restMethodMetadata == null) {
return defaultInvocationHandler.invoke(proxy, method, args);
if (feignMethodMetadata == null) {
return defaultInvocationHandler.invoke(proxy, feignMethod, args);
}
DubboGenericServiceExecutionContext context = contextFactory.create(restMethodMetadata, args);
GenericService dubboGenericService = feignMethodMetadata.getDubboGenericService();
RestMethodMetadata dubboRestMethodMetadata = feignMethodMetadata.getDubboRestMethodMetadata();
RestMethodMetadata feignRestMethodMetadata = feignMethodMetadata.getFeignMethodMetadata();
DubboGenericServiceExecutionContext context = contextFactory.create(dubboRestMethodMetadata, feignRestMethodMetadata, args);
String methodName = context.getMethodName();
String[] parameterTypes = context.getParameterTypes();
Object[] parameters = context.getParameters();
return genericService.$invoke(methodName, parameterTypes, parameters);
return dubboGenericService.$invoke(methodName, parameterTypes, parameters);
}
}

57
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java Normal file
View File

@ -0,0 +1,57 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.openfeign;
import com.alibaba.dubbo.rpc.service.GenericService;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import java.lang.reflect.Method;
/**
* Feign {@link Method} Metadata
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
class FeignMethodMetadata {
private final GenericService dubboGenericService;
private final RestMethodMetadata dubboRestMethodMetadata;
private final RestMethodMetadata feignMethodMetadata;
FeignMethodMetadata(GenericService dubboGenericService, RestMethodMetadata dubboRestMethodMetadata,
RestMethodMetadata feignMethodMetadata) {
this.dubboGenericService = dubboGenericService;
this.dubboRestMethodMetadata = dubboRestMethodMetadata;
this.feignMethodMetadata = feignMethodMetadata;
}
GenericService getDubboGenericService() {
return dubboGenericService;
}
RestMethodMetadata getDubboRestMethodMetadata() {
return dubboRestMethodMetadata;
}
RestMethodMetadata getFeignMethodMetadata() {
return feignMethodMetadata;
}
}

55
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java
View File

@ -21,9 +21,13 @@ import com.alibaba.dubbo.rpc.service.GenericService;
import feign.Contract;
import feign.Target;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
@ -48,6 +52,8 @@ import static java.lang.reflect.Proxy.newProxyInstance;
*/
class TargeterInvocationHandler implements InvocationHandler {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final Object bean;
private final Environment environment;
@ -111,37 +117,54 @@ class TargeterInvocationHandler implements InvocationHandler {
DubboTransportedMethodMetadataResolver resolver =
new DubboTransportedMethodMetadataResolver(environment, contract);
Map<DubboTransportedMethodMetadata, RequestMetadata> methodRequestMetadataMap = resolver.resolve(targetType);
Map<DubboTransportedMethodMetadata, RestMethodMetadata> feignRestMethodMetadataMap = resolver.resolve(targetType);
if (methodRequestMetadataMap.isEmpty()) { // @DubboTransported method was not found
if (feignRestMethodMetadataMap.isEmpty()) { // @DubboTransported method was not found from the Client interface
if (logger.isDebugEnabled()) {
logger.debug("@{} method was not found in the Feign target type[{}]",
DubboTransported.class.getSimpleName(), targetType.getName());
}
return null;
}
// Update Metadata
repository.initialize(serviceName);
Map<Method, RestMethodMetadata> restMethodMetadataMap = new HashMap<>();
Map<Method, GenericService> genericServicesMap = new HashMap<>();
methodRequestMetadataMap.forEach((dubboTransportedMethodMetadata, requestMetadata) -> {
DubboServiceMetadata dubboServiceMetadata = repository.get(serviceName, requestMetadata);
RestMethodMetadata restMethodMetadata = dubboServiceMetadata.getRestMethodMetadata();
DubboTransportedMetadata dubboTransportedMetadata = dubboTransportedMethodMetadata.getDubboTransportedMetadata();
GenericService genericService = dubboGenericServiceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
Method method = dubboTransportedMethodMetadata.getMethod();
genericServicesMap.put(method, genericService);
restMethodMetadataMap.put(method, restMethodMetadata);
});
Map<Method, FeignMethodMetadata> feignMethodMetadataMap = getFeignMethodMetadataMap(serviceName, feignRestMethodMetadataMap);
InvocationHandler defaultFeignClientInvocationHandler = Proxy.getInvocationHandler(defaultFeignClientProxy);
DubboInvocationHandler dubboInvocationHandler = new DubboInvocationHandler(genericServicesMap, restMethodMetadataMap,
DubboInvocationHandler dubboInvocationHandler = new DubboInvocationHandler(feignMethodMetadataMap,
defaultFeignClientInvocationHandler, contextFactory);
return dubboInvocationHandler;
}
private Map<Method, FeignMethodMetadata> getFeignMethodMetadataMap(String serviceName,
Map<DubboTransportedMethodMetadata, RestMethodMetadata>
feignRestMethodMetadataMap) {
Map<Method, FeignMethodMetadata> feignMethodMetadataMap = new HashMap<>();
for (Map.Entry<DubboTransportedMethodMetadata, RestMethodMetadata> entry : feignRestMethodMetadataMap.entrySet()) {
RestMethodMetadata feignRestMethodMetadata = entry.getValue();
RequestMetadata feignRequestMetadata = feignRestMethodMetadata.getRequest();
DubboServiceMetadata dubboServiceMetadata = repository.get(serviceName, feignRequestMetadata);
if (dubboServiceMetadata != null) {
DubboTransportedMethodMetadata dubboTransportedMethodMetadata = entry.getKey();
DubboTransportedMetadata dubboTransportedMetadata = dubboTransportedMethodMetadata.getDubboTransportedMetadata();
Method method = dubboTransportedMethodMetadata.getMethod();
GenericService dubboGenericService = dubboGenericServiceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
RestMethodMetadata dubboRestMethodMetadata = dubboServiceMetadata.getRestMethodMetadata();
MethodMetadata methodMetadata = dubboTransportedMethodMetadata.getMethodMetadata();
FeignMethodMetadata feignMethodMetadata = new FeignMethodMetadata(dubboGenericService,
dubboRestMethodMetadata, feignRestMethodMetadata);
feignMethodMetadataMap.put(method, feignMethodMetadata);
}
}
return feignMethodMetadataMap;
}
private static <T> T cast(Object object) {
return (T) object;
}

69
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java
View File

@ -17,17 +17,18 @@
package org.springframework.cloud.alibaba.dubbo.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.service.parameter.DubboGenericServiceParameterResolver;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.http.server.ServerHttpRequest;
import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* {@link DubboGenericServiceExecutionContext} Factory
@ -45,33 +46,41 @@ public class DubboGenericServiceExecutionContextFactory {
AnnotationAwareOrderComparator.sort(resolvers);
}
public DubboGenericServiceExecutionContext create(RestMethodMetadata restMethodMetadata, Object[] arguments) {
public DubboGenericServiceExecutionContext create(RestMethodMetadata dubboRestMethodMetadata,
RestMethodMetadata clientMethodMetadata, Object[] arguments) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
MethodMetadata dubboMethodMetadata = dubboRestMethodMetadata.getMethod();
String methodName = methodMetadata.getName();
String methodName = dubboMethodMetadata.getName();
String[] parameterTypes = resolveParameterTypes(methodMetadata);
String[] parameterTypes = resolveParameterTypes(dubboMethodMetadata);
Object[] parameters = Arrays.copyOf(arguments, parameterTypes.length);
Object[] parameters = resolveParameters(dubboRestMethodMetadata, clientMethodMetadata, arguments);
return new DubboGenericServiceExecutionContext(methodName, parameterTypes, parameters);
}
public DubboGenericServiceExecutionContext create(RestMethodMetadata restMethodMetadata,
ServerHttpRequest request) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
public DubboGenericServiceExecutionContext create(RestMethodMetadata dubboRestMethodMetadata,
HttpServerRequest request) {
MethodMetadata methodMetadata = dubboRestMethodMetadata.getMethod();
String methodName = methodMetadata.getName();
String[] parameterTypes = resolveParameterTypes(methodMetadata);
Object[] parameters = resolveParameters(restMethodMetadata, request);
Object[] parameters = resolveParameters(dubboRestMethodMetadata, request);
return new DubboGenericServiceExecutionContext(methodName, parameterTypes, parameters);
}
private Map<String, Integer> buildParamNameToIndex(List<MethodParameterMetadata> params) {
Map<String, Integer> paramNameToIndex = new LinkedHashMap<>();
for (MethodParameterMetadata param : params) {
paramNameToIndex.put(param.getName(), param.getIndex());
}
return paramNameToIndex;
}
protected String[] resolveParameterTypes(MethodMetadata methodMetadata) {
List<MethodParameterMetadata> params = methodMetadata.getParams();
@ -87,11 +96,11 @@ public class DubboGenericServiceExecutionContextFactory {
return parameterTypes;
}
protected Object[] resolveParameters(RestMethodMetadata restMethodMetadata, ServerHttpRequest request) {
protected Object[] resolveParameters(RestMethodMetadata dubboRestMethodMetadata, HttpServerRequest request) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
MethodMetadata dubboMethodMetadata = dubboRestMethodMetadata.getMethod();
List<MethodParameterMetadata> params = methodMetadata.getParams();
List<MethodParameterMetadata> params = dubboMethodMetadata.getParams();
Object[] parameters = new Object[params.size()];
@ -100,8 +109,34 @@ public class DubboGenericServiceExecutionContextFactory {
int index = parameterMetadata.getIndex();
for (DubboGenericServiceParameterResolver resolver : resolvers) {
if (resolver.supportParameter(restMethodMetadata, parameterMetadata)) {
parameters[index] = resolver.resolveParameter(restMethodMetadata, parameterMetadata, request);
Object parameter = resolver.resolve(dubboRestMethodMetadata, parameterMetadata, request);
if (parameter != null) {
parameters[index] = parameter;
break;
}
}
}
return parameters;
}
protected Object[] resolveParameters(RestMethodMetadata dubboRestMethodMetadata,
RestMethodMetadata clientRestMethodMetadata, Object[] arguments) {
MethodMetadata dubboMethodMetadata = dubboRestMethodMetadata.getMethod();
List<MethodParameterMetadata> params = dubboMethodMetadata.getParams();
Object[] parameters = new Object[params.size()];
for (MethodParameterMetadata parameterMetadata : params) {
int index = parameterMetadata.getIndex();
for (DubboGenericServiceParameterResolver resolver : resolvers) {
Object parameter = resolver.resolve(dubboRestMethodMetadata, parameterMetadata, clientRestMethodMetadata, arguments);
if (parameter != null) {
parameters[index] = parameter;
break;
}
}

3
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java
View File

@ -30,7 +30,8 @@ import static org.springframework.util.ClassUtils.resolveClassName;
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver, BeanClassLoaderAware {
public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver,
BeanClassLoaderAware {
private int order;

19
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/DubboGenericServiceParameterResolver.java
View File

@ -18,11 +18,10 @@ package org.springframework.cloud.alibaba.dubbo.service.parameter;
import com.alibaba.dubbo.rpc.service.GenericService;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.Ordered;
import org.springframework.http.server.ServerHttpRequest;
/**
* Dubbo {@link GenericService} Parameter Resolver
@ -31,20 +30,14 @@ import org.springframework.http.server.ServerHttpRequest;
*/
public interface DubboGenericServiceParameterResolver extends Ordered {
/**
* Whether the given {@linkplain DubboServiceMetadata Dubbo Service Metadata} is
* supported by this resolver.
*
* @return {@code true} if this resolver supports the supplied parameter;
* {@code false} otherwise
*/
boolean supportParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata);
/**
* Resolves a method parameter into an argument value from a given request.
*
* @return
*/
Object resolveParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
ServerHttpRequest request);
Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
HttpServerRequest request);
Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
RestMethodMetadata clientRestMethodMetadata, Object[] arguments);
}

23
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServerParameterResolver.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServiceParameterResolver.java
View File

@ -19,13 +19,13 @@ package org.springframework.cloud.alibaba.dubbo.service.parameter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
import org.springframework.cloud.alibaba.dubbo.http.util.HttpMessageConverterResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.server.ServerHttpRequest;
import javax.annotation.PostConstruct;
import java.io.IOException;
@ -37,7 +37,7 @@ import java.util.Objects;
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class RequestBodyServerParameterResolver extends AbstractDubboGenericServiceParameterResolver {
public class RequestBodyServiceParameterResolver extends AbstractDubboGenericServiceParameterResolver {
public static final int DEFAULT_ORDER = 7;
@ -46,7 +46,7 @@ public class RequestBodyServerParameterResolver extends AbstractDubboGenericServ
private HttpMessageConverterResolver httpMessageConverterResolver;
public RequestBodyServerParameterResolver() {
public RequestBodyServiceParameterResolver() {
super();
setOrder(DEFAULT_ORDER);
}
@ -60,8 +60,7 @@ public class RequestBodyServerParameterResolver extends AbstractDubboGenericServ
getClassLoader());
}
@Override
public boolean supportParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata) {
private boolean supportParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata) {
Integer index = methodParameterMetadata.getIndex();
@ -79,8 +78,12 @@ public class RequestBodyServerParameterResolver extends AbstractDubboGenericServ
}
@Override
public Object resolveParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
ServerHttpRequest request) {
public Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
HttpServerRequest request) {
if (!supportParameter(restMethodMetadata, methodParameterMetadata)) {
return null;
}
Object result = null;
@ -99,4 +102,10 @@ public class RequestBodyServerParameterResolver extends AbstractDubboGenericServ
return result;
}
@Override
public Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
RestMethodMetadata clientRestMethodMetadata, Object[] arguments) {
return null;
}
}

107
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestParamServiceParameterResolver.java
View File

@ -16,18 +16,17 @@
*/
package org.springframework.cloud.alibaba.dubbo.service.parameter;
import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
import org.springframework.web.util.UriComponents;
import java.net.URI;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import static org.springframework.web.util.UriComponentsBuilder.fromUri;
import static org.springframework.util.ObjectUtils.isEmpty;
/**
* HTTP Request Parameter {@link DubboGenericServiceParameterResolver Dubbo GenericService Parameter Resolver}
@ -44,44 +43,80 @@ public class RequestParamServiceParameterResolver extends AbstractDubboGenericSe
}
@Override
public boolean supportParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata) {
public Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
HttpServerRequest request) {
Collection<String> paramNames = getParamNames(restMethodMetadata, methodParameterMetadata);
if (isEmpty(paramNames)) { // index can't match
return null;
}
MultiValueMap<String, String> queryParams = request.getQueryParams();
String targetParamName = null;
for (String paramName : paramNames) {
if (queryParams.containsKey(paramName)) {
targetParamName = paramName;
break;
}
}
if (targetParamName == null) { // request parameter is abstract
return null;
}
Class<?> parameterType = resolveClass(methodParameterMetadata.getType());
Object paramValue = null;
if (parameterType.isArray()) { // Array type
paramValue = queryParams.get(targetParamName);
} else {
paramValue = queryParams.getFirst(targetParamName);
}
return resolveValue(paramValue, parameterType);
}
@Override
public Object resolve(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
RestMethodMetadata clientRestMethodMetadata, Object[] arguments) {
Collection<String> paramNames = getParamNames(restMethodMetadata, methodParameterMetadata);
if (isEmpty(paramNames)) { // index can't match
return null;
}
Integer index = null;
Map<Integer, Collection<String>> clientIndexToName = clientRestMethodMetadata.getIndexToName();
for (Map.Entry<Integer, Collection<String>> entry : clientIndexToName.entrySet()) {
Collection<String> clientParamNames = entry.getValue();
if (CollectionUtils.containsAny(paramNames, clientParamNames)) {
index = entry.getKey();
break;
}
}
return index > -1 ? arguments[index] : null;
}
private Collection<String> getParamNames(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata) {
Map<Integer, Collection<String>> indexToName = restMethodMetadata.getIndexToName();
int index = methodParameterMetadata.getIndex();
Collection<String> paramNames = indexToName.get(index);
if (CollectionUtils.isEmpty(paramNames)) {
return false;
}
String paramName = methodParameterMetadata.getName();
return paramNames.contains(paramName);
return paramNames == null ? Collections.emptyList() : paramNames;
}
@Override
public Object resolveParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata parameterMetadata,
ServerHttpRequest request) {
URI uri = request.getURI();
UriComponents uriComponents = fromUri(uri).build(true);
MultiValueMap<String, String> params = uriComponents.getQueryParams();
String paramName = parameterMetadata.getName();
Class<?> parameterType = resolveClass(parameterMetadata.getType());
Object paramValue = null;
if (parameterType.isArray()) { // Array type
paramValue = params.get(paramName);
} else {
paramValue = params.getFirst(paramName);
}
return resolveValue(paramValue, parameterType);
}
}

17
spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudBootstrap.java
View File

@ -87,7 +87,7 @@ public class DubboSpringCloudBootstrap {
String param(@RequestParam("param") String param);
@PostMapping("/params")
public int params(@RequestParam int a, @RequestParam int b);
public String params(@RequestParam("b") String b, @RequestParam("a") int a);
}
@ -99,9 +99,10 @@ public class DubboSpringCloudBootstrap {
String param(@RequestParam("param") String param);
@PostMapping("/params")
public int params(@RequestParam int a, @RequestParam int b);
public String params(@RequestParam("b") String paramB, @RequestParam("a") int paramA);
}
@Bean
public ApplicationRunner paramRunner() {
return arguments -> {
@ -116,11 +117,11 @@ public class DubboSpringCloudBootstrap {
// To call /params
// Dubbo Service call
System.out.println(restService.params(1, 1));
System.out.println(restService.params(1, "1"));
// Spring Cloud Open Feign REST Call (Dubbo Transported)
System.out.println(dubboFeignRestService.params(1, 1));
System.out.println(dubboFeignRestService.params("1", 1));
// Spring Cloud Open Feign REST Call
System.out.println(feignRestService.params(1, 1));
System.out.println(feignRestService.params("1", 1));
};
}
@ -135,11 +136,11 @@ public class DubboSpringCloudBootstrap {
data.put("id", 1);
data.put("name", "小马哥");
data.put("age", 33);
User user = restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/body/map", data, User.class);
User user = restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/setBody/map", data, User.class);
System.out.println(restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/body/map", data, String.class));
System.out.println(restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/setBody/map", data, String.class));
Map map = restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/body/user", user, Map.class);
Map map = restTemplate.postForObject("http://spring-cloud-alibaba-dubbo/request/setBody/user", user, Map.class);
System.out.println(map);
};
}

2
spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/service/RestService.java
View File

@ -27,7 +27,7 @@ public interface RestService {
String param(String message);
int params(int a, int b);
String params(int a, String b);
User requestBody(Map<String, Object> data);

6
spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/service/StandardRestService.java
View File

@ -68,7 +68,7 @@ public class StandardRestService implements RestService {
@PostMapping("/params")
@Path("/params")
@POST
public int params(@RequestParam @QueryParam("a") int a, @RequestParam @QueryParam("b") int b) {
public String params(@RequestParam @QueryParam("a") int a, @RequestParam @QueryParam("b") String b) {
log("/params", a + b);
return a + b;
}
@ -91,7 +91,7 @@ public class StandardRestService implements RestService {
@Override
@PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE)
@Path("/request/body/map")
@Path("/request/setBody/map")
@POST
@Produces(APPLICATION_JSON_VALUE)
public User requestBody(@RequestBody Map<String, Object> data) {
@ -103,7 +103,7 @@ public class StandardRestService implements RestService {
}
@PostMapping(value = "/request/body/user", consumes = APPLICATION_JSON_UTF8_VALUE)
@Path("/request/body/user")
@Path("/request/setBody/user")
@POST
@Override
@Consumes(APPLICATION_JSON_UTF8_VALUE)