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 : Add The resolvers of Dubbo Generic Method parameters.

Browse Source
This commit is contained in:
mercyblitz 2019-02-20 16:14:10 +08:00
parent c0430abcae
commit 2f5ac6b7ad
28 changed files with 835 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
View File

@ -29,7 +29,8 @@ import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
import org.springframework.cloud.alibaba.dubbo.client.loadbalancer.DubboAdapterLoadBalancerInterceptor;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
@ -71,7 +72,10 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
private ConfigurableListableBeanFactory beanFactory;
@Autowired
private DubboGenericServiceFactory dubboGenericServiceFactory;
private DubboGenericServiceFactory serviceFactory;
@Autowired
private DubboGenericServiceExecutionContextFactory contextFactory;
@Autowired
private Environment environment;
@ -137,7 +141,7 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
if (index > -1) {
interceptors.set(index, new DubboAdapterLoadBalancerInterceptor(repository, loadBalancerInterceptor,
restTemplate.getMessageConverters(), classLoader,
dubboTransportedMetadata, dubboGenericServiceFactory));
dubboTransportedMetadata, serviceFactory, contextFactory));
}
restTemplate.setInterceptors(interceptors);

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

@ -18,8 +18,8 @@ package org.springframework.cloud.alibaba.dubbo.autoconfigure;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
import org.springframework.cloud.alibaba.dubbo.metadata.service.MetadataConfigService;
import org.springframework.cloud.alibaba.dubbo.metadata.service.NacosMetadataConfigService;
import org.springframework.cloud.alibaba.dubbo.service.MetadataConfigService;
import org.springframework.cloud.alibaba.dubbo.service.NacosMetadataConfigService;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

15
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java
View File

@ -19,15 +19,15 @@ package org.springframework.cloud.alibaba.dubbo.autoconfigure;
import feign.Contract;
import feign.Feign;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.MetadataResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.openfeign.TargeterBeanPostProcessor;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -44,20 +44,19 @@ import org.springframework.core.env.Environment;
@Configuration
public class DubboOpenFeignAutoConfiguration {
@Value("${spring.application.name}")
private String currentApplicationName;
@Bean
@ConditionalOnMissingBean
public MetadataResolver metadataJsonResolver(ObjectProvider<Contract> contract) {
return new DubboServiceBeanMetadataResolver(currentApplicationName, contract);
return new DubboServiceBeanMetadataResolver(contract);
}
@Bean
public TargeterBeanPostProcessor targeterBeanPostProcessor(Environment environment,
DubboServiceMetadataRepository dubboServiceMetadataRepository,
DubboGenericServiceFactory dubboGenericServiceFactory) {
return new TargeterBeanPostProcessor(environment, dubboServiceMetadataRepository,dubboGenericServiceFactory);
DubboGenericServiceFactory dubboGenericServiceFactory,
DubboGenericServiceExecutionContextFactory contextFactory) {
return new TargeterBeanPostProcessor(environment, dubboServiceMetadataRepository,
dubboGenericServiceFactory, contextFactory);
}
}

2
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboRestMetadataRegistrationAutoConfiguration.java
View File

@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.MetadataResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.service.MetadataConfigService;
import org.springframework.cloud.alibaba.dubbo.service.MetadataConfigService;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;

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

@ -17,9 +17,13 @@
package org.springframework.cloud.alibaba.dubbo.autoconfigure;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
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.RequestParamServiceParameterResolver;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
/**
* Spring Boot Auto-Configuration class for Dubbo Service
@ -35,4 +39,12 @@ public class DubboServiceAutoConfiguration {
return new DubboGenericServiceFactory();
}
@Configuration
@Import(value = {
DubboGenericServiceExecutionContextFactory.class,
RequestParamServiceParameterResolver.class,
RequestBodyServerParameterResolver.class,
})
static class ParameterResolversConfiguration {
}
}

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

@ -19,14 +19,15 @@ 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.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMetadata;
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;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.ParameterResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@ -48,8 +49,6 @@ import java.util.List;
*/
public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInterceptor {
private final ParameterResolver parameterResolver = new ParameterResolver();
private final DubboServiceMetadataRepository repository;
private final LoadBalancerInterceptor loadBalancerInterceptor;
@ -58,19 +57,23 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
private final DubboTransportedMetadata dubboTransportedMetadata;
private final DubboGenericServiceFactory dubboGenericServiceFactory;
private final DubboGenericServiceFactory serviceFactory;
private final DubboGenericServiceExecutionContextFactory contextFactory;
public DubboAdapterLoadBalancerInterceptor(DubboServiceMetadataRepository dubboServiceMetadataRepository,
LoadBalancerInterceptor loadBalancerInterceptor,
List<HttpMessageConverter<?>> messageConverters,
ClassLoader classLoader,
DubboTransportedMetadata dubboTransportedMetadata,
DubboGenericServiceFactory dubboGenericServiceFactory) {
DubboGenericServiceFactory serviceFactory,
DubboGenericServiceExecutionContextFactory contextFactory) {
this.repository = dubboServiceMetadataRepository;
this.loadBalancerInterceptor = loadBalancerInterceptor;
this.dubboTransportedMetadata = dubboTransportedMetadata;
this.clientHttpResponseFactory = new DubboClientHttpResponseFactory(messageConverters, classLoader);
this.dubboGenericServiceFactory = dubboGenericServiceFactory;
this.serviceFactory = serviceFactory;
this.contextFactory = contextFactory;
}
@Override
@ -94,13 +97,16 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
RestMethodMetadata restMethodMetadata = dubboServiceMetadata.getRestMethodMetadata();
GenericService genericService = dubboGenericServiceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
GenericService genericService = serviceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
DubboGenericServiceExecutionContext context = contextFactory.create(restMethodMetadata,
new DefaultServerHttpRequest(request, body));
Object result = null;
GenericException exception = null;
try {
result = invokeService(restMethodMetadata, genericService, clientMetadata);
result = genericService.$invoke(context.getMethodName(), context.getParameterTypes(), context.getParameters());
} catch (GenericException e) {
exception = e;
}
@ -108,22 +114,6 @@ public class DubboAdapterLoadBalancerInterceptor implements ClientHttpRequestInt
return clientHttpResponseFactory.build(result, exception, clientMetadata, restMethodMetadata);
}
private Object invokeService(RestMethodMetadata restMethodMetadata, GenericService genericService,
RequestMetadata clientMetadata) throws GenericException {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
String methodName = methodMetadata.getName();
String[] parameterTypes = parameterResolver.resolveParameterTypes(methodMetadata);
Object[] parameters = parameterResolver.resolveParameters(restMethodMetadata, clientMetadata);
Object result = genericService.$invoke(methodName, parameterTypes, parameters);
return result;
}
public static RequestMetadata buildRequestMetadata(HttpRequest request, UriComponents uriComponents) {
RequestMetadata requestMetadata = new RequestMetadata();
requestMetadata.setPath(uriComponents.getPath());

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

@ -19,9 +19,9 @@ package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
import com.alibaba.dubbo.rpc.service.GenericException;
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.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.HttpMessageConverterResolver;
import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.converter.HttpMessageConverter;

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

@ -0,0 +1,55 @@
/*
* 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.HttpHeaders;
import org.springframework.http.HttpInputMessage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
/**
* Byte array {@link HttpInputMessage} implementation
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class ByteArrayHttpInputMessage implements HttpInputMessage {
private final HttpHeaders httpHeaders;
private final InputStream inputStream;
public ByteArrayHttpInputMessage(byte[] body) {
this(new HttpHeaders(), body);
}
public ByteArrayHttpInputMessage(HttpHeaders httpHeaders, byte[] body) {
this.httpHeaders = httpHeaders;
this.inputStream = new ByteArrayInputStream(body);
}
@Override
public InputStream getBody() throws IOException {
return inputStream;
}
@Override
public HttpHeaders getHeaders() {
return httpHeaders;
}
}

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

@ -0,0 +1,100 @@
/*
* 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.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 java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
import java.net.URI;
import java.security.Principal;
/**
* Default {@link ServerHttpRequest} implementation
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class DefaultServerHttpRequest implements ServerHttpRequest {
private final HttpMethod httpMethod;
private final URI uri;
private final HttpHeaders httpHeaders;
private final HttpInputMessage httpInputMessage;
public DefaultServerHttpRequest(HttpRequest httpRequest, byte[] body) {
this.httpMethod = httpRequest.getMethod();
this.uri = httpRequest.getURI();
this.httpHeaders = httpRequest.getHeaders();
this.httpInputMessage = new ByteArrayHttpInputMessage(body);
}
@Override
public InputStream getBody() throws IOException {
return httpInputMessage.getBody();
}
@Override
public HttpMethod getMethod() {
return httpMethod;
}
// Override method since Spring Framework 5.0
public String getMethodValue() {
return httpMethod.name();
}
@Override
public URI getURI() {
return uri;
}
@Override
public HttpHeaders getHeaders() {
return httpHeaders;
}
@Override
public Principal getPrincipal() {
throw new UnsupportedOperationException();
}
@Override
public InetSocketAddress getLocalAddress() {
throw new UnsupportedOperationException();
}
@Override
public InetSocketAddress getRemoteAddress() {
throw new UnsupportedOperationException();
}
@Override
public ServerHttpAsyncRequestControl getAsyncRequestControl(ServerHttpResponse response) {
throw new UnsupportedOperationException();
}
}

40
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/HttpMessageConverterResolver.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpMessageConverterResolver.java
View File

@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
package org.springframework.cloud.alibaba.dubbo.http.util;
import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.server.ServletServerHttpRequest;
@ -33,6 +35,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import static java.util.Collections.unmodifiableList;
/**
* {@link HttpMessageConverter} Resolver
*
@ -54,6 +58,28 @@ public class HttpMessageConverterResolver {
this.classLoader = classLoader;
}
public HttpMessageConverterHolder resolve(HttpRequest request, Class<?> parameterType) {
HttpMessageConverterHolder httpMessageConverterHolder = null;
HttpHeaders httpHeaders = request.getHeaders();
MediaType contentType = httpHeaders.getContentType();
if (contentType == null) {
contentType = MediaType.APPLICATION_OCTET_STREAM;
}
for (HttpMessageConverter<?> converter : this.messageConverters) {
if (converter.canRead(parameterType, contentType)) {
httpMessageConverterHolder = new HttpMessageConverterHolder(contentType, converter);
break;
}
}
return httpMessageConverterHolder;
}
/**
* Resolve the most match {@link HttpMessageConverter} from {@link RequestMetadata}
*
@ -61,7 +87,8 @@ public class HttpMessageConverterResolver {
* @param restMethodMetadata {@link RestMethodMetadata}
* @return
*/
public HttpMessageConverterHolder resolve(RequestMetadata requestMetadata, RestMethodMetadata restMethodMetadata) {
public HttpMessageConverterHolder resolve(RequestMetadata requestMetadata, RestMethodMetadata
restMethodMetadata) {
HttpMessageConverterHolder httpMessageConverterHolder = null;
@ -114,6 +141,10 @@ public class HttpMessageConverterResolver {
return httpMessageConverterHolder;
}
public List<MediaType> getAllSupportedMediaTypes() {
return unmodifiableList(allSupportedMediaTypes);
}
private Class<?> resolveReturnValueClass(RestMethodMetadata restMethodMetadata) {
String returnClassName = restMethodMetadata.getMethod().getReturnType();
return ClassUtils.resolveClassName(returnClassName, classLoader);
@ -139,7 +170,8 @@ public class HttpMessageConverterResolver {
* @param returnValueClass the class of return value
* @return non-null {@link List}
*/
private List<MediaType> getProducibleMediaTypes(RestMethodMetadata restMethodMetadata, Class<?> returnValueClass) {
private List<MediaType> getProducibleMediaTypes(RestMethodMetadata restMethodMetadata, Class<?>
returnValueClass) {
RequestMetadata serverRequestMetadata = restMethodMetadata.getRequest();
List<MediaType> mediaTypes = serverRequestMetadata.getProduceMediaTypes();
if (!CollectionUtils.isEmpty(mediaTypes)) { // Empty
@ -172,7 +204,7 @@ public class HttpMessageConverterResolver {
}
List<MediaType> result = new ArrayList<MediaType>(allSupportedMediaTypes);
MediaType.sortBySpecificity(result);
return Collections.unmodifiableList(result);
return unmodifiableList(result);
}
/**

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

@ -18,7 +18,9 @@ package org.springframework.cloud.alibaba.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.core.ResolvableType;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@ -76,8 +78,8 @@ public class RestMethodMetadata {
this.headerMapIndex = methodMetadata.headerMapIndex();
this.queryMapEncoded = methodMetadata.queryMapEncoded();
this.queryMapEncoded = methodMetadata.queryMapEncoded();
this.returnType = methodMetadata.returnType() == null ? null : methodMetadata.returnType().toString();
this.bodyType = methodMetadata.bodyType() == null ? null : methodMetadata.bodyType().toString();
this.returnType = getClassName(methodMetadata.returnType());
this.bodyType = getClassName(methodMetadata.bodyType());
this.indexToName = methodMetadata.indexToName();
this.formParams = methodMetadata.formParams();
this.indexToEncoded = methodMetadata.indexToEncoded();
@ -203,4 +205,13 @@ public class RestMethodMetadata {
return Objects.hash(method, request, urlIndex, bodyIndex, headerMapIndex, queryMapIndex, queryMapEncoded,
returnType, bodyType, indexToName, formParams, indexToEncoded);
}
private String getClassName(Type type) {
if (type == null) {
return null;
}
ResolvableType resolvableType = ResolvableType.forType(type);
return resolvableType.resolve().getName();
}
}

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

@ -23,7 +23,7 @@ import org.springframework.cloud.alibaba.dubbo.http.matcher.RequestMetadataMatch
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.service.MetadataConfigService;
import org.springframework.cloud.alibaba.dubbo.service.MetadataConfigService;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Repository;

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

@ -56,8 +56,6 @@ public class DubboServiceBeanMetadataResolver implements BeanClassLoaderAware, S
"org.springframework.cloud.openfeign.support.SpringMvcContract",
};
private final String currentApplicationName;
private final ObjectProvider<Contract> contract;
private ClassLoader classLoader;
@ -67,8 +65,7 @@ public class DubboServiceBeanMetadataResolver implements BeanClassLoaderAware, S
*/
private Collection<Contract> contracts;
public DubboServiceBeanMetadataResolver(String currentApplicationName, ObjectProvider<Contract> contract) {
this.currentApplicationName = currentApplicationName;
public DubboServiceBeanMetadataResolver(ObjectProvider<Contract> contract) {
this.contract = contract;
}

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

@ -1,102 +0,0 @@
/*
* 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.metadata.resolver;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
import org.springframework.util.CollectionUtils;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Parameter Resolver
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class ParameterResolver {
public Object[] resolveParameters(RestMethodMetadata restMethodMetadata, RequestMetadata clientMetadata) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
RequestMetadata requestMetadata = restMethodMetadata.getRequest();
Map<Integer, Collection<String>> indexToName = restMethodMetadata.getIndexToName();
List<MethodParameterMetadata> params = methodMetadata.getParams();
Object[] parameters = new Object[params.size()];
for (MethodParameterMetadata parameterMetadata : params) {
int index = parameterMetadata.getIndex();
String name = getName(indexToName, index);
parameters[index] = getValue(requestMetadata, clientMetadata, name);
}
return parameters;
}
private String getValue(RequestMetadata serverMetadata, RequestMetadata clientMetadata, String name) {
String value = null;
Set<String> paramNames = serverMetadata.getParamNames();
Set<String> headerNames = serverMetadata.getHeaderNames();
if (paramNames.contains(name)) {
value = clientMetadata.getParameter(name);
} else if (headerNames.contains(name)) {
value = clientMetadata.getHeader(name);
}
return value;
}
private String getName(Map<Integer, Collection<String>> indexToName, int index) {
Collection<String> names = indexToName.get(index);
String name = null;
if (!CollectionUtils.isEmpty(names)) {
Iterator<String> iterator = names.iterator();
while (iterator.hasNext()) {
name = iterator.next(); // choose the last one if more than one
}
}
return name;
}
public String[] resolveParameterTypes(MethodMetadata methodMetadata) {
List<MethodParameterMetadata> params = methodMetadata.getParams();
String[] parameterTypes = new String[params.size()];
for (MethodParameterMetadata parameterMetadata : params) {
int index = parameterMetadata.getIndex();
String parameterType = parameterMetadata.getType();
parameterTypes[index] = parameterType;
}
return parameterTypes;
}
}

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

@ -17,8 +17,10 @@
package org.springframework.cloud.alibaba.dubbo.openfeign;
import com.alibaba.dubbo.rpc.service.GenericService;
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.DubboGenericServiceExecutionContext;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@ -33,16 +35,20 @@ public class DubboInvocationHandler implements InvocationHandler {
private final Map<Method, GenericService> genericServicesMap;
private final Map<Method, MethodMetadata> methodMetadata;
private final Map<Method, RestMethodMetadata> restMethodMetadataMap;
private final InvocationHandler defaultInvocationHandler;
private final DubboGenericServiceExecutionContextFactory contextFactory;
public DubboInvocationHandler(Map<Method, GenericService> genericServicesMap,
Map<Method, MethodMetadata> methodMetadata,
InvocationHandler defaultInvocationHandler) {
Map<Method, RestMethodMetadata> restMethodMetadataMap,
InvocationHandler defaultInvocationHandler,
DubboGenericServiceExecutionContextFactory contextFactory) {
this.genericServicesMap = genericServicesMap;
this.methodMetadata = methodMetadata;
this.restMethodMetadataMap = restMethodMetadataMap;
this.defaultInvocationHandler = defaultInvocationHandler;
this.contextFactory = contextFactory;
}
@Override
@ -50,20 +56,18 @@ public class DubboInvocationHandler implements InvocationHandler {
GenericService genericService = genericServicesMap.get(method);
MethodMetadata methodMetadata = this.methodMetadata.get(method);
RestMethodMetadata restMethodMetadata = restMethodMetadataMap.get(method);
if (genericService == null || methodMetadata == null) {
if (genericService == null || restMethodMetadata == null) {
return defaultInvocationHandler.invoke(proxy, method, args);
}
String methodName = methodMetadata.getName();
DubboGenericServiceExecutionContext context = contextFactory.create(restMethodMetadata, args);
String[] parameterTypes = methodMetadata
.getParams()
.stream()
.map(MethodParameterMetadata::getType)
.toArray(String[]::new);
String methodName = context.getMethodName();
String[] parameterTypes = context.getParameterTypes();
Object[] parameters = context.getParameters();
return genericService.$invoke(methodName, parameterTypes, args);
return genericService.$invoke(methodName, parameterTypes, parameters);
}
}

11
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java
View File

@ -20,7 +20,8 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.core.env.Environment;
import static java.lang.reflect.Proxy.newProxyInstance;
@ -42,14 +43,18 @@ public class TargeterBeanPostProcessor implements BeanPostProcessor, BeanClassLo
private final DubboGenericServiceFactory dubboGenericServiceFactory;
private final DubboGenericServiceExecutionContextFactory contextFactory;
private ClassLoader classLoader;
public TargeterBeanPostProcessor(Environment environment,
DubboServiceMetadataRepository dubboServiceMetadataRepository,
DubboGenericServiceFactory dubboGenericServiceFactory) {
DubboGenericServiceFactory dubboGenericServiceFactory,
DubboGenericServiceExecutionContextFactory contextFactory) {
this.environment = environment;
this.dubboServiceMetadataRepository = dubboServiceMetadataRepository;
this.dubboGenericServiceFactory = dubboGenericServiceFactory;
this.contextFactory = contextFactory;
}
@Override
@ -64,7 +69,7 @@ public class TargeterBeanPostProcessor implements BeanPostProcessor, BeanClassLo
if (targetClass.isAssignableFrom(beanClass)) {
return newProxyInstance(classLoader, new Class[]{targetClass},
new TargeterInvocationHandler(bean, environment, dubboServiceMetadataRepository,
dubboGenericServiceFactory));
dubboGenericServiceFactory,contextFactory));
}
return bean;
}

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

@ -28,7 +28,8 @@ 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;
import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboTransportedMethodMetadataResolver;
import org.springframework.cloud.alibaba.dubbo.metadata.service.DubboGenericServiceFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.openfeign.FeignContext;
import org.springframework.core.env.Environment;
@ -55,12 +56,16 @@ class TargeterInvocationHandler implements InvocationHandler {
private final DubboGenericServiceFactory dubboGenericServiceFactory;
private final DubboGenericServiceExecutionContextFactory contextFactory;
TargeterInvocationHandler(Object bean, Environment environment, DubboServiceMetadataRepository repository,
DubboGenericServiceFactory dubboGenericServiceFactory) {
DubboGenericServiceFactory dubboGenericServiceFactory,
DubboGenericServiceExecutionContextFactory contextFactory) {
this.bean = bean;
this.environment = environment;
this.repository = repository;
this.dubboGenericServiceFactory = dubboGenericServiceFactory;
this.contextFactory = contextFactory;
}
@Override
@ -115,24 +120,24 @@ class TargeterInvocationHandler implements InvocationHandler {
// Update Metadata
repository.initialize(serviceName);
Map<Method, org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata> methodMetadataMap = new HashMap<>();
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();
org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata methodMetadata = restMethodMetadata.getMethod();
DubboTransportedMetadata dubboTransportedMetadata = dubboTransportedMethodMetadata.getDubboTransportedMetadata();
GenericService genericService = dubboGenericServiceFactory.create(dubboServiceMetadata, dubboTransportedMetadata);
genericServicesMap.put(dubboTransportedMethodMetadata.getMethod(), genericService);
methodMetadataMap.put(dubboTransportedMethodMetadata.getMethod(), methodMetadata);
Method method = dubboTransportedMethodMetadata.getMethod();
genericServicesMap.put(method, genericService);
restMethodMetadataMap.put(method, restMethodMetadata);
});
InvocationHandler defaultFeignClientInvocationHandler = Proxy.getInvocationHandler(defaultFeignClientProxy);
DubboInvocationHandler dubboInvocationHandler = new DubboInvocationHandler(genericServicesMap, methodMetadataMap,
defaultFeignClientInvocationHandler);
DubboInvocationHandler dubboInvocationHandler = new DubboInvocationHandler(genericServicesMap, restMethodMetadataMap,
defaultFeignClientInvocationHandler, contextFactory);
return dubboInvocationHandler;
}

29
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java
View File

@ -23,6 +23,7 @@ import com.alibaba.dubbo.common.utils.UrlUtils;
import com.alibaba.dubbo.registry.NotifyListener;
import com.alibaba.dubbo.registry.RegistryFactory;
import com.alibaba.dubbo.registry.support.FailbackRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.DefaultServiceInstance;
@ -47,7 +48,6 @@ import java.util.concurrent.TimeUnit;
import static com.alibaba.dubbo.common.Constants.CONFIGURATORS_CATEGORY;
import static com.alibaba.dubbo.common.Constants.CONSUMERS_CATEGORY;
import static com.alibaba.dubbo.common.Constants.PROTOCOL_KEY;
import static com.alibaba.dubbo.common.Constants.PROVIDERS_CATEGORY;
import static com.alibaba.dubbo.common.Constants.ROUTERS_CATEGORY;
@ -70,9 +70,11 @@ public class SpringCloudRegistry extends FailbackRegistry {
private static final int CATEGORY_INDEX = 0;
private static final int PROTOCOL_INDEX = CATEGORY_INDEX + 1;
// private static final int PROTOCOL_INDEX = CATEGORY_INDEX + 1;
private static final int SERVICE_INTERFACE_INDEX = PROTOCOL_INDEX + 1;
// private static final int SERVICE_INTERFACE_INDEX = PROTOCOL_INDEX + 1;
private static final int SERVICE_INTERFACE_INDEX = CATEGORY_INDEX + 1;
private static final int SERVICE_VERSION_INDEX = SERVICE_INTERFACE_INDEX + 1;
@ -169,7 +171,6 @@ public class SpringCloudRegistry extends FailbackRegistry {
private static String getServiceName(URL url, String category) {
StringBuilder serviceNameBuilder = new StringBuilder(category);
appendIfPresent(serviceNameBuilder, url.getParameter(PROTOCOL_KEY, url.getProtocol()));
appendIfPresent(serviceNameBuilder, url, Constants.INTERFACE_KEY);
appendIfPresent(serviceNameBuilder, url, Constants.VERSION_KEY);
appendIfPresent(serviceNameBuilder, url, Constants.GROUP_KEY);
@ -203,12 +204,11 @@ public class SpringCloudRegistry extends FailbackRegistry {
// split service name to segments
// (required) segments[0] = category
// (required) segments[1] = serviceInterface
// (required) segments[2] = protocol
// (required) segments[3] = version
// (optional) segments[4] = group
// (required) segments[2] = version
// (optional) segments[3] = group
String[] segments = getServiceSegments(serviceName);
int length = segments.length;
if (length < 4) { // must present 4 segments or more
if (length < SERVICE_GROUP_INDEX) { // must present 4 segments or more
return false;
}
@ -217,11 +217,6 @@ public class SpringCloudRegistry extends FailbackRegistry {
return false;
}
String protocol = getProtocol(segments);
if (StringUtils.hasText(protocol)) {
return false;
}
String serviceInterface = getServiceInterface(segments);
if (!WILDCARD.equals(targetServiceInterface) &&
!Objects.equals(targetServiceInterface, serviceInterface)) { // no match service interface
@ -253,9 +248,9 @@ public class SpringCloudRegistry extends FailbackRegistry {
return segments[CATEGORY_INDEX];
}
public static String getProtocol(String[] segments) {
return segments[PROTOCOL_INDEX];
}
// public static String getProtocol(String[] segments) {
// return segments[PROTOCOL_INDEX];
// }
public static String getServiceInterface(String[] segments) {
return segments[SERVICE_INTERFACE_INDEX];
@ -266,7 +261,7 @@ public class SpringCloudRegistry extends FailbackRegistry {
}
public static String getServiceGroup(String[] segments) {
return segments.length > 4 ? segments[SERVICE_GROUP_INDEX] : null;
return segments.length > SERVICE_GROUP_INDEX ? segments[SERVICE_GROUP_INDEX] : null;
}
/**

51
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java Normal file
View File

@ -0,0 +1,51 @@
/*
* 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.service;
import com.alibaba.dubbo.rpc.service.GenericService;
/**
* Dubbo {@link GenericService} execution context
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class DubboGenericServiceExecutionContext {
private final String methodName;
private final String[] parameterTypes;
private final Object[] parameters;
public DubboGenericServiceExecutionContext(String methodName, String[] parameterTypes, Object[] parameters) {
this.methodName = methodName;
this.parameterTypes = parameterTypes;
this.parameters = parameters;
}
public String getMethodName() {
return methodName;
}
public String[] getParameterTypes() {
return parameterTypes;
}
public Object[] getParameters() {
return parameters;
}
}

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

@ -0,0 +1,112 @@
/*
* 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.service;
import org.springframework.beans.factory.annotation.Autowired;
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.List;
/**
* {@link DubboGenericServiceExecutionContext} Factory
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
* @see DubboGenericServiceParameterResolver
*/
public class DubboGenericServiceExecutionContextFactory {
@Autowired(required = false)
private final List<DubboGenericServiceParameterResolver> resolvers = Collections.emptyList();
@PostConstruct
public void init() {
AnnotationAwareOrderComparator.sort(resolvers);
}
public DubboGenericServiceExecutionContext create(RestMethodMetadata restMethodMetadata, Object[] arguments) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
String methodName = methodMetadata.getName();
String[] parameterTypes = resolveParameterTypes(methodMetadata);
Object[] parameters = Arrays.copyOf(arguments, parameterTypes.length);
return new DubboGenericServiceExecutionContext(methodName, parameterTypes, parameters);
}
public DubboGenericServiceExecutionContext create(RestMethodMetadata restMethodMetadata,
ServerHttpRequest request) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
String methodName = methodMetadata.getName();
String[] parameterTypes = resolveParameterTypes(methodMetadata);
Object[] parameters = resolveParameters(restMethodMetadata, request);
return new DubboGenericServiceExecutionContext(methodName, parameterTypes, parameters);
}
protected String[] resolveParameterTypes(MethodMetadata methodMetadata) {
List<MethodParameterMetadata> params = methodMetadata.getParams();
String[] parameterTypes = new String[params.size()];
for (MethodParameterMetadata parameterMetadata : params) {
int index = parameterMetadata.getIndex();
String parameterType = parameterMetadata.getType();
parameterTypes[index] = parameterType;
}
return parameterTypes;
}
protected Object[] resolveParameters(RestMethodMetadata restMethodMetadata, ServerHttpRequest request) {
MethodMetadata methodMetadata = restMethodMetadata.getMethod();
List<MethodParameterMetadata> params = methodMetadata.getParams();
Object[] parameters = new Object[params.size()];
for (MethodParameterMetadata parameterMetadata : params) {
int index = parameterMetadata.getIndex();
for (DubboGenericServiceParameterResolver resolver : resolvers) {
if (resolver.supportParameter(restMethodMetadata, parameterMetadata)) {
parameters[index] = resolver.resolveParameter(restMethodMetadata, parameterMetadata, request);
break;
}
}
}
return parameters;
}
}

45
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/service/DubboGenericServiceFactory.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java
View File

@ -14,15 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.metadata.service;
package org.springframework.cloud.alibaba.dubbo.service;
import com.alibaba.dubbo.config.spring.ReferenceBean;
import com.alibaba.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMetadata;
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
import javax.annotation.PreDestroy;
import java.util.Collection;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@ -39,26 +43,28 @@ import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegist
*/
public class DubboGenericServiceFactory {
private final ConcurrentMap<Integer, GenericService> cache = new ConcurrentHashMap<>();
private final Logger logger = LoggerFactory.getLogger(getClass());
private final ConcurrentMap<Integer, ReferenceBean<GenericService>> cache = new ConcurrentHashMap<>();
public GenericService create(DubboServiceMetadata dubboServiceMetadata,
DubboTransportedMetadata dubboTransportedMetadata) {
Integer key = Objects.hash(dubboServiceMetadata, dubboTransportedMetadata);
GenericService genericService = cache.get(key);
ReferenceBean<GenericService> referenceBean = cache.get(key);
if (genericService == null) {
genericService = build(dubboServiceMetadata.getServiceRestMetadata(), dubboTransportedMetadata);
cache.putIfAbsent(key, genericService);
if (referenceBean == null) {
referenceBean = build(dubboServiceMetadata.getServiceRestMetadata(), dubboTransportedMetadata);
cache.putIfAbsent(key, referenceBean);
}
return genericService;
return referenceBean == null ? null : referenceBean.get();
}
private GenericService build(ServiceRestMetadata serviceRestMetadata,
DubboTransportedMetadata dubboTransportedMetadata) {
private ReferenceBean<GenericService> build(ServiceRestMetadata serviceRestMetadata,
DubboTransportedMetadata dubboTransportedMetadata) {
String dubboServiceName = serviceRestMetadata.getName();
String[] segments = getServiceSegments(dubboServiceName);
String interfaceName = getServiceInterface(segments);
@ -73,7 +79,26 @@ public class DubboGenericServiceFactory {
referenceBean.setProtocol(dubboTransportedMetadata.getProtocol());
referenceBean.setCluster(dubboTransportedMetadata.getCluster());
return referenceBean.get();
return referenceBean;
}
@PreDestroy
public void destroy() {
destroyReferenceBeans();
cache.values();
}
private void destroyReferenceBeans() {
Collection<ReferenceBean<GenericService>> referenceBeans = cache.values();
if (logger.isInfoEnabled()) {
logger.info("The Dubbo GenericService ReferenceBeans are destroying...");
}
for (ReferenceBean referenceBean : referenceBeans) {
referenceBean.destroy(); // destroy ReferenceBean
if (logger.isInfoEnabled()) {
logger.info("Destroyed the ReferenceBean : {} ", referenceBean);
}
}
}
}

2
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/service/MetadataConfigService.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/MetadataConfigService.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.metadata.service;
package org.springframework.cloud.alibaba.dubbo.service;
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;

3
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/service/NacosMetadataConfigService.java → spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/NacosMetadataConfigService.java
View File

@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.alibaba.dubbo.metadata.service;
package org.springframework.cloud.alibaba.dubbo.service;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;

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

@ -0,0 +1,81 @@
/*
* 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.service.parameter;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.convert.ConversionService;
import org.springframework.format.support.FormattingConversionService;
import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
import static org.springframework.util.ClassUtils.resolveClassName;
/**
* Abstract {@link DubboGenericServiceParameterResolver} implementation
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver, BeanClassLoaderAware {
private int order;
@Autowired(required = false)
@Qualifier(CONVERSION_SERVICE_BEAN_NAME)
private ConversionService conversionService = new FormattingConversionService();
private ClassLoader classLoader;
public ConversionService getConversionService() {
return conversionService;
}
public void setConversionService(ConversionService conversionService) {
this.conversionService = conversionService;
}
public ClassLoader getClassLoader() {
return classLoader;
}
@Override
public void setBeanClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
}
public void setOrder(int order) {
this.order = order;
}
@Override
public int getOrder() {
return order;
}
protected Class<?> resolveClass(String className) {
return resolveClassName(className, classLoader);
}
protected Object resolveValue(Object parameterValue, String parameterType) {
Class<?> targetType = resolveClass(parameterType);
return resolveValue(parameterValue, targetType);
}
protected Object resolveValue(Object parameterValue, Class<?> parameterType) {
return conversionService.convert(parameterValue, parameterType);
}
}

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

@ -0,0 +1,50 @@
/*
* 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.service.parameter;
import com.alibaba.dubbo.rpc.service.GenericService;
import org.springframework.cloud.alibaba.dubbo.metadata.DubboServiceMetadata;
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
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
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);
}

102
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServerParameterResolver.java Normal file
View File

@ -0,0 +1,102 @@
/*
* 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.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.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;
import java.util.Collections;
import java.util.Objects;
/**
* HTTP Request Body {@link DubboGenericServiceParameterResolver}
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class RequestBodyServerParameterResolver extends AbstractDubboGenericServiceParameterResolver {
public static final int DEFAULT_ORDER = 7;
@Autowired
private ObjectProvider<HttpMessageConverters> httpMessageConverters;
private HttpMessageConverterResolver httpMessageConverterResolver;
public RequestBodyServerParameterResolver() {
super();
setOrder(DEFAULT_ORDER);
}
@PostConstruct
public void init() {
HttpMessageConverters httpMessageConverters = this.httpMessageConverters.getIfAvailable();
httpMessageConverterResolver = new HttpMessageConverterResolver(httpMessageConverters == null ?
Collections.emptyList() : httpMessageConverters.getConverters(),
getClassLoader());
}
@Override
public boolean supportParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata) {
Integer index = methodParameterMetadata.getIndex();
Integer bodyIndex = restMethodMetadata.getBodyIndex();
if (!Objects.equals(index, bodyIndex)) {
return false;
}
Class<?> parameterType = resolveClass(methodParameterMetadata.getType());
Class<?> bodyType = resolveClass(restMethodMetadata.getBodyType());
return Objects.equals(parameterType, bodyType);
}
@Override
public Object resolveParameter(RestMethodMetadata restMethodMetadata, MethodParameterMetadata methodParameterMetadata,
ServerHttpRequest request) {
Object result = null;
Class<?> parameterType = resolveClass(methodParameterMetadata.getType());
HttpMessageConverterHolder holder = httpMessageConverterResolver.resolve(request, parameterType);
if (holder != null) {
HttpMessageConverter converter = holder.getConverter();
try {
result = converter.read(parameterType, request);
} catch (IOException e) {
throw new HttpMessageNotReadableException("I/O error while reading input message", e);
}
}
return result;
}
}

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

@ -0,0 +1,87 @@
/*
* 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.service.parameter;
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.Map;
import static org.springframework.web.util.UriComponentsBuilder.fromUri;
/**
* HTTP Request Parameter {@link DubboGenericServiceParameterResolver Dubbo GenericService Parameter Resolver}
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/
public class RequestParamServiceParameterResolver extends AbstractDubboGenericServiceParameterResolver {
public static final int DEFAULT_ORDER = 1;
public RequestParamServiceParameterResolver() {
super();
setOrder(DEFAULT_ORDER);
}
@Override
public boolean supportParameter(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);
}
@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);
}
}

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

@ -36,6 +36,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.Map;
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@ -112,12 +115,12 @@ public class DubboSpringCloudBootstrap {
ResponseEntity<String> entity = restTemplate.getForEntity("http://spring-cloud-alibaba-dubbo/echo?message=小马哥", String.class);
System.out.println(entity.getHeaders());
System.out.println(entity.getBody());
// Still issue
// Map<String, Object> data = new HashMap<>();
// data.put("name", "小马哥");
// data.put("age", 33);
// data.put("height", 173);
// System.out.println(restTemplate.postForEntity("http://spring-cloud-alibaba-dubbo/toString", data, String.class));
// Still issue
Map<String, Object> data = new HashMap<>();
data.put("name", "小马哥");
data.put("age", 33);
data.put("height", 173);
System.out.println(restTemplate.postForEntity("http://spring-cloud-alibaba-dubbo/toString", data, String.class));
};
}