doScan(String... basePackages) {
+ return super.doScan(basePackages);
+ }
+
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScan.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScan.java
new file mode 100644
index 00000000000..bc9f3f1ca63
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScan.java
@@ -0,0 +1,56 @@
+package com.alibaba.dubbo.config.spring.context.annotation;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.alibaba.dubbo.config.annotation.Service;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.*;
+
+/**
+ * Dubbo Component Scan {@link Annotation},scans the classpath for annotated components that will be auto-registered as
+ * Spring beans. Dubbo-provided {@link Service} and {@link Reference}.
+ *
+ * @author Mercy
+ * @see Service
+ * @see Reference
+ * @since 2.5.7
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Import(DubboComponentScanRegistrar.class)
+public @interface DubboComponentScan {
+
+ /**
+ * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
+ * declarations e.g.: {@code @DubboComponentScan("org.my.pkg")} instead of
+ * {@code @DubboComponentScan(basePackages="org.my.pkg")}.
+ *
+ * @return the base packages to scan
+ */
+ @AliasFor("basePackages")
+ String[] value() default {};
+
+ /**
+ * Base packages to scan for annotated @Service classes. {@link #value()} is an
+ * alias for (and mutually exclusive with) this attribute.
+ *
+ * Use {@link #basePackageClasses()} for a type-safe alternative to String-based
+ * package names.
+ *
+ * @return the base packages to scan
+ */
+ @AliasFor("value")
+ String[] basePackages() default {};
+
+ /**
+ * Type-safe alternative to {@link #basePackages()} for specifying the packages to
+ * scan for annotated @Service classes. The package of each class specified will be
+ * scanned.
+ *
+ * @return classes from the base packages to scan
+ */
+ Class[] basePackageClasses() default {};
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrar.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrar.java
new file mode 100644
index 00000000000..e453e0fa85e
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrar.java
@@ -0,0 +1,298 @@
+package com.alibaba.dubbo.config.spring.context.annotation;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.alibaba.dubbo.config.spring.ServiceBean;
+import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
+import com.alibaba.dubbo.config.spring.util.BeanRegistrar;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.*;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.util.*;
+
+import java.util.*;
+
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.registerWithGeneratedName;
+import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
+import static org.springframework.util.ClassUtils.resolveClassName;
+
+/**
+ * Dubbo {@link DubboComponentScan} Bean Registrar
+ *
+ * @author Mercy
+ * @see Service
+ * @see DubboComponentScan
+ * @see ImportBeanDefinitionRegistrar
+ * @since 2.5.7
+ */
+public class DubboComponentScanRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware,
+ EnvironmentAware, BeanClassLoaderAware {
+
+ private final Log logger = LogFactory.getLog(getClass());
+
+ private ResourceLoader resourceLoader;
+
+ private Environment environment;
+
+ private ClassLoader classLoader;
+
+ @Override
+ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
+
+ Set packagesToScan = getPackagesToScan(importingClassMetadata);
+
+ registerServiceBeans(packagesToScan, registry);
+
+ registerReferenceAnnotationBeanPostProcessor(registry);
+
+ }
+
+ /**
+ * Registers Beans whose classes was annotated {@link Service}
+ *
+ * @param packagesToScan The base packages to scan
+ * @param registry {@link BeanDefinitionRegistry}
+ */
+ private void registerServiceBeans(Set packagesToScan, BeanDefinitionRegistry registry) {
+
+ DubboClassPathBeanDefinitionScanner dubboClassPathBeanDefinitionScanner =
+ new DubboClassPathBeanDefinitionScanner(registry, environment, resourceLoader);
+
+ dubboClassPathBeanDefinitionScanner.addIncludeFilter(new AnnotationTypeFilter(Service.class));
+
+ for (String packageToScan : packagesToScan) {
+
+ Set beanDefinitionHolders = dubboClassPathBeanDefinitionScanner.doScan(packageToScan);
+
+ for (BeanDefinitionHolder beanDefinitionHolder : beanDefinitionHolders) {
+ registerServiceBean(beanDefinitionHolder, registry);
+ }
+
+ if (logger.isInfoEnabled()) {
+ logger.info(beanDefinitionHolders.size() + " annotated @Service Components { " +
+ beanDefinitionHolders +
+ " } were scanned under package[" + packageToScan + "]");
+ }
+ }
+
+ }
+
+ private Class resolveClass(BeanDefinitionHolder beanDefinitionHolder) {
+
+ BeanDefinition beanDefinition = beanDefinitionHolder.getBeanDefinition();
+
+ return resolveClass(beanDefinition);
+
+ }
+
+ private Class resolveClass(BeanDefinition beanDefinition) {
+
+ String beanClassName = beanDefinition.getBeanClassName();
+
+ return resolveClassName(beanClassName, classLoader);
+
+ }
+
+ /**
+ * Registers {@link ServiceBean} from new annotated {@link Service} {@link BeanDefinition}
+ *
+ * @param beanDefinitionHolder
+ * @param registry
+ * @see ServiceBean
+ * @see BeanDefinition
+ */
+ private void registerServiceBean(BeanDefinitionHolder beanDefinitionHolder, BeanDefinitionRegistry registry) {
+
+ Class beanClass = resolveClass(beanDefinitionHolder);
+
+ Service service = findAnnotation(beanClass, Service.class);
+
+ Class interfaceClass = resolveServiceInterfaceClass(beanClass, service);
+
+ String beanName = beanDefinitionHolder.getBeanName();
+
+ AbstractBeanDefinition serviceBeanDefinition = buildServiceBeanDefinition(service, interfaceClass, beanName);
+
+ registerWithGeneratedName(serviceBeanDefinition, registry);
+
+ }
+
+ private ManagedList toRuntimeBeanReferences(String... beanNames) {
+
+ ManagedList runtimeBeanReferences = new ManagedList();
+
+ if (!ObjectUtils.isEmpty(beanNames)) {
+
+ for (String beanName : beanNames) {
+ runtimeBeanReferences.add(new RuntimeBeanReference(beanName));
+ }
+
+ }
+
+ return runtimeBeanReferences;
+
+ }
+
+ private AbstractBeanDefinition buildServiceBeanDefinition(Service service, Class interfaceClass,
+ String annotatedServiceBeanName) {
+
+ BeanDefinitionBuilder builder = rootBeanDefinition(ServiceBean.class)
+ .addConstructorArgValue(service)
+ // References "ref" property to annotated-@Service Bean
+ .addPropertyReference("ref", annotatedServiceBeanName)
+ .addPropertyValue("interfaceClass", interfaceClass);
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.ProviderConfig} Bean reference
+ */
+ String providerConfigBeanName = service.provider();
+ if (StringUtils.hasText(providerConfigBeanName)) {
+ builder.addPropertyReference("provider", providerConfigBeanName);
+ }
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.MonitorConfig} Bean reference
+ */
+ String monitorConfigBeanName = service.monitor();
+ if (StringUtils.hasText(monitorConfigBeanName)) {
+ builder.addPropertyReference("monitor", monitorConfigBeanName);
+ }
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.ApplicationConfig} Bean reference
+ */
+ String applicationConfigBeanName = service.application();
+ if (StringUtils.hasText(applicationConfigBeanName)) {
+ builder.addPropertyReference("application", applicationConfigBeanName);
+ }
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.ModuleConfig} Bean reference
+ */
+ String moduleConfigBeanName = service.module();
+ if (StringUtils.hasText(moduleConfigBeanName)) {
+ builder.addPropertyReference("application", moduleConfigBeanName);
+ }
+
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.RegistryConfig} Bean reference
+ */
+ String[] registryConfigBeanNames = service.registry();
+
+ List registryRuntimeBeanReferences = toRuntimeBeanReferences(registryConfigBeanNames);
+
+ if (!registryRuntimeBeanReferences.isEmpty()) {
+ builder.addPropertyValue("registries", registryRuntimeBeanReferences);
+ }
+
+ /**
+ * Add {@link com.alibaba.dubbo.config.ProtocolConfig} Bean reference
+ */
+ String[] protocolConfigBeanNames = service.protocol();
+
+ List protocolRuntimeBeanReferences = toRuntimeBeanReferences(protocolConfigBeanNames);
+
+ if (!registryRuntimeBeanReferences.isEmpty()) {
+ builder.addPropertyValue("protocols", protocolRuntimeBeanReferences);
+ }
+
+ return builder.getBeanDefinition();
+
+ }
+
+ private Class resolveServiceInterfaceClass(Class annotatedServiceBeanClass, Service service) {
+
+ Class interfaceClass = service.interfaceClass();
+
+ if (void.class.equals(interfaceClass)) {
+
+ interfaceClass = null;
+
+ String interfaceClassName = service.interfaceName();
+
+ if (StringUtils.hasText(interfaceClassName)) {
+ if (ClassUtils.isPresent(interfaceClassName, classLoader)) {
+ interfaceClass = resolveClassName(interfaceClassName, classLoader);
+ }
+ }
+
+ }
+
+ if (interfaceClass == null) {
+
+ Class[] allInterfaces = annotatedServiceBeanClass.getInterfaces();
+
+ if (allInterfaces.length > 0) {
+ interfaceClass = allInterfaces[0];
+ }
+
+ }
+
+ Assert.notNull(interfaceClass,
+ "@Service interfaceClass() or interfaceName() or interface class must be present!");
+
+ Assert.isTrue(interfaceClass.isInterface(),
+ "The type that was annotated @Service is not an interface!");
+
+ return interfaceClass;
+ }
+
+ /**
+ * Registers {@link ReferenceAnnotationBeanPostProcessor} into {@link BeanFactory}
+ *
+ * @param registry {@link BeanDefinitionRegistry}
+ */
+ private void registerReferenceAnnotationBeanPostProcessor(BeanDefinitionRegistry registry) {
+
+ // Register @Reference Annotation Bean Processor
+ BeanRegistrar.registerInfrastructureBean(registry,
+ ReferenceAnnotationBeanPostProcessor.BEAN_NAME, ReferenceAnnotationBeanPostProcessor.class);
+
+ }
+
+ private Set getPackagesToScan(AnnotationMetadata metadata) {
+ AnnotationAttributes attributes = AnnotationAttributes.fromMap(
+ metadata.getAnnotationAttributes(DubboComponentScan.class.getName()));
+ String[] basePackages = attributes.getStringArray("basePackages");
+ Class[] basePackageClasses = attributes.getClassArray("basePackageClasses");
+ Set packagesToScan = new LinkedHashSet();
+ packagesToScan.addAll(Arrays.asList(basePackages));
+ for (Class basePackageClass : basePackageClasses) {
+ packagesToScan.add(ClassUtils.getPackageName(basePackageClass));
+ }
+ if (packagesToScan.isEmpty()) {
+ return Collections.singleton(ClassUtils.getPackageName(metadata.getClassName()));
+ }
+ return packagesToScan;
+ }
+
+ @Override
+ public void setResourceLoader(ResourceLoader resourceLoader) {
+ this.resourceLoader = resourceLoader;
+ }
+
+ @Override
+ public void setEnvironment(Environment environment) {
+ this.environment = environment;
+ }
+
+ @Override
+ public void setBeanClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
+ }
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 98b4394c273..f8d91a4790c 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -24,7 +24,6 @@
import com.alibaba.dubbo.config.ArgumentConfig;
import com.alibaba.dubbo.config.ConsumerConfig;
import com.alibaba.dubbo.config.MethodConfig;
-import com.alibaba.dubbo.config.MonitorConfig;
import com.alibaba.dubbo.config.ProtocolConfig;
import com.alibaba.dubbo.config.ProviderConfig;
import com.alibaba.dubbo.config.RegistryConfig;
@@ -197,11 +196,6 @@ private static BeanDefinition parse(Element element, ParserContext parserContext
ProtocolConfig protocol = new ProtocolConfig();
protocol.setName(value);
reference = protocol;
- } else if ("monitor".equals(property)
- && (!parserContext.getRegistry().containsBeanDefinition(value)
- || !MonitorConfig.class.getName().equals(parserContext.getRegistry().getBeanDefinition(value).getBeanClassName()))) {
- // 兼容旧版本配置
- reference = convertMonitor(value);
} else if ("onreturn".equals(property)) {
int index = value.lastIndexOf(".");
String returnRef = value.substring(0, index);
@@ -249,29 +243,6 @@ private static BeanDefinition parse(Element element, ParserContext parserContext
return beanDefinition;
}
- protected static MonitorConfig convertMonitor(String monitor) {
- if (monitor == null || monitor.length() == 0) {
- return null;
- }
- if (GROUP_AND_VERION.matcher(monitor).matches()) {
- String group;
- String version;
- int i = monitor.indexOf(':');
- if (i > 0) {
- group = monitor.substring(0, i);
- version = monitor.substring(i + 1);
- } else {
- group = monitor;
- version = null;
- }
- MonitorConfig monitorConfig = new MonitorConfig();
- monitorConfig.setGroup(group);
- monitorConfig.setVersion(version);
- return monitorConfig;
- }
- return null;
- }
-
private static boolean isPrimitive(Class cls) {
return cls.isPrimitive() || cls == Boolean.class || cls == Byte.class
|| cls == Character.class || cls == Short.class || cls == Integer.class
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtils.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtils.java
new file mode 100644
index 00000000000..0938e192caf
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtils.java
@@ -0,0 +1,75 @@
+package com.alibaba.dubbo.config.spring.util;
+
+import com.alibaba.dubbo.common.utils.StringUtils;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+
+import java.util.*;
+
+import static org.springframework.beans.factory.BeanFactoryUtils.beanNamesForTypeIncludingAncestors;
+import static org.springframework.beans.factory.BeanFactoryUtils.beanOfTypeIncludingAncestors;
+import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
+
+/**
+ * {@link BeanFactory} Utilities class
+ *
+ * @author Mercy
+ * @see BeanFactory
+ * @see ConfigurableBeanFactory
+ * @see org.springframework.beans.factory.BeanFactoryUtils
+ * @since 2.5.7
+ */
+public class BeanFactoryUtils {
+
+
+ /**
+ * Get optional Bean
+ *
+ * @param beanFactory {@link ListableBeanFactory}
+ * @param beanName the name of Bean
+ * @param beanType the {@link Class type} of Bean
+ * @param the {@link Class type} of Bean
+ * @return A bean if present , or null
+ */
+ public static T getOptionalBean(ListableBeanFactory beanFactory, String beanName, Class beanType) {
+
+ String[] allBeanNames = beanNamesForTypeIncludingAncestors(beanFactory, beanType);
+
+ if (!StringUtils.isContains(allBeanNames, beanName)) {
+ return null;
+ }
+
+ Map beansOfType = beansOfTypeIncludingAncestors(beanFactory, beanType);
+
+ return beansOfType.get(beanName);
+
+ }
+
+
+ /**
+ * Gets name-matched Beans from {@link ListableBeanFactory BeanFactory}
+ *
+ * @param beanFactory {@link ListableBeanFactory BeanFactory}
+ * @param beanNames the names of Bean
+ * @param beanType the {@link Class type} of Bean
+ * @param the {@link Class type} of Bean
+ * @return
+ */
+ public static List getBeans(ListableBeanFactory beanFactory, String[] beanNames, Class beanType) {
+
+ String[] allBeanNames = beanNamesForTypeIncludingAncestors(beanFactory, beanType);
+
+ List beans = new ArrayList(beanNames.length);
+
+ for (String beanName : beanNames) {
+ if (StringUtils.isContains(allBeanNames, beanName)) {
+ beans.add(beanOfTypeIncludingAncestors(beanFactory, beanType));
+ }
+ }
+
+ return Collections.unmodifiableList(beans);
+
+ }
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanRegistrar.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanRegistrar.java
new file mode 100644
index 00000000000..24ae2fae65b
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanRegistrar.java
@@ -0,0 +1,34 @@
+package com.alibaba.dubbo.config.spring.util;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+
+/**
+ * Bean Registrar
+ *
+ * @author Mercy
+ * @since 2.5.7
+ */
+public class BeanRegistrar {
+
+ /**
+ * Register Infrastructure Bean
+ *
+ * @param beanDefinitionRegistry {@link BeanDefinitionRegistry}
+ * @param beanType the type of bean
+ * @param beanName the name of bean
+ */
+ public static void registerInfrastructureBean(BeanDefinitionRegistry beanDefinitionRegistry,
+ String beanName,
+ Class beanType) {
+
+ if (!beanDefinitionRegistry.containsBeanDefinition(beanName)) {
+ RootBeanDefinition beanDefinition = new RootBeanDefinition(beanType);
+ beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+ beanDefinitionRegistry.registerBeanDefinition(beanName, beanDefinition);
+ }
+
+ }
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
index c003d0af172..2a41cb9caef 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -53,7 +53,7 @@
-
@@ -83,12 +83,12 @@
-
-
@@ -297,12 +297,20 @@
+
+
+
+
+
+
+
@@ -684,6 +693,11 @@
+
+
+
+
Mercy
+ * @since 2.5.7
+ */
+public class ReferenceAnnotationBeanPostProcessorTest {
+
+ private static final String PROVIDER_LOCATION = "META-INF/spring/dubbo-provider.xml";
+
+ @Test
+ public void test() throws Exception {
+
+
+ // Starts Provider
+ new ClassPathXmlApplicationContext(PROVIDER_LOCATION);
+
+ AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+ context.register(TestBean.class);
+
+ context.refresh();
+
+ TestBean testBean = context.getBean(TestBean.class);
+
+ Assert.assertNotNull(testBean.getDemoServiceFromAncestor());
+ Assert.assertNotNull(testBean.getDemoServiceFromParent());
+ Assert.assertNotNull(testBean.getDemoService());
+
+ Assert.assertEquals(testBean.getDemoServiceFromAncestor(), testBean.getDemoServiceFromParent());
+ Assert.assertEquals(testBean.getDemoService(), testBean.getDemoServiceFromParent());
+
+ DemoService demoService = testBean.getDemoService();
+
+ Assert.assertEquals("annotation:Mercy", demoService.sayName("Mercy"));
+
+ context.close();
+
+ }
+
+ private static class AncestorBean {
+
+
+ private DemoService demoServiceFromAncestor;
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public DemoService getDemoServiceFromAncestor() {
+ return demoServiceFromAncestor;
+ }
+
+ @Reference(version = "1.2", url = "dubbo://127.0.0.1:12345")
+ public void setDemoServiceFromAncestor(DemoService demoServiceFromAncestor) {
+ this.demoServiceFromAncestor = demoServiceFromAncestor;
+ }
+
+ public ApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
+
+ }
+
+
+ private static class ParentBean extends AncestorBean {
+
+ @Reference(version = "1.2", url = "dubbo://127.0.0.1:12345")
+ private DemoService demoServiceFromParent;
+
+ public DemoService getDemoServiceFromParent() {
+ return demoServiceFromParent;
+ }
+
+
+ }
+
+ @ImportResource("META-INF/spring/dubbo-annotation-consumer.xml")
+ @DubboComponentScan(basePackageClasses = ReferenceAnnotationBeanPostProcessorTest.class)
+ private static class TestBean extends ParentBean {
+
+ private DemoService demoService;
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public DemoService getDemoService() {
+ return demoService;
+ }
+
+ @Reference(version = "1.2", url = "dubbo://127.0.0.1:12345")
+ public void setDemoService(DemoService demoService) {
+ this.demoService = demoService;
+ }
+ }
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DemoServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DemoServiceImpl.java
new file mode 100644
index 00000000000..c3529b31586
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DemoServiceImpl.java
@@ -0,0 +1,35 @@
+package com.alibaba.dubbo.config.spring.context.annotation;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.alibaba.dubbo.config.spring.api.Box;
+import com.alibaba.dubbo.config.spring.api.DemoService;
+
+/**
+ * {@link DemoService} Service implementation
+ *
+ * @author Mercy
+ * @since 2.5.7
+ */
+@Service(
+ version = "2.5.7",
+ application = "dubbo-annotation-provider",
+ protocol = "dubbo",
+ registry = "my-registry"
+)
+public class DemoServiceImpl implements DemoService {
+
+ @Override
+ public String sayName(String name) {
+ return "Hello," + name;
+ }
+
+ @Override
+ public Box getBox() {
+ return new Box() {
+ @Override
+ public String getName() {
+ return "MyBox";
+ }
+ };
+ }
+}
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
new file mode 100644
index 00000000000..0c6d6e2a469
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
@@ -0,0 +1,53 @@
+package com.alibaba.dubbo.config.spring.context.annotation;
+
+import com.alibaba.dubbo.config.spring.api.DemoService;
+import com.alibaba.dubbo.config.spring.context.annotation.consumer.ConsumerConfiguration;
+import com.alibaba.dubbo.config.spring.context.annotation.provider.ProviderConfiguration;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+/**
+ * {@link DubboComponentScanRegistrar} Test
+ *
+ * @author Mercy
+ * @since 2.5.7
+ */
+public class DubboComponentScanRegistrarTest {
+
+ @Test
+ public void test() {
+
+ AnnotationConfigApplicationContext providerContext = new AnnotationConfigApplicationContext();
+
+ providerContext.register(ProviderConfiguration.class);
+
+ providerContext.refresh();
+
+ DemoService demoService = providerContext.getBean(DemoService.class);
+
+ String value = demoService.sayName("Mercy");
+
+ Assert.assertEquals("Hello,Mercy", value);
+
+ AnnotationConfigApplicationContext consumerContext = new AnnotationConfigApplicationContext();
+
+ consumerContext.register(ConsumerConfiguration.class);
+
+ consumerContext.refresh();
+
+ ConsumerConfiguration consumerConfiguration = consumerContext.getBean(ConsumerConfiguration.class);
+
+ value = consumerConfiguration.getDemoService().sayName("Mercy");
+
+ Assert.assertEquals("Hello,Mercy", value);
+
+ providerContext.close();
+ consumerContext.close();
+
+
+ }
+
+
+}
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java
new file mode 100644
index 00000000000..ff10defbc7c
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java
@@ -0,0 +1,31 @@
+package com.alibaba.dubbo.config.spring.context.annotation.consumer;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.alibaba.dubbo.config.spring.api.DemoService;
+import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+/**
+ * @author ken.lj
+ * @date 2017/11/3
+ */
+@Configuration("consumerConfiguration")
+@DubboComponentScan(
+ basePackageClasses = ConsumerConfiguration.class
+)
+@ImportResource("META-INF/spring/dubbo-annotation-consumer.xml")
+public class ConsumerConfiguration {
+
+ @Reference(version = "2.5.7", url = "dubbo://127.0.0.1:12345")
+ private DemoService demoService;
+
+ public DemoService getDemoService() {
+ return demoService;
+ }
+
+ public void setDemoService(DemoService demoService) {
+ this.demoService = demoService;
+ }
+}
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java
new file mode 100644
index 00000000000..eca69c4052a
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java
@@ -0,0 +1,17 @@
+package com.alibaba.dubbo.config.spring.context.annotation.provider;
+
+import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan;
+
+import org.springframework.context.annotation.ImportResource;
+
+/**
+ * @author ken.lj
+ * @date 2017/11/3
+ */
+@DubboComponentScan(basePackages = "com.alibaba.dubbo.config.spring.context.annotation")
+@ImportResource("META-INF/spring/dubbo-annotation-provider.xml")
+public class ProviderConfiguration {
+
+
+}
+
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java
new file mode 100644
index 00000000000..b39337df3e9
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java
@@ -0,0 +1,90 @@
+package com.alibaba.dubbo.config.spring.util;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * {@link BeanFactoryUtils} Test
+ *
+ * @author Mercy
+ * @since 2.5.7
+ */
+public class BeanFactoryUtilsTest {
+
+ private AnnotationConfigApplicationContext applicationContext;
+
+ @Before
+ public void init() {
+ applicationContext = new AnnotationConfigApplicationContext();
+ }
+
+ @Test
+ public void testGetOptionalBean() {
+
+ applicationContext.register(TestBean.class);
+
+ applicationContext.refresh();
+
+ TestBean testBean = BeanFactoryUtils.getOptionalBean(applicationContext, "testBean", TestBean.class);
+
+ Assert.assertNotNull(testBean);
+
+ Assert.assertEquals("Hello,World", testBean.getName());
+
+ }
+
+ @Test
+ public void testGetOptionalBeanIfAbsent() {
+
+ applicationContext.refresh();
+
+ TestBean testBean = BeanFactoryUtils.getOptionalBean(applicationContext, "testBean", TestBean.class);
+
+ Assert.assertNull(testBean);
+ }
+
+ @Test
+ public void testGetBeans() {
+
+ applicationContext.register(TestBean.class);
+
+ applicationContext.refresh();
+
+ List testBeans = BeanFactoryUtils.getBeans(applicationContext, new String[]{"testBean"}, TestBean.class);
+
+ Assert.assertEquals(1, testBeans.size());
+
+ Assert.assertEquals("Hello,World", testBeans.get(0).getName());
+
+ }
+
+ @Test
+ public void testGetBeansIfAbsent() {
+
+ applicationContext.refresh();
+
+ List testBeans = BeanFactoryUtils.getBeans(applicationContext, new String[]{"testBean"}, TestBean.class);
+
+ Assert.assertTrue(testBeans.isEmpty());
+
+ }
+
+ @Component("testBean")
+ private static class TestBean {
+
+ private String name = "Hello,World";
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+}
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml
new file mode 100644
index 00000000000..73ca10ea673
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml
new file mode 100644
index 00000000000..75e6a0500dc
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-consumer.xml
new file mode 100644
index 00000000000..6b97dad2e92
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-consumer.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml
new file mode 100644
index 00000000000..f9f6de5c2f5
--- /dev/null
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml
index 3a2a735a7df..1303a4d1fc5 100644
--- a/dubbo-config/pom.xml
+++ b/dubbo-config/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-config
pom
diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml
index b18d9d584b4..ef46e4abe5e 100644
--- a/dubbo-container/dubbo-container-api/pom.xml
+++ b/dubbo-container/dubbo-container-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-container
- 2.5.6
+ 2.5.7
dubbo-container-api
jar
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
index c0e341ae74c..d63098bb1a5 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
@@ -12,7 +12,7 @@ if [ -z "$SERVER_NAME" ]; then
SERVER_NAME=`hostname`
fi
-PIDS=`ps -ef | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'`
if [ -z "$PIDS" ]; then
echo "ERROR: The $SERVER_NAME does not started!"
exit 1
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
index 8bbea8d0a5f..ed08cbc3272 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
@@ -7,14 +7,19 @@ CONF_DIR=$DEPLOY_DIR/conf
SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
SERVER_PROTOCOL=`sed '/dubbo.protocol.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
+SERVER_HOST=`sed '/dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
+if [ -z "$SERVER_HOST" ]; then
+ SERVER_HOST=`127.0.0.1`
+fi
+
if [ -z "$SERVER_NAME" ]; then
SERVER_NAME=`hostname`
fi
-PIDS=`ps -ef | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'`
if [ -n "$PIDS" ]; then
echo "ERROR: The $SERVER_NAME already started!"
echo "PID: $PIDS"
@@ -69,12 +74,12 @@ while [ $COUNT -lt 1 ]; do
sleep 1
if [ -n "$SERVER_PORT" ]; then
if [ "$SERVER_PROTOCOL" == "dubbo" ]; then
- COUNT=`echo status | nc -i 1 127.0.0.1 $SERVER_PORT | grep -c OK`
+ COUNT=`echo status | nc -i 1 $SERVER_HOST $SERVER_PORT | grep -c OK`
else
COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
fi
else
- COUNT=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l`
+ COUNT=`ps -f | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l`
fi
if [ $COUNT -gt 0 ]; then
break
@@ -82,6 +87,6 @@ while [ $COUNT -lt 1 ]; do
done
echo "OK!"
-PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
+PIDS=`ps -f | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}'`
echo "PID: $PIDS"
echo "STDOUT: $STDOUT_FILE"
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
index 91bbd184606..8fca15e3d64 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
@@ -11,7 +11,7 @@ if [ -z "$SERVER_NAME" ]; then
SERVER_NAME=`hostname`
fi
-PIDS=`ps -ef | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'`
if [ -z "$PIDS" ]; then
echo "ERROR: The $SERVER_NAME does not started!"
exit 1
diff --git a/dubbo-container/dubbo-container-jetty/pom.xml b/dubbo-container/dubbo-container-jetty/pom.xml
index 39c346688fe..615f846cd46 100644
--- a/dubbo-container/dubbo-container-jetty/pom.xml
+++ b/dubbo-container/dubbo-container-jetty/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-container
- 2.5.6
+ 2.5.7
dubbo-container-jetty
jar
diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml
index d1096c2573f..4abf3578f0d 100644
--- a/dubbo-container/dubbo-container-log4j/pom.xml
+++ b/dubbo-container/dubbo-container-log4j/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-container
- 2.5.6
+ 2.5.7
dubbo-container-log4j
jar
diff --git a/dubbo-container/dubbo-container-logback/pom.xml b/dubbo-container/dubbo-container-logback/pom.xml
index 6f225bc5045..1cf658f109c 100644
--- a/dubbo-container/dubbo-container-logback/pom.xml
+++ b/dubbo-container/dubbo-container-logback/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-container
- 2.5.6
+ 2.5.7
dubbo-container-logback
jar
diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml
index d2c6b427477..6c14d64891a 100644
--- a/dubbo-container/dubbo-container-spring/pom.xml
+++ b/dubbo-container/dubbo-container-spring/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-container
- 2.5.6
+ 2.5.7
dubbo-container-spring
jar
diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml
index da4c8a48211..3bab054c0f9 100644
--- a/dubbo-container/pom.xml
+++ b/dubbo-container/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-container
pom
diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml
index e9b96ac8adf..299adbe5e78 100644
--- a/dubbo-demo/dubbo-demo-api/pom.xml
+++ b/dubbo-demo/dubbo-demo-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-demo
- 2.5.6
+ 2.5.7
dubbo-demo-api
jar
diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml
index 1779534c68b..47d77ffd6d5 100644
--- a/dubbo-demo/dubbo-demo-consumer/pom.xml
+++ b/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-demo
- 2.5.6
+ 2.5.7
dubbo-demo-consumer
jar
@@ -59,6 +59,10 @@
org.apache.curator
curator-framework
+
+ com.alibaba
+ fastjson
+
log4j
log4j
diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml
index 26210ff7fd9..a76488018f0 100644
--- a/dubbo-demo/dubbo-demo-provider/pom.xml
+++ b/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-demo
- 2.5.6
+ 2.5.7
dubbo-demo-provider
jar
@@ -59,6 +59,10 @@
org.apache.curator
curator-framework
+
+ com.alibaba
+ fastjson
+
log4j
log4j
diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml
index 5bc25a617d0..dd8f575af4f 100644
--- a/dubbo-demo/pom.xml
+++ b/dubbo-demo/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-demo
pom
diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml
index 36183ae37d3..fa32e80867a 100644
--- a/dubbo-filter/dubbo-filter-cache/pom.xml
+++ b/dubbo-filter/dubbo-filter-cache/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-filter
- 2.5.6
+ 2.5.7
dubbo-filter-cache
jar
diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml
index d4693917731..6809eb2393f 100644
--- a/dubbo-filter/dubbo-filter-validation/pom.xml
+++ b/dubbo-filter/dubbo-filter-validation/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-filter
- 2.5.6
+ 2.5.7
dubbo-filter-validation
jar
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java b/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java
new file mode 100644
index 00000000000..2302ec8be3c
--- /dev/null
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java
@@ -0,0 +1,23 @@
+package com.alibaba.dubbo.validation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 方法分组验证注解
+ * 使用场景：当调用某个方法时，需要检查多个分组，可以在接口方法上加上该注解
@MethodValidated({Save.class, Update.class})
+ * void relatedQuery(ValidationParameter parameter);
+ * 在接口方法上增加注解,表示relatedQuery这个方法需要同时检查Save和Update这两个分组
+ *
+ * @author: zhangyinyue
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface MethodValidated {
+ Class[] value() default {};
+}
diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java
index 4c70adb710c..8d607ed8580 100644
--- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java
+++ b/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java
@@ -20,6 +20,7 @@
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import com.alibaba.dubbo.common.utils.ReflectUtils;
+import com.alibaba.dubbo.validation.MethodValidated;
import com.alibaba.dubbo.validation.Validator;
import javassist.ClassPool;
@@ -55,9 +56,12 @@
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -146,7 +150,7 @@ private static Object getMethodParameterBean(Class clazz, Method method, Obje
ctField.getFieldInfo().addAttribute(attribute);
ctClass.addField(ctField);
}
- parameterClass = ctClass.toClass();
+ parameterClass = ctClass.toClass(clazz.getClassLoader(), null);
}
Object parameterBean = parameterClass.newInstance();
for (int i = 0; i < args.length; i++) {
@@ -231,51 +235,60 @@ else if (memberValue instanceof ArrayMemberValue) {
}
public void validate(String methodName, Class[] parameterTypes, Object[] arguments) throws Exception {
- String methodClassName = clazz.getName() + "_" + toUpperMethoName(methodName);
+ List> groups = new ArrayList>();
+ String methodClassName = clazz.getName() + "$" + toUpperMethoName(methodName);
Class methodClass = null;
try {
methodClass = Class.forName(methodClassName, false, Thread.currentThread().getContextClassLoader());
+ groups.add(methodClass);
} catch (ClassNotFoundException e) {
}
Set> violations = new HashSet>();
Method method = clazz.getMethod(methodName, parameterTypes);
+ Class[] methodClasses = null;
+ if (method.isAnnotationPresent(MethodValidated.class)){
+ methodClasses = method.getAnnotation(MethodValidated.class).value();
+ groups.addAll(Arrays.asList(methodClasses));
+ }
+ //加入默认分组
+ groups.add(0, Default.class);
+ groups.add(1, clazz);
+
+ //将list转换为数组
+ Class[] classgroups = groups.toArray(new Class[0]);
+
Object parameterBean = getMethodParameterBean(clazz, method, arguments);
if (parameterBean != null) {
- if (methodClass != null) {
- violations.addAll(validator.validate(parameterBean, Default.class, clazz, methodClass));
- } else {
- violations.addAll(validator.validate(parameterBean, Default.class, clazz));
- }
+ violations.addAll(validator.validate(parameterBean, classgroups ));
}
+
for (Object arg : arguments) {
- validate(violations, arg, clazz, methodClass);
+ validate(violations, arg, classgroups);
}
+
if (violations.size() > 0) {
+ logger.error("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations);
throw new ConstraintViolationException("Failed to validate service: " + clazz.getName() + ", method: " + methodName + ", cause: " + violations, violations);
}
}
- private void validate(Set> violations, Object arg, Class clazz, Class methodClass) {
+ private void validate(Set> violations, Object arg, Class... groups) {
if (arg != null && !isPrimitives(arg.getClass())) {
if (Object[].class.isInstance(arg)) {
for (Object item : (Object[]) arg) {
- validate(violations, item, clazz, methodClass);
+ validate(violations, item, groups);
}
} else if (Collection.class.isInstance(arg)) {
for (Object item : (Collection) arg) {
- validate(violations, item, clazz, methodClass);
+ validate(violations, item, groups);
}
} else if (Map.class.isInstance(arg)) {
for (Map.Entry entry : ((Map) arg).entrySet()) {
- validate(violations, entry.getKey(), clazz, methodClass);
- validate(violations, entry.getValue(), clazz, methodClass);
+ validate(violations, entry.getKey(), groups);
+ validate(violations, entry.getValue(), groups);
}
} else {
- if (methodClass != null) {
- violations.addAll(validator.validate(arg, Default.class, clazz, methodClass));
- } else {
- violations.addAll(validator.validate(arg, Default.class, clazz));
- }
+ violations.addAll(validator.validate(arg, groups));
}
}
}
diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml
index aeaa2075d5c..efecc38d6b4 100644
--- a/dubbo-filter/pom.xml
+++ b/dubbo-filter/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-filter
pom
diff --git a/dubbo-maven/pom.xml b/dubbo-maven/pom.xml
index 37b4e8dcacf..534e5e0d01e 100644
--- a/dubbo-maven/pom.xml
+++ b/dubbo-maven/pom.xml
@@ -23,7 +23,7 @@
com.alibaba
dubbo
- 2.5.6
+ 2.5.7
jar
Dubbo
Dubbo is a distributed service framework enpowers applications with service import/export capability
diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml
index f45bb0a2840..cb7680b34de 100644
--- a/dubbo-monitor/dubbo-monitor-api/pom.xml
+++ b/dubbo-monitor/dubbo-monitor-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-monitor
- 2.5.6
+ 2.5.7
dubbo-monitor-api
jar
diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java
index 3a8f477822a..8e91ab3f8c3 100644
--- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java
+++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java
@@ -17,6 +17,11 @@
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.concurrent.ListenableFuture;
+import com.alibaba.dubbo.common.concurrent.ListenableFutureTask;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
+import com.alibaba.dubbo.common.utils.NamedThreadFactory;
import com.alibaba.dubbo.monitor.Monitor;
import com.alibaba.dubbo.monitor.MonitorFactory;
import com.alibaba.dubbo.monitor.MonitorService;
@@ -24,7 +29,14 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
/**
@@ -33,6 +45,7 @@
* @author william.liangf
*/
public abstract class AbstractMonitorFactory implements MonitorFactory {
+ private static final Logger logger = LoggerFactory.getLogger(AbstractMonitorFactory.class);
// 注册中心获取过程锁
private static final ReentrantLock LOCK = new ReentrantLock();
@@ -40,6 +53,10 @@ public abstract class AbstractMonitorFactory implements MonitorFactory {
// 注册中心集合 Map
private static final Map MONITORS = new ConcurrentHashMap();
+ private static final Map> FUTURES = new ConcurrentHashMap>();
+
+ private static final ExecutorService executor = new ThreadPoolExecutor(0, 10, 60L, TimeUnit.SECONDS, new SynchronousQueue(), new NamedThreadFactory("DubboMonitorCreator", true));
+
public static Collection getMonitors() {
return Collections.unmodifiableCollection(MONITORS.values());
}
@@ -47,18 +64,27 @@ public static Collection getMonitors() {
public Monitor getMonitor(URL url) {
url = url.setPath(MonitorService.class.getName()).addParameter(Constants.INTERFACE_KEY, MonitorService.class.getName());
String key = url.toServiceStringWithoutResolving();
+ Monitor monitor = MONITORS.get(key);
+ Future future = FUTURES.get(key);
+ if (monitor != null || future != null) {
+ return monitor;
+ }
+
LOCK.lock();
try {
- Monitor monitor = MONITORS.get(key);
- if (monitor != null) {
+ monitor = MONITORS.get(key);
+ future = FUTURES.get(key);
+ if (monitor != null || future != null) {
return monitor;
}
- monitor = createMonitor(url);
- if (monitor == null) {
- throw new IllegalStateException("Can not create monitor " + url);
- }
- MONITORS.put(key, monitor);
- return monitor;
+
+ final URL monitorUrl = url;
+ final ListenableFutureTask listenableFutureTask = ListenableFutureTask.create(new MonitorCreator(monitorUrl));
+ listenableFutureTask.addListener(new MonitorListener(key));
+ executor.execute(listenableFutureTask);
+ FUTURES.put(key, listenableFutureTask);
+
+ return null;
} finally {
// 释放锁
LOCK.unlock();
@@ -67,4 +93,42 @@ public Monitor getMonitor(URL url) {
protected abstract Monitor createMonitor(URL url);
-}
\ No newline at end of file
+ class MonitorCreator implements Callable {
+
+ private URL url;
+
+ public MonitorCreator(URL url) {
+ this.url = url;
+ }
+
+ @Override
+ public Monitor call() throws Exception {
+ Monitor monitor = AbstractMonitorFactory.this.createMonitor(url);
+ return monitor;
+ }
+ }
+
+ class MonitorListener implements Runnable {
+
+ private String key;
+
+ public MonitorListener(String key) {
+ this.key = key;
+ }
+
+ @Override
+ public void run() {
+ try {
+ ListenableFuture listenableFuture = AbstractMonitorFactory.FUTURES.get(key);
+ AbstractMonitorFactory.MONITORS.put(key, listenableFuture.get());
+ AbstractMonitorFactory.FUTURES.remove(key);
+ } catch (InterruptedException e) {
+ logger.warn("Thread was interrupted unexpectedly, monitor will never be got.");
+ AbstractMonitorFactory.FUTURES.remove(key);
+ } catch (ExecutionException e) {
+ logger.warn("Create monitor failed, monitor data will not be collected until you fix this problem. ", e);
+ }
+ }
+ }
+
+}
diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java
index 7d0061c657d..702346fc15c 100644
--- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java
+++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java
@@ -87,6 +87,9 @@ private void collect(Invoker invoker, Invocation invocation, Result result, S
String method = RpcUtils.getMethodName(invocation); // 获取方法名
URL url = invoker.getUrl().getUrlParameter(Constants.MONITOR_KEY);
Monitor monitor = monitorFactory.getMonitor(url);
+ if (monitor == null) {
+ return;
+ }
int localPort;
String remoteKey;
String remoteValue;
diff --git a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java b/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java
index f51a31f7962..481baefec38 100644
--- a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java
+++ b/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java
@@ -64,20 +64,38 @@ public void testMonitorFactoryCache() throws Exception {
URL url = URL.valueOf("dubbo://" + NetUtils.getLocalAddress().getHostAddress() + ":2233");
Monitor monitor1 = monitorFactory.getMonitor(url);
Monitor monitor2 = monitorFactory.getMonitor(url);
+ if (monitor1 == null || monitor2 == null) {
+ Thread.sleep(2000);
+ monitor1 = monitorFactory.getMonitor(url);
+ monitor2 = monitorFactory.getMonitor(url);
+ }
Assert.assertEquals(monitor1, monitor2);
}
@Test
public void testMonitorFactoryIpCache() throws Exception {
- Monitor monitor1 = monitorFactory.getMonitor(URL.valueOf("dubbo://" + NetUtils.getLocalAddress().getHostName() + ":2233"));
- Monitor monitor2 = monitorFactory.getMonitor(URL.valueOf("dubbo://" + NetUtils.getLocalAddress().getHostAddress() + ":2233"));
+ URL url = URL.valueOf("dubbo://" + NetUtils.getLocalAddress().getHostName() + ":2233");
+ Monitor monitor1 = monitorFactory.getMonitor(url);
+ Monitor monitor2 = monitorFactory.getMonitor(url);
+ if (monitor1 == null || monitor2 == null) {
+ Thread.sleep(2000);
+ monitor1 = monitorFactory.getMonitor(url);
+ monitor2 = monitorFactory.getMonitor(url);
+ }
Assert.assertEquals(monitor1, monitor2);
}
@Test
public void testMonitorFactoryGroupCache() throws Exception {
- Monitor monitor1 = monitorFactory.getMonitor(URL.valueOf("dubbo://" + NetUtils.getLocalHost() + ":2233?group=aaa"));
- Monitor monitor2 = monitorFactory.getMonitor(URL.valueOf("dubbo://" + NetUtils.getLocalHost() + ":2233?group=bbb"));
+ URL url1 = URL.valueOf("dubbo://" + NetUtils.getLocalHost() + ":2233?group=aaa");
+ URL url2 = URL.valueOf("dubbo://" + NetUtils.getLocalHost() + ":2233?group=bbb");
+ Monitor monitor1 = monitorFactory.getMonitor(url1);
+ Monitor monitor2 = monitorFactory.getMonitor(url2);
+ if (monitor1 == null || monitor2 == null) {
+ Thread.sleep(2000);
+ monitor1 = monitorFactory.getMonitor(url1);
+ monitor2 = monitorFactory.getMonitor(url2);
+ }
Assert.assertNotSame(monitor1, monitor2);
}
diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml
index 7628fe4927c..05ae615f83d 100644
--- a/dubbo-monitor/dubbo-monitor-default/pom.xml
+++ b/dubbo-monitor/dubbo-monitor-default/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-monitor
- 2.5.6
+ 2.5.7
dubbo-monitor-default
jar
diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java
index b7003870d98..c43502f370d 100644
--- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java
+++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java
@@ -129,20 +129,30 @@ public void testMonitorFactory() throws Exception {
Exporter exporter = protocol.export(proxyFactory.getInvoker(monitorService, MonitorService.class, URL.valueOf("dubbo://127.0.0.1:17979/" + MonitorService.class.getName())));
try {
- Monitor monitor = monitorFactory.getMonitor(URL.valueOf("dubbo://127.0.0.1:17979?interval=10"));
- try {
- monitor.collect(statistics);
- int i = 0;
- while (monitorService.getStatistics() == null && i < 200) {
- i++;
- Thread.sleep(10);
+ Monitor monitor = null;
+ long start = System.currentTimeMillis();
+ // 如果60s都拿不到
+ while (System.currentTimeMillis() - start < 60000) {
+ monitor = monitorFactory.getMonitor(URL.valueOf("dubbo://127.0.0.1:17979?interval=10"));
+ if (monitor == null) {
+ continue;
}
- URL result = monitorService.getStatistics();
- Assert.assertEquals(1, result.getParameter(MonitorService.SUCCESS, 0));
- Assert.assertEquals(3, result.getParameter(MonitorService.ELAPSED, 0));
- } finally {
- monitor.destroy();
+ try {
+ monitor.collect(statistics);
+ int i = 0;
+ while (monitorService.getStatistics() == null && i < 200) {
+ i++;
+ Thread.sleep(10);
+ }
+ URL result = monitorService.getStatistics();
+ Assert.assertEquals(1, result.getParameter(MonitorService.SUCCESS, 0));
+ Assert.assertEquals(3, result.getParameter(MonitorService.ELAPSED, 0));
+ } finally {
+ monitor.destroy();
+ }
+ break;
}
+ Assert.assertNotNull(monitor);
} finally {
exporter.unexport();
}
diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml
index 11f331575af..3c8b4270696 100644
--- a/dubbo-monitor/pom.xml
+++ b/dubbo-monitor/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-monitor
pom
diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml
index da00055e992..5ead3bb55ad 100644
--- a/dubbo-registry/dubbo-registry-api/pom.xml
+++ b/dubbo-registry/dubbo-registry-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-registry
- 2.5.6
+ 2.5.7
dubbo-registry-api
jar
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
index f3979b28324..cb659e8f4b9 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -486,12 +486,13 @@ private Map>> toMethodInvokers(Map> i
invokersList.add(invoker);
}
}
- newMethodInvokerMap.put(Constants.ANY_VALUE, invokersList);
+ List> newInvokersList = route(invokersList, null);
+ newMethodInvokerMap.put(Constants.ANY_VALUE, newInvokersList);
if (serviceMethods != null && serviceMethods.length > 0) {
for (String method : serviceMethods) {
List> methodInvokers = newMethodInvokerMap.get(method);
if (methodInvokers == null || methodInvokers.size() == 0) {
- methodInvokers = invokersList;
+ methodInvokers = newInvokersList;
}
newMethodInvokerMap.put(method, route(methodInvokers, method));
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
index 0db690db189..1a73fb570ed 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
@@ -20,7 +20,6 @@
import com.alibaba.dubbo.common.extension.ExtensionLoader;
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
-import com.alibaba.dubbo.common.utils.NetUtils;
import com.alibaba.dubbo.common.utils.StringUtils;
import com.alibaba.dubbo.common.utils.UrlUtils;
import com.alibaba.dubbo.registry.NotifyListener;
@@ -37,6 +36,7 @@
import com.alibaba.dubbo.rpc.protocol.InvokerWrapper;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -210,7 +210,10 @@ private Registry getRegistry(final Invoker originInvoker) {
private URL getRegistedProviderUrl(final Invoker originInvoker) {
URL providerUrl = getProviderUrl(originInvoker);
//注册中心看到的地址
- final URL registedProviderUrl = providerUrl.removeParameters(getFilteredKeys(providerUrl)).removeParameter(Constants.MONITOR_KEY);
+ final URL registedProviderUrl = providerUrl.removeParameters(getFilteredKeys(providerUrl))
+ .removeParameter(Constants.MONITOR_KEY)
+ .removeParameter(Constants.BIND_IP_KEY)
+ .removeParameter(Constants.BIND_PORT_KEY);
return registedProviderUrl;
}
@@ -276,7 +279,9 @@ private Invoker doRefer(Cluster cluster, Registry registry, Class type
RegistryDirectory directory = new RegistryDirectory(type, url);
directory.setRegistry(registry);
directory.setProtocol(protocol);
- URL subscribeUrl = new URL(Constants.CONSUMER_PROTOCOL, NetUtils.getLocalHost(), 0, type.getName(), directory.getUrl().getParameters());
+ // REFER_KEY的所有属性
+ Map parameters = new HashMap(directory.getUrl().getParameters());
+ URL subscribeUrl = new URL(Constants.CONSUMER_PROTOCOL, parameters.remove(Constants.REGISTER_IP_KEY), 0, type.getName(), parameters);
if (!Constants.ANY_VALUE.equals(url.getServiceInterface())
&& url.getParameter(Constants.REGISTER_KEY, true)) {
registry.register(subscribeUrl.addParameters(Constants.CATEGORY_KEY, Constants.CONSUMERS_CATEGORY,
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java
index face7ca7e32..a347c411e7c 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java
@@ -83,7 +83,7 @@ public AbstractRegistry(URL url) {
setUrl(url);
// 启动文件保存定时器
syncSaveFile = url.getParameter(Constants.REGISTRY_FILESAVE_SYNC_KEY, false);
- String filename = url.getParameter(Constants.FILE_KEY, System.getProperty("user.home") + "/.dubbo/dubbo-registry-" + url.getHost() + ".cache");
+ String filename = url.getParameter(Constants.FILE_KEY, System.getProperty("user.home") + "/.dubbo/dubbo-registry-" + url.getParameter(Constants.APPLICATION_KEY) + "-" + url.getAddress() + ".cache");
File file = null;
if (ConfigUtils.isNotEmpty(filename)) {
file = new File(filename);
@@ -149,28 +149,8 @@ public void doSaveProperties(long version) {
if (file == null) {
return;
}
- Properties newProperties = new Properties();
- // 保存之前先读取一遍，防止多个注册中心之间冲突
- InputStream in = null;
- try {
- if (file.exists()) {
- in = new FileInputStream(file);
- newProperties.load(in);
- }
- } catch (Throwable e) {
- logger.warn("Failed to load registry store file, cause: " + e.getMessage(), e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- logger.warn(e.getMessage(), e);
- }
- }
- }
// 保存
try {
- newProperties.putAll(properties);
File lockfile = new File(file.getAbsolutePath() + ".lock");
if (!lockfile.exists()) {
lockfile.createNewFile();
@@ -190,7 +170,7 @@ public void doSaveProperties(long version) {
}
FileOutputStream outputFile = new FileOutputStream(file);
try {
- newProperties.store(outputFile, "Dubbo Registry Cache");
+ properties.store(outputFile, "Dubbo Registry Cache");
} finally {
outputFile.close();
}
diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml
index 5cf42f6afda..208314760f9 100644
--- a/dubbo-registry/dubbo-registry-default/pom.xml
+++ b/dubbo-registry/dubbo-registry-default/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-registry
- 2.5.6
+ 2.5.7
dubbo-registry-default
jar
diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java
index c538ef09f76..950d6d3d775 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java
+++ b/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java
@@ -56,10 +56,10 @@ public class RegistryDirectoryTest {
String service = DemoService.class.getName();
RpcInvocation invocation = new RpcInvocation();
URL noMeaningUrl = URL.valueOf("notsupport:/" + service + "?refer=" + URL.encode("interface=" + service));
- URL SERVICEURL = URL.valueOf("dubbo://127.0.0.1:9091/" + service + "?lazy=true");
- URL SERVICEURL2 = URL.valueOf("dubbo://127.0.0.1:9092/" + service + "?lazy=true");
- URL SERVICEURL3 = URL.valueOf("dubbo://127.0.0.1:9093/" + service + "?lazy=true");
- URL SERVICEURL_DUBBO_NOPATH = URL.valueOf("dubbo://127.0.0.1:9092" + "?lazy=true");
+ URL SERVICEURL = URL.valueOf("dubbo://127.0.0.1:9091/" + service + "?lazy=true&side=consumer");
+ URL SERVICEURL2 = URL.valueOf("dubbo://127.0.0.1:9092/" + service + "?lazy=true&side=consumer");
+ URL SERVICEURL3 = URL.valueOf("dubbo://127.0.0.1:9093/" + service + "?lazy=true&side=consumer");
+ URL SERVICEURL_DUBBO_NOPATH = URL.valueOf("dubbo://127.0.0.1:9092" + "?lazy=true&side=consumer");
@Before
public void setUp() {
@@ -694,8 +694,8 @@ public void testNofityOverrideUrls_Provider() {
invocation = new RpcInvocation();
List durls = new ArrayList();
- durls.add(SERVICEURL.setHost("10.20.30.140").addParameter("timeout", "1"));//一个一样，一个不一样
- durls.add(SERVICEURL2.setHost("10.20.30.141").addParameter("timeout", "2"));
+ durls.add(SERVICEURL.setHost("10.20.30.140").addParameter("timeout", "1").addParameter(Constants.SIDE_KEY, Constants.CONSUMER_SIDE));//一个一样，一个不一样
+ durls.add(SERVICEURL2.setHost("10.20.30.141").addParameter("timeout", "2").addParameter(Constants.SIDE_KEY, Constants.CONSUMER_SIDE));
registryDirectory.notify(durls);
durls = new ArrayList();
@@ -835,7 +835,7 @@ public void testNofityOverrideUrls_disabled_specifiedProvider() {
registryDirectory.notify(durls);
durls = new ArrayList();
- durls.add(URL.valueOf("override://10.20.30.140?" + Constants.DISABLED_KEY + "=true"));
+ durls.add(URL.valueOf("override://10.20.30.140:9091?" + Constants.DISABLED_KEY + "=true"));
registryDirectory.notify(durls);
List> invokers = registryDirectory.list(invocation);
@@ -901,7 +901,7 @@ public void testNofity_disabled_specifiedProvider() {
// 通过覆盖规则启用
durls = new ArrayList();
- durls.add(URL.valueOf("override://10.20.30.140?" + Constants.DISABLED_KEY + "=false"));
+ durls.add(URL.valueOf("override://10.20.30.140:9091?" + Constants.DISABLED_KEY + "=false"));
registryDirectory.notify(durls);
List> invokers2 = registryDirectory.list(invocation);
Assert.assertEquals(2, invokers2.size());
diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java
index f9670fd0504..45c9f670248 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java
+++ b/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java
@@ -53,7 +53,7 @@ public class RegistryProtocolTest {
}
final String service = "com.alibaba.dubbo.registry.protocol.DemoService:1.0.0";
- final String serviceUrl = "dubbo://127.0.0.1:9453/" + service + "?notify=true&methods=test1,test2";
+ final String serviceUrl = "dubbo://127.0.0.1:9453/" + service + "?notify=true&methods=test1,test2&side=con&side=consumer";
final URL registryUrl = URL.valueOf("registry://127.0.0.1:9090/");
final private Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml
index 702d0c83229..2174d5bcf82 100644
--- a/dubbo-registry/dubbo-registry-multicast/pom.xml
+++ b/dubbo-registry/dubbo-registry-multicast/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-registry
- 2.5.6
+ 2.5.7
dubbo-registry-multicast
jar
diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml
index 71dd24d3590..1ebd27dc646 100644
--- a/dubbo-registry/dubbo-registry-redis/pom.xml
+++ b/dubbo-registry/dubbo-registry-redis/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-registry
- 2.5.6
+ 2.5.7
dubbo-registry-redis
jar
diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml
index 383d53c340f..5ab4ebcd1ea 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml
+++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-registry
- 2.5.6
+ 2.5.7
dubbo-registry-zookeeper
jar
diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml
index 87a3ef2770e..2e4bbd2b25b 100644
--- a/dubbo-registry/pom.xml
+++ b/dubbo-registry/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-registry
pom
diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml
index 349f5f4c34e..36cd82c0110 100644
--- a/dubbo-remoting/dubbo-remoting-api/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-api
jar
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java
index 7ce8025f2fb..0d166f56e23 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java
@@ -52,10 +52,13 @@ public abstract class AbstractServer extends AbstractEndpoint implements Server
public AbstractServer(URL url, ChannelHandler handler) throws RemotingException {
super(url, handler);
localAddress = getUrl().toInetSocketAddress();
- String host = url.getParameter(Constants.ANYHOST_KEY, false)
- || NetUtils.isInvalidLocalHost(getUrl().getHost())
- ? NetUtils.ANYHOST : getUrl().getHost();
- bindAddress = new InetSocketAddress(host, getUrl().getPort());
+
+ String bindIp = getUrl().getParameter(Constants.BIND_IP_KEY, getUrl().getHost());
+ int bindPort = getUrl().getParameter(Constants.BIND_PORT_KEY, getUrl().getPort());
+ if (url.getParameter(Constants.ANYHOST_KEY, false) || NetUtils.isInvalidLocalHost(bindIp)) {
+ bindIp = NetUtils.ANYHOST;
+ }
+ bindAddress = new InetSocketAddress(bindIp, bindPort);
this.accepts = url.getParameter(Constants.ACCEPTS_KEY, Constants.DEFAULT_ACCEPTS);
this.idleTimeout = url.getParameter(Constants.IDLE_TIMEOUT_KEY, Constants.DEFAULT_IDLE_TIMEOUT);
try {
diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml
index f1746666811..dc97041b9ca 100644
--- a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-grizzly
jar
diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml
index ee6194c5e78..a50faa330d6 100644
--- a/dubbo-remoting/dubbo-remoting-http/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-http/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-http
jar
diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java
index 56e7f45fb03..fc478ce4fbd 100644
--- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java
+++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java
@@ -38,7 +38,7 @@ public class JettyHttpServer extends AbstractHttpServer {
public JettyHttpServer(URL url, final HttpHandler handler) {
super(url, handler);
- DispatcherServlet.addHttpHandler(url.getPort(), handler);
+ DispatcherServlet.addHttpHandler(url.getParameter(Constants.BIND_PORT_KEY, url.getPort()), handler);
int threads = url.getParameter(Constants.THREADS_KEY, Constants.DEFAULT_THREADS);
QueuedThreadPool threadPool = new QueuedThreadPool();
@@ -47,10 +47,12 @@ public JettyHttpServer(URL url, final HttpHandler handler) {
threadPool.setMinThreads(threads);
SelectChannelConnector connector = new SelectChannelConnector();
- if (!url.isAnyHost() && NetUtils.isValidLocalHost(url.getHost())) {
- connector.setHost(url.getHost());
+
+ String bindIp = url.getParameter(Constants.BIND_IP_KEY, url.getHost());
+ if (!url.isAnyHost() && NetUtils.isValidLocalHost(bindIp)) {
+ connector.setHost(bindIp);
}
- connector.setPort(url.getPort());
+ connector.setPort(url.getParameter(Constants.BIND_PORT_KEY, url.getPort()));
server = new Server();
server.setThreadPool(threadPool);
@@ -65,7 +67,7 @@ public JettyHttpServer(URL url, final HttpHandler handler) {
try {
server.start();
} catch (Exception e) {
- throw new IllegalStateException("Failed to start jetty server on " + url.getAddress() + ", cause: "
+ throw new IllegalStateException("Failed to start jetty server on " + url.getParameter(Constants.BIND_IP_KEY) + ":" + url.getParameter(Constants.BIND_PORT_KEY) + ", cause: "
+ e.getMessage(), e);
}
}
diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java
index 9f27354e232..c75cc1b50d7 100644
--- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java
+++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java
@@ -15,6 +15,7 @@
*/
package com.alibaba.dubbo.remoting.http.servlet;
+import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.remoting.http.HttpHandler;
import com.alibaba.dubbo.remoting.http.support.AbstractHttpServer;
@@ -23,7 +24,7 @@ public class ServletHttpServer extends AbstractHttpServer {
public ServletHttpServer(URL url, HttpHandler handler) {
super(url, handler);
- DispatcherServlet.addHttpHandler(url.getPort(), handler);
+ DispatcherServlet.addHttpHandler(url.getParameter(Constants.BIND_PORT_KEY, 8080), handler);
}
}
\ No newline at end of file
diff --git a/dubbo-remoting/dubbo-remoting-mina/pom.xml b/dubbo-remoting/dubbo-remoting-mina/pom.xml
index ae2b129b1af..89e353baffc 100644
--- a/dubbo-remoting/dubbo-remoting-mina/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-mina/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-mina
jar
diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml
index 6f7418158df..b56696a8f00 100644
--- a/dubbo-remoting/dubbo-remoting-netty/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-netty
jar
diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java
index 3b882a80294..fd322c3121b 100644
--- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java
+++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java
@@ -28,6 +28,7 @@
import org.apache.log4j.Level;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -40,6 +41,11 @@ public static void main(String[] args) {
System.out.println(3 % 1);
}
+ @Before
+ public void clear() {
+ DubboAppender.clear();
+ }
+
@Test
public void testReconnect() throws RemotingException, InterruptedException {
{
@@ -90,9 +96,9 @@ public void testReconnectWarnLog() throws RemotingException, InterruptedExceptio
DubboAppender.doStop();
}
- /**
+ /* *//**
* 重连日志的校验，不能一直抛出error日志.
- */
+ *//*
@Test
public void testReconnectErrorLog() throws RemotingException, InterruptedException {
int port = NetUtils.getAvailablePort();
@@ -110,9 +116,9 @@ public void testReconnectErrorLog() throws RemotingException, InterruptedExcepti
DubboAppender.doStop();
}
- /**
+ *//**
* 测试client重连方法不会导致重连线程失效.
- */
+ *//*
@Test
public void testClientReconnectMethod() throws RemotingException, InterruptedException {
int port = NetUtils.getAvailablePort();
@@ -131,9 +137,9 @@ public void testClientReconnectMethod() throws RemotingException, InterruptedExc
DubboAppender.doStop();
}
- /**
+ *//**
* 重连日志的校验
- */
+ *//*
@Test
public void testReconnectWaringLog() throws RemotingException, InterruptedException {
int port = NetUtils.getAvailablePort();
@@ -157,7 +163,7 @@ public void testReconnectWaringLog() throws RemotingException, InterruptedExcept
}
Assert.assertTrue("warning message count must >= 1, real :" + count, count >= 1);
DubboAppender.doStop();
- }
+ }*/
public Client startClient(int port, int reconnectPeriod) throws RemotingException {
final String url = "exchange://127.0.0.1:" + port + "/client.reconnect.test?check=false&" + Constants.RECONNECT_KEY + "=" + reconnectPeriod;
diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml
index dfd51f13862..89220456b90 100644
--- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml
@@ -3,7 +3,7 @@
dubbo-remoting
com.alibaba
- 2.5.6
+ 2.5.7
4.0.0
diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml
index cf21d10d623..3e3199db92d 100644
--- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-p2p
jar
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index d93699a98e6..6ca92a54801 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-remoting
- 2.5.6
+ 2.5.7
dubbo-remoting-zookeeper
jar
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java
index 4f20ae76b17..f211a3e02a3 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java
@@ -27,7 +27,7 @@ public CuratorZookeeperClient(URL url) {
try {
CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
.connectString(url.getBackupAddress())
- .retryPolicy(new RetryNTimes(Integer.MAX_VALUE, 1000))
+ .retryPolicy(new RetryNTimes(1, 1000))
.connectionTimeoutMs(5000);
String authority = url.getAuthority();
if (authority != null && authority.length() > 0) {
@@ -88,6 +88,15 @@ public List getChildren(String path) {
}
}
+ public boolean checkExists(String path) {
+ try {
+ if (client.checkExists().forPath(path) != null) {
+ return true;
+ }
+ } catch (Exception e) {
+ }
+ return false;
+ }
public boolean isConnected() {
return client.getZookeeperClient().isConnected();
}
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java
index 8b89efb1891..f9ff9639dd4 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java
@@ -36,7 +36,10 @@ public URL getUrl() {
public void create(String path, boolean ephemeral) {
int i = path.lastIndexOf('/');
if (i > 0) {
- create(path.substring(0, i), false);
+ String parentPath = path.substring(0, i);
+ if (!checkExists(parentPath)) {
+ create(parentPath, false);
+ }
}
if (ephemeral) {
createEphemeral(path);
@@ -105,6 +108,8 @@ public void close() {
protected abstract void createEphemeral(String path);
+ protected abstract boolean checkExists(String path);
+
protected abstract TargetChildListener createTargetChildListener(String path, ChildListener listener);
protected abstract List addTargetChildListener(String path, TargetChildListener listener);
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java
new file mode 100644
index 00000000000..318443ae53c
--- /dev/null
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java
@@ -0,0 +1,122 @@
+package com.alibaba.dubbo.remoting.zookeeper.zkclient;
+
+import com.alibaba.dubbo.common.concurrent.ListenableFutureTask;
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.common.logger.LoggerFactory;
+import com.alibaba.dubbo.common.utils.Assert;
+
+import org.I0Itec.zkclient.IZkChildListener;
+import org.I0Itec.zkclient.IZkStateListener;
+import org.I0Itec.zkclient.ZkClient;
+import org.apache.zookeeper.Watcher.Event.KeeperState;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 连接超时后，能自动监听连接状态的zkclient包装类
+ * 也为和curator在使用上总体保持一致
+ * @author ken.lj
+ * @date 2017/10/29
+ */
+public class ZkClientWrapper {
+ Logger logger = LoggerFactory.getLogger(ZkClientWrapper.class);
+
+ private long timeout;
+ private ZkClient client;
+ private volatile KeeperState state;
+ private ListenableFutureTask listenableFutureTask;
+ private volatile boolean started = false;
+
+
+ public ZkClientWrapper(final String serverAddr, long timeout) {
+ this.timeout = timeout;
+ listenableFutureTask = ListenableFutureTask.create(new Callable() {
+ @Override
+ public ZkClient call() throws Exception {
+ return new ZkClient(serverAddr, Integer.MAX_VALUE);
+ }
+ });
+ }
+
+ public void start() {
+ if (!started) {
+ Thread connectThread = new Thread(listenableFutureTask);
+ connectThread.setName("DubboZkclientConnector");
+ connectThread.setDaemon(true);
+ connectThread.start();
+ try {
+ client = listenableFutureTask.get(timeout, TimeUnit.MILLISECONDS);
+ } catch (Throwable t) {
+ logger.error("Timeout! zookeeper server can not be connected in : " + timeout + "ms!", t);
+ }
+ started = true;
+ } else {
+ logger.warn("Zkclient has already been started!");
+ }
+ }
+
+ public void addListener(final IZkStateListener listener) {
+ listenableFutureTask.addListener(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ client = listenableFutureTask.get();
+ client.subscribeStateChanges(listener);
+ } catch (InterruptedException e) {
+ logger.warn(Thread.currentThread().getName() + " was interrupted unexpectedly, which may cause unpredictable exception!");
+ } catch (ExecutionException e) {
+ logger.error("Got an exception when trying to create zkclient instance, can not connect to zookeeper server, please check!", e);
+ }
+ }
+ });
+ }
+
+ public boolean isConnected() {
+ return client != null && state == KeeperState.SyncConnected;
+ }
+
+ public void createPersistent(String path) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ client.createPersistent(path, true);
+ }
+
+ public void createEphemeral(String path) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ client.createEphemeral(path);
+ }
+
+ public void delete(String path) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ client.delete(path);
+ }
+
+ public List getChildren(String path) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ return client.getChildren(path);
+ }
+
+ public boolean exists(String path) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ return client.exists(path);
+ }
+
+ public void close() {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ client.close();
+ }
+
+ public List subscribeChildChanges(String path, final IZkChildListener listener) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ return client.subscribeChildChanges(path, listener);
+ }
+
+ public void unsubscribeChildChanges(String path, IZkChildListener listener) {
+ Assert.notNull(client, new IllegalStateException("Zookeeper is not connected yet!"));
+ client.unsubscribeChildChanges(path, listener);
+ }
+
+
+}
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java
index 8109b753f66..498f43158b9 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java
@@ -7,7 +7,6 @@
import org.I0Itec.zkclient.IZkChildListener;
import org.I0Itec.zkclient.IZkStateListener;
-import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.exception.ZkNoNodeException;
import org.I0Itec.zkclient.exception.ZkNodeExistsException;
import org.apache.zookeeper.Watcher.Event.KeeperState;
@@ -16,14 +15,14 @@
public class ZkclientZookeeperClient extends AbstractZookeeperClient {
- private final ZkClient client;
+ private final ZkClientWrapper client;
private volatile KeeperState state = KeeperState.SyncConnected;
public ZkclientZookeeperClient(URL url) {
super(url);
- client = new ZkClient(url.getBackupAddress());
- client.subscribeStateChanges(new IZkStateListener() {
+ client = new ZkClientWrapper(url.getBackupAddress(), 30000);
+ client.addListener(new IZkStateListener() {
public void handleStateChanged(KeeperState state) throws Exception {
ZkclientZookeeperClient.this.state = state;
if (state == KeeperState.Disconnected) {
@@ -37,11 +36,13 @@ public void handleNewSession() throws Exception {
stateChanged(StateListener.RECONNECTED);
}
});
+ client.start();
}
+
public void createPersistent(String path) {
try {
- client.createPersistent(path, true);
+ client.createPersistent(path);
} catch (ZkNodeExistsException e) {
}
}
@@ -68,6 +69,14 @@ public List getChildren(String path) {
}
}
+ public boolean checkExists(String path) {
+ try {
+ return client.exists(path);
+ } catch (Throwable t) {
+ }
+ return false;
+ }
+
public boolean isConnected() {
return state == KeeperState.SyncConnected;
}
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java
new file mode 100644
index 00000000000..159c57a24fc
--- /dev/null
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java
@@ -0,0 +1,48 @@
+package com.alibaba.dubbo.remoting.zookeeper.curator;
+
+import com.alibaba.dubbo.common.URL;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author ken.lj
+ * @date 2017/10/16
+ */
+@Ignore
+public class CuratorZookeeperClientTest {
+
+ @Test
+ public void testCheckExists() {
+ CuratorZookeeperClient curatorClient = new CuratorZookeeperClient(URL.valueOf("zookeeper://127.0.0.1:2181/com.alibaba.dubbo.registry.RegistryService"));
+ String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers";
+ curatorClient.create(path, false);
+ Assert.assertTrue(curatorClient.checkExists(path));
+ Assert.assertFalse(curatorClient.checkExists(path + "/noneexits"));
+ }
+
+ /**
+ * create checkExists 性能測試
+ */
+ @Test
+ public void testCreate() {
+ CuratorZookeeperClient curatorClient = new CuratorZookeeperClient(URL.valueOf("zookeeper://127.0.0.1:2181/com.alibaba.dubbo.registry.RegistryService"));
+ String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers";
+ curatorClient.create(path, false);
+
+ // 重复create 100次，耗时
+ long startTime = System.nanoTime();
+ for (int i = 0; i < 100; i++) {
+ curatorClient.create(path, true);
+ }
+ System.out.println("create cost: " + (System.nanoTime() - startTime) / 1000 / 1000);
+
+ // 判断100次，耗时
+ startTime = System.nanoTime();
+ for (int i = 0; i < 100; i++) {
+ curatorClient.checkExists(path);
+ }
+ System.out.println("judge cost: " + (System.nanoTime() - startTime) / 1000 / 1000);
+ }
+}
diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml
index 6cf1edfba23..8a691dcee65 100644
--- a/dubbo-remoting/pom.xml
+++ b/dubbo-remoting/pom.xml
@@ -20,7 +20,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-remoting
pom
diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml
index e756c84a316..0d123a56c1b 100644
--- a/dubbo-rpc/dubbo-rpc-api/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-api/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-api
jar
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java
index 66fc366e7cd..932633e58f5 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java
@@ -17,7 +17,7 @@
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.common.json.JSON;
+import com.alibaba.fastjson.JSON;
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import com.alibaba.dubbo.common.utils.ConcurrentHashSet;
@@ -139,7 +139,7 @@ public Result invoke(Invoker invoker, Invocation inv) throws RpcException {
sn.append(") ");
Object[] args = inv.getArguments();
if (args != null && args.length > 0) {
- sn.append(JSON.json(args));
+ sn.append(JSON.toJSONString(args));
}
String msg = sn.toString();
if (ConfigUtils.isDefault(accesslog)) {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java
index d9b850920c4..e27c2b1a798 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java
@@ -76,7 +76,7 @@ public Result invoke(Invocation invocation) throws RpcException {
@Override
public String toString() {
- return getInterface() + " -> " + getUrl() == null ? " " : getUrl().toString();
+ return getInterface() + " -> " + (getUrl() == null ? " " : getUrl().toString());
}
public void destroy() {
@@ -97,4 +97,4 @@ public void destroy() {
}
}
-}
\ No newline at end of file
+}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java
index 12e4a214539..a088768c83e 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java
@@ -16,7 +16,9 @@
package com.alibaba.dubbo.rpc.protocol;
+import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.utils.NetUtils;
import com.alibaba.dubbo.rpc.Exporter;
import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
@@ -35,7 +37,6 @@
public abstract class AbstractProxyProtocol extends AbstractProtocol {
private final List> rpcExceptions = new CopyOnWriteArrayList>();
- ;
private ProxyFactory proxyFactory;
@@ -122,6 +123,14 @@ protected RpcException getRpcException(Class type, URL url, Invocation invoca
return re;
}
+ protected String getAddr(URL url) {
+ String bindIp = url.getParameter(Constants.BIND_IP_KEY, url.getHost());
+ if (url.getParameter(Constants.ANYHOST_KEY, false)) {
+ bindIp = Constants.ANYHOST_VALUE;
+ }
+ return NetUtils.getIpByHost(bindIp) + ":" + url.getParameter(Constants.BIND_PORT_KEY, url.getPort());
+ }
+
protected int getErrorCode(Throwable e) {
return RpcException.UNKNOWN_EXCEPTION;
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java
index f41d7a4b9bb..9369fbeb2cf 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java
@@ -81,8 +81,8 @@ public Result invoke(Invocation invocation) throws RpcException {
@Override
public String toString() {
- return getInterface() + " -> " + getUrl() == null ? " " : getUrl().toString();
+ return getInterface() + " -> " + (getUrl() == null ? " " : getUrl().toString());
}
-}
\ No newline at end of file
+}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
index d15fd5d3ee6..579b0f85f6f 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
@@ -72,7 +72,7 @@ public T getProxy(Invoker invoker) throws RpcException {
try {
Class stubClass = ReflectUtils.forName(stub);
if (!serviceType.isAssignableFrom(stubClass)) {
- throw new IllegalStateException("The stub implemention class " + stubClass.getName() + " not implement interface " + serviceType.getName());
+ throw new IllegalStateException("The stub implementation class " + stubClass.getName() + " not implement interface " + serviceType.getName());
}
try {
Constructor constructor = ReflectUtils.findConstructor(stubClass, serviceType);
@@ -89,10 +89,10 @@ public T getProxy(Invoker invoker) throws RpcException {
}
}
} catch (NoSuchMethodException e) {
- throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implemention class " + stubClass.getName(), e);
+ throw new IllegalStateException("No such constructor \"public " + stubClass.getSimpleName() + "(" + serviceType.getName() + ")\" in stub implementation class " + stubClass.getName(), e);
}
} catch (Throwable t) {
- LOGGER.error("Failed to create stub implemention class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);
+ LOGGER.error("Failed to create stub implementation class " + stub + " in consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", cause: " + t.getMessage(), t);
// ignore
}
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java
index e1be31fce22..67a97461a0e 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java
@@ -18,7 +18,6 @@
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.common.extension.ExtensionLoader;
-import com.alibaba.dubbo.common.json.JSON;
import com.alibaba.dubbo.common.utils.ConfigUtils;
import com.alibaba.dubbo.common.utils.PojoUtils;
import com.alibaba.dubbo.common.utils.ReflectUtils;
@@ -30,6 +29,7 @@
import com.alibaba.dubbo.rpc.RpcException;
import com.alibaba.dubbo.rpc.RpcInvocation;
import com.alibaba.dubbo.rpc.RpcResult;
+import com.alibaba.fastjson.JSON;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
@@ -74,9 +74,9 @@ public static Object parseMockValue(String mock, Type[] returnTypes) throws Exce
} else if (StringUtils.isNumeric(mock)) {
value = JSON.parse(mock);
} else if (mock.startsWith("{")) {
- value = JSON.parse(mock, Map.class);
+ value = JSON.parseObject(mock, Map.class);
} else if (mock.startsWith("[")) {
- value = JSON.parse(mock, List.class);
+ value = JSON.parseObject(mock, List.class);
} else {
value = mock;
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java
index e2023427ecd..1261b628d3e 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java
@@ -20,11 +20,14 @@
import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.support.BlockMyInvoker;
import com.alibaba.dubbo.rpc.support.MockInvocation;
import com.alibaba.dubbo.rpc.support.MyInvoker;
import org.junit.Test;
+import java.util.concurrent.CountDownLatch;
+
import static org.junit.Assert.assertNotSame;
/**
@@ -56,12 +59,18 @@ public void testInvokeLessActives() {
@Test
public void testInvokeGreaterActives() {
URL url = URL.valueOf("test://test:11/test?accesslog=true&group=dubbo&version=1.1&actives=1&timeout=1");
- final Invoker invoker = new MyInvoker(url);
+ final Invoker invoker = new BlockMyInvoker(url, 100);
final Invocation invocation = new MockInvocation();
+ final CountDownLatch latch = new CountDownLatch(1);
for (int i = 0; i < 100; i++) {
Thread thread = new Thread(new Runnable() {
public void run() {
+ try {
+ latch.await();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
for (int i = 0; i < 100; i++) {
try {
activeLimitFilter.invoke(invoker, invocation);
@@ -73,6 +82,8 @@ public void run() {
});
thread.start();
}
+ latch.countDown();
+
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java
new file mode 100644
index 00000000000..cfe19e10929
--- /dev/null
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java
@@ -0,0 +1,51 @@
+package com.alibaba.dubbo.rpc.support;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.rpc.Invocation;
+import com.alibaba.dubbo.rpc.Result;
+import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.RpcResult;
+
+/**
+ * @author ken.lj
+ * @date 2017/10/24
+ */
+public class BlockMyInvoker extends MyInvoker {
+
+ private long blockTime = 100;
+
+ public BlockMyInvoker(URL url, long blockTime) {
+ super(url);
+ this.blockTime = blockTime;
+ }
+
+ public BlockMyInvoker(URL url, boolean hasException, long blockTime) {
+ super(url, hasException);
+ this.blockTime = blockTime;
+ }
+
+ @Override
+ public Result invoke(Invocation invocation) throws RpcException {
+ RpcResult result = new RpcResult();
+ if (hasException == false) {
+ try {
+ Thread.sleep(blockTime);
+ } catch (InterruptedException e) {
+ }
+ result.setValue("alibaba");
+ return result;
+ } else {
+ result.setException(new RuntimeException("mocked exception"));
+ return result;
+ }
+
+ }
+
+ public long getBlockTime() {
+ return blockTime;
+ }
+
+ public void setBlockTime(long blockTime) {
+ this.blockTime = blockTime;
+ }
+}
diff --git a/dubbo-rpc/dubbo-rpc-default/pom.xml b/dubbo-rpc/dubbo-rpc-default/pom.xml
index 7b50f6ca3a0..3f08a2f2534 100644
--- a/dubbo-rpc/dubbo-rpc-default/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-default/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-default
jar
diff --git a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
index c673c5167ad..00266064154 100644
--- a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
@@ -59,8 +59,6 @@ public class DubboProtocol extends AbstractProtocol {
public static final String NAME = "dubbo";
- public static final String COMPATIBLE_CODEC_NAME = "dubbo1compatible";
-
public static final int DEFAULT_PORT = 20880;
private static final String IS_CALLBACK_SERVICE_INVOKE = "_isCallBackServiceInvoke";
private static DubboProtocol INSTANCE;
@@ -271,7 +269,7 @@ private ExchangeServer createServer(URL url) {
if (str != null && str.length() > 0 && !ExtensionLoader.getExtensionLoader(Transporter.class).hasExtension(str))
throw new RpcException("Unsupported server type: " + str + ", url: " + url);
- url = url.addParameter(Constants.CODEC_KEY, Version.isCompatibleVersion() ? COMPATIBLE_CODEC_NAME : DubboCodec.NAME);
+ url = url.addParameter(Constants.CODEC_KEY, DubboCodec.NAME);
ExchangeServer server;
try {
server = Exchangers.bind(url, requestHandler);
@@ -349,7 +347,7 @@ private ExchangeClient initClient(URL url) {
String version = url.getParameter(Constants.DUBBO_VERSION_KEY);
boolean compatible = (version != null && version.startsWith("1.0."));
- url = url.addParameter(Constants.CODEC_KEY, Version.isCompatibleVersion() && compatible ? COMPATIBLE_CODEC_NAME : DubboCodec.NAME);
+ url = url.addParameter(Constants.CODEC_KEY, DubboCodec.NAME);
//默认开启heartbeat
url = url.addParameterIfAbsent(Constants.HEARTBEAT_KEY, String.valueOf(Constants.DEFAULT_HEARTBEAT));
diff --git a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java
index 30f1eb6ff5f..17484cad3b9 100644
--- a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java
+++ b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java
@@ -17,7 +17,7 @@
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.common.json.JSON;
+import com.alibaba.fastjson.JSON;
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
import com.alibaba.dubbo.common.utils.ConcurrentHashSet;
@@ -105,7 +105,7 @@ public Result invoke(Invoker invoker, Invocation invocation) throws RpcExcept
channel.send("\r\n" + RpcContext.getContext().getRemoteAddress() + " -> "
+ invoker.getInterface().getName()
+ "." + invocation.getMethodName()
- + "(" + JSON.json(invocation.getArguments()) + ")" + " -> " + JSON.json(result.getValue())
+ + "(" + JSON.toJSONString(invocation.getArguments()) + ")" + " -> " + JSON.toJSONString(result.getValue())
+ "\r\nelapsed: " + (end - start) + " ms."
+ "\r\n\r\n" + prompt);
}
diff --git a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
index 50a6c763470..a8d0e237acb 100644
--- a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
+++ b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
@@ -16,7 +16,6 @@
package com.alibaba.dubbo.rpc.protocol.dubbo.telnet;
import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.common.json.JSON;
import com.alibaba.dubbo.common.utils.PojoUtils;
import com.alibaba.dubbo.common.utils.ReflectUtils;
import com.alibaba.dubbo.common.utils.StringUtils;
@@ -28,6 +27,7 @@
import com.alibaba.dubbo.rpc.RpcContext;
import com.alibaba.dubbo.rpc.RpcInvocation;
import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol;
+import com.alibaba.fastjson.JSON;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -110,7 +110,7 @@ public String telnet(Channel channel, String message) {
}
List list;
try {
- list = (List) JSON.parse("[" + args + "]", List.class);
+ list = JSON.parseArray("[" + args + "]", Object.class);
} catch (Throwable t) {
return "Invalid json argument, cause: " + t.getMessage();
}
@@ -141,7 +141,7 @@ public String telnet(Channel channel, String message) {
long start = System.currentTimeMillis();
Object result = invoker.invoke(new RpcInvocation(invokeMethod, array)).recreate();
long end = System.currentTimeMillis();
- buf.append(JSON.json(result));
+ buf.append(JSON.toJSONString(result));
buf.append("\r\nelapsed: ");
buf.append(end - start);
buf.append(" ms.");
diff --git a/dubbo-rpc/dubbo-rpc-default/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-default/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java
index 4e7d5b006a8..ca292710a97 100644
--- a/dubbo-rpc/dubbo-rpc-default/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java
+++ b/dubbo-rpc/dubbo-rpc-default/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java
@@ -59,6 +59,11 @@ public void after() {
ProtocolUtils.closeAll();
}
+ /**
+ * NAT网络场景，server channel.getRemoteAddress()可能拿到的是网关或NAT转换后的地址
+ * 只判断端口
+ * @throws Exception
+ */
@Test
public void testListClient() throws Exception {
ExchangeClient client1 = Exchangers.connect("dubbo://127.0.0.1:20887/demo");
@@ -70,8 +75,8 @@ public void testListClient() throws Exception {
System.out.printf("Result: %s %n", result);
System.out.printf("Client 1 Address %s %n", client1Addr);
System.out.printf("Client 2 Address %s %n", client2Addr);
- assertTrue(result.contains(client1Addr));
- assertTrue(result.contains(client2Addr));
+ assertTrue(result.contains(String.valueOf(client1.getLocalAddress().getPort())));
+ assertTrue(result.contains(String.valueOf(client2.getLocalAddress().getPort())));
}
diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-rpc/dubbo-rpc-hessian/pom.xml
index 271b82c15b1..961e2f223dc 100644
--- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-hessian
jar
diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java
index bb0c5e6437d..33292631fbf 100644
--- a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java
@@ -65,7 +65,7 @@ public int getDefaultPort() {
}
protected Runnable doExport(T impl, Class type, URL url) throws RpcException {
- String addr = url.getIp() + ":" + url.getPort();
+ String addr = getAddr(url);
HttpServer server = serverMap.get(addr);
if (server == null) {
server = httpBinder.bind(url, new HessianHandler());
diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml
index 725cc7b0a55..d0816ac0fc7 100644
--- a/dubbo-rpc/dubbo-rpc-http/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-http/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-http
jar
diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java b/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java
index a7cfa2a373a..f06bf676427 100644
--- a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java
@@ -67,7 +67,7 @@ public int getDefaultPort() {
}
protected Runnable doExport(final T impl, Class type, URL url) throws RpcException {
- String addr = url.getIp() + ":" + url.getPort();
+ String addr = getAddr(url);
HttpServer server = serverMap.get(addr);
if (server == null) {
server = httpBinder.bind(url, new InternalHandler());
diff --git a/dubbo-rpc/dubbo-rpc-injvm/pom.xml b/dubbo-rpc/dubbo-rpc-injvm/pom.xml
index 24d841ec214..1741572f886 100644
--- a/dubbo-rpc/dubbo-rpc-injvm/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-injvm/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-injvm
jar
diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml
index 07c1aa4980b..36ff3f2a5d2 100644
--- a/dubbo-rpc/dubbo-rpc-memcached/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-memcached/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-memcached
jar
diff --git a/dubbo-rpc/dubbo-rpc-redis/pom.xml b/dubbo-rpc/dubbo-rpc-redis/pom.xml
index 69bb655768f..88a86a3347c 100644
--- a/dubbo-rpc/dubbo-rpc-redis/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-redis/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-redis
jar
diff --git a/dubbo-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-rpc/dubbo-rpc-rmi/pom.xml
index d0a9911e2ff..ce49751c0c7 100644
--- a/dubbo-rpc/dubbo-rpc-rmi/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-rmi/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-rmi
jar
diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java
index 171b8069867..f79d7e860e3 100644
--- a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java
@@ -18,10 +18,12 @@
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.rpc.RpcException;
import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol;
-
+import org.aopalliance.intercept.MethodInvocation;
import org.springframework.remoting.RemoteAccessException;
import org.springframework.remoting.rmi.RmiProxyFactoryBean;
import org.springframework.remoting.rmi.RmiServiceExporter;
+import org.springframework.remoting.support.RemoteInvocation;
+import org.springframework.remoting.support.RemoteInvocationFactory;
import java.io.IOException;
import java.net.SocketTimeoutException;
@@ -69,6 +71,12 @@ public void run() {
@SuppressWarnings("unchecked")
protected T doRefer(final Class serviceType, final URL url) throws RpcException {
final RmiProxyFactoryBean rmiProxyFactoryBean = new RmiProxyFactoryBean();
+ //RMI传输时使用自定义的远程执行对象，从而传递额外的参数
+ rmiProxyFactoryBean.setRemoteInvocationFactory(new RemoteInvocationFactory() {
+ public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
+ return new RmiRemoteInvocation(methodInvocation);
+ }
+ });
rmiProxyFactoryBean.setServiceUrl(url.toIdentityString());
rmiProxyFactoryBean.setServiceInterface(serviceType);
rmiProxyFactoryBean.setCacheStub(true);
diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java
new file mode 100644
index 00000000000..1f1097f36f3
--- /dev/null
+++ b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed 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 com.alibaba.dubbo.rpc.protocol.rmi;
+
+import com.alibaba.dubbo.rpc.RpcContext;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.support.RemoteInvocation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author 杨浩
+ */
+public class RmiRemoteInvocation extends RemoteInvocation {
+ private static final long serialVersionUID = 1L;
+ private static final String dubboAttachmentsAttrName = "dubbo.attachments";
+
+ /**
+ * 构造将在消费端执行
+ */
+ public RmiRemoteInvocation(MethodInvocation methodInvocation) {
+ super(methodInvocation);
+ addAttribute(dubboAttachmentsAttrName, new HashMap(RpcContext.getContext().getAttachments()));
+ }
+
+ /**
+ * 服务端执行时，重新放入上下文（虽然这时上下文在ContextFilter执行时将被Invocation的attachments覆盖，我们在Invocation构造时还原attachments, see InvokerInvocationHandler）
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object invoke(Object targetObject) throws NoSuchMethodException, IllegalAccessException,
+ InvocationTargetException {
+ RpcContext context = RpcContext.getContext();
+ context.setAttachments((Map) getAttribute(dubboAttachmentsAttrName));
+ try {
+ return super.invoke(targetObject);
+ } finally {
+ context.setAttachments(null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml
index 900b9bf2ea5..d2f41c55704 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-thrift
jar
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java
index 67c3162ec9a..a7bc3918c67 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java
@@ -35,6 +35,7 @@
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.ByteArrayInputStream;
@@ -42,6 +43,7 @@
/**
* @author gang.lvg
*/
+@Ignore
public class ThriftCodecTest {
private ThriftCodec codec = new ThriftCodec();
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
index 7916f32b64b..4fbac227d4a 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
@@ -19,7 +19,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
/**
* @author kimi
@@ -61,11 +60,11 @@ public void tearDown() throws Exception {
}
}
-
+/*
@Test
public void testRefer() throws Exception {
// FIXME
- /*invoker = protocol.refer( Demo.class, url );
+ *//*invoker = protocol.refer( Demo.class, url );
Assert.assertNotNull( invoker );
@@ -81,8 +80,8 @@ public void testRefer() throws Exception {
Result result = invoker.invoke( invocation );
- Assert.assertEquals( arg, result.getResult() );*/
+ Assert.assertEquals( arg, result.getResult() );*//*
- }
+ }*/
}
diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-rpc/dubbo-rpc-webservice/pom.xml
index ea8c0e184ac..610e48228e7 100644
--- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-rpc
- 2.5.6
+ 2.5.7
dubbo-rpc-webservice
jar
diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
index e9ad4692073..2900307c6b2 100644
--- a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java
@@ -78,7 +78,7 @@ public int getDefaultPort() {
}
protected Runnable doExport(T impl, Class type, URL url) throws RpcException {
- String addr = url.getIp() + ":" + url.getPort();
+ String addr = getAddr(url);
HttpServer httpServer = serverMap.get(addr);
if (httpServer == null) {
httpServer = httpBinder.bind(url, new WebServiceHandler());
diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml
index 7eb9deb1764..87bbc808bb9 100644
--- a/dubbo-rpc/pom.xml
+++ b/dubbo-rpc/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-rpc
pom
diff --git a/dubbo-simple/dubbo-monitor-simple/pom.xml b/dubbo-simple/dubbo-monitor-simple/pom.xml
index ffd65553be4..d120bad6535 100644
--- a/dubbo-simple/dubbo-monitor-simple/pom.xml
+++ b/dubbo-simple/dubbo-monitor-simple/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-simple
- 2.5.6
+ 2.5.7
dubbo-monitor-simple
jar
diff --git a/dubbo-simple/dubbo-registry-simple/pom.xml b/dubbo-simple/dubbo-registry-simple/pom.xml
index dace74e6f74..a286ea3099d 100644
--- a/dubbo-simple/dubbo-registry-simple/pom.xml
+++ b/dubbo-simple/dubbo-registry-simple/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-simple
- 2.5.6
+ 2.5.7
dubbo-registry-simple
jar
diff --git a/dubbo-simple/pom.xml b/dubbo-simple/pom.xml
index 16f3dfbce93..16789ee0638 100644
--- a/dubbo-simple/pom.xml
+++ b/dubbo-simple/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-simple
pom
diff --git a/dubbo-test/dubbo-test-benchmark/pom.xml b/dubbo-test/dubbo-test-benchmark/pom.xml
index da39bee6b4b..10fbd629bf4 100644
--- a/dubbo-test/dubbo-test-benchmark/pom.xml
+++ b/dubbo-test/dubbo-test-benchmark/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-test
- 2.5.6
+ 2.5.7
dubbo-test-benchmark
jar
diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml
index 0a95b425d46..1532c2330d8 100644
--- a/dubbo-test/dubbo-test-compatibility/pom.xml
+++ b/dubbo-test/dubbo-test-compatibility/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-test
- 2.5.6
+ 2.5.7
dubbo-test-compatibility
jar
diff --git a/dubbo-test/dubbo-test-examples/pom.xml b/dubbo-test/dubbo-test-examples/pom.xml
index 27ea2da91d2..4ae6af43a62 100644
--- a/dubbo-test/dubbo-test-examples/pom.xml
+++ b/dubbo-test/dubbo-test-examples/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-test
- 2.5.6
+ 2.5.7
dubbo-test-examples
jar
diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml
index b2a63fbc498..829d8687efa 100644
--- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml
+++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml
@@ -23,7 +23,7 @@
-
diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml
index cc3b2bafa95..cdefba28f0c 100644
--- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml
+++ b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml
@@ -25,9 +25,9 @@
diff --git a/dubbo-test/dubbo-test-integration/pom.xml b/dubbo-test/dubbo-test-integration/pom.xml
index 8b37abea5dc..943aa0a1800 100644
--- a/dubbo-test/dubbo-test-integration/pom.xml
+++ b/dubbo-test/dubbo-test-integration/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-test
- 2.5.6
+ 2.5.7
dubbo-test-integration
jar
diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml
index d70ba60cfd6..f2d64ad7096 100644
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo-test
pom
diff --git a/dubbo/pom.xml b/dubbo/pom.xml
index 3141b68cca3..53a857f9aee 100644
--- a/dubbo/pom.xml
+++ b/dubbo/pom.xml
@@ -19,7 +19,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
dubbo
jar
diff --git a/hessian-lite/pom.xml b/hessian-lite/pom.xml
index 888693be1f4..77de9249cd8 100644
--- a/hessian-lite/pom.xml
+++ b/hessian-lite/pom.xml
@@ -6,7 +6,7 @@
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
hessian-lite
jar
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetHandler.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetHandler.java
new file mode 100644
index 00000000000..5ec64626b75
--- /dev/null
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetHandler.java
@@ -0,0 +1,25 @@
+package com.alibaba.com.caucho.hessian.io;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.EnumSet;
+
+/**
+ * @author bw on 24/10/2017.
+ */
+class EnumSetHandler implements Serializable, HessianHandle {
+ private Class type;
+ private Object[] objects;
+
+ EnumSetHandler(Class type, Object[] objects) {
+ this.type = type;
+ this.objects = objects;
+ }
+
+ @SuppressWarnings("unchecked")
+ private Object readResolve() {
+ EnumSet enumSet = EnumSet.noneOf(type);
+ enumSet.addAll(Arrays.asList(objects));
+ return enumSet;
+ }
+}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetSerializer.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetSerializer.java
new file mode 100644
index 00000000000..c8c432c7df1
--- /dev/null
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/EnumSetSerializer.java
@@ -0,0 +1,34 @@
+package com.alibaba.com.caucho.hessian.io;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.EnumSet;
+
+/**
+ * @author bw on 24/10/2017.
+ */
+public class EnumSetSerializer extends AbstractSerializer {
+ private static EnumSetSerializer SERIALIZER = new EnumSetSerializer();
+
+ public static EnumSetSerializer getInstance() {
+ return SERIALIZER;
+ }
+
+ @Override
+ public void writeObject(Object obj, AbstractHessianOutput out) throws IOException {
+ if (obj == null) {
+ out.writeNull();
+ } else {
+ try {
+ Field field = EnumSet.class.getDeclaredField("elementType");
+ field.setAccessible(true);
+ Class type = (Class) field.get(obj);
+ EnumSet enumSet = (EnumSet) obj;
+ Object[] objects = enumSet.toArray();
+ out.writeObject(new EnumSetHandler(type, objects));
+ } catch (Throwable t) {
+ throw new IOException(t);
+ }
+ }
+ }
+}
diff --git a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/SerializerFactory.java b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/SerializerFactory.java
index b12453ddd81..972143ae90e 100644
--- a/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/SerializerFactory.java
+++ b/hessian-lite/src/main/java/com/alibaba/com/caucho/hessian/io/SerializerFactory.java
@@ -73,6 +73,7 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
+import java.util.EnumSet;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -323,6 +324,8 @@ public Serializer getSerializer(Class cl)
} else if (isZoneId(cl)) //must before "else if (JavaSerializer.getWriteReplace(cl) != null)"
serializer = ZoneIdSerializer.getInstance();
+ else if (isEnumSet(cl))
+ serializer = EnumSetSerializer.getInstance();
else if (JavaSerializer.getWriteReplace(cl) != null)
serializer = new JavaSerializer(cl, _loader);
@@ -673,6 +676,10 @@ private static boolean isZoneId(Class cl) {
return false;
}
+ private static boolean isEnumSet(Class cl) {
+ return EnumSet.class.isAssignableFrom(cl);
+ }
+
/**
* check if the environment is java 8 or beyond
*
diff --git a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Hessian2EnumSetTest.java b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Hessian2EnumSetTest.java
new file mode 100644
index 00000000000..5edd563a379
--- /dev/null
+++ b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Hessian2EnumSetTest.java
@@ -0,0 +1,68 @@
+package com.alibaba.com.caucho.hessian.io;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
+import java.util.EnumSet;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+public class Hessian2EnumSetTest {
+
+ @Test
+ public void singleton() throws Exception {
+ EnumSet h = EnumSet.of(Type.High);
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ Hessian2Output out = new Hessian2Output(bout);
+
+ out.writeObject(h);
+ out.flush();
+
+ ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
+ Hessian2Input input = new Hessian2Input(bin);
+ EnumSet set = (EnumSet) input.readObject();
+
+ assertTrue(Arrays.asList(set.toArray()).contains(Type.High));
+ assertFalse(Arrays.asList(set.toArray()).contains(Type.Lower));
+ }
+
+ @Test
+ public void set() throws Exception {
+ EnumSet types = EnumSet.of(Type.High, Type.Lower);
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ Hessian2Output out = new Hessian2Output(bout);
+
+ out.writeObject(types);
+ out.flush();
+
+ ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
+ Hessian2Input input = new Hessian2Input(bin);
+
+ EnumSet set = (EnumSet) input.readObject();
+ assertTrue(set.contains(Type.High));
+ assertFalse(set.contains(Type.Normal));
+ }
+
+ @Test
+ public void none() throws Exception {
+ EnumSet types = EnumSet.noneOf(Type.class);
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ Hessian2Output out = new Hessian2Output(bout);
+
+ out.writeObject(types);
+ out.flush();
+
+ ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
+ Hessian2Input input = new Hessian2Input(bin);
+
+ EnumSet set = (EnumSet) input.readObject();
+ TestCase.assertEquals(set, EnumSet.noneOf(Type.class));
+ }
+}
diff --git a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Type.java b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Type.java
new file mode 100644
index 00000000000..4a27537decb
--- /dev/null
+++ b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/Type.java
@@ -0,0 +1,8 @@
+package com.alibaba.com.caucho.hessian.io;
+
+/**
+ * @author bw on 24/10/2017.
+ */
+public enum Type {
+ High, Normal, Lower
+}
diff --git a/pom.xml b/pom.xml
index 8f60dea379a..b002fa4a15b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
4.0.0
com.alibaba
dubbo-parent
- 2.5.6
+ 2.5.7
pom
${project.artifactId}
The parent project of dubbo
@@ -110,7 +110,8 @@
2.0-M5.1
3.0
2.2
- 3.0.8
+ 3.1.6
+ 1.7
1.7.25
1.2
@@ -300,6 +301,11 @@
citrus-webx-all
${webx_version}
+
+ org.apache.velocity
+ velocity
+ ${velocity_version}
+
org.slf4j