Skip to content

Commit

Permalink
Polish apache#2897 : rename DubboConfigConfigurationSelector to Dubbo…
Browse files Browse the repository at this point in the history
…ConfigConfigurationRegistrar
  • Loading branch information
mercyblitz committed Dec 7, 2018
1 parent b41ee81 commit b328a7d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.context.annotation.ImportSelector;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
Expand All @@ -30,14 +29,14 @@
import static com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;

/**
* Dubbo {@link AbstractConfig Config} {@link ImportSelector} implementation, which order can be configured
* Dubbo {@link AbstractConfig Config} {@link ImportBeanDefinitionRegistrar register}, which order can be configured
*
* @see EnableDubboConfig
* @see DubboConfigConfiguration
* @see Ordered
* @since 2.5.8
*/
public class DubboConfigConfigurationSelector implements ImportBeanDefinitionRegistrar, EnvironmentAware, Ordered {
public class DubboConfigConfigurationRegistrar implements ImportBeanDefinitionRegistrar, EnvironmentAware, Ordered {

/**
* The property name of {@link EnableDubboConfig}'s {@link Ordered order}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
*
* @see EnableDubboConfigBinding
* @see DubboConfigConfiguration
* @see DubboConfigConfigurationSelector
* @see DubboConfigConfigurationRegistrar
* @since 2.5.8
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
@Import(DubboConfigConfigurationSelector.class)
@Import(DubboConfigConfigurationRegistrar.class)
public @interface EnableDubboConfig {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import java.util.HashMap;
import java.util.Map;

import static com.alibaba.dubbo.config.spring.context.annotation.DubboConfigConfigurationSelector.DUBBO_CONFIG_ORDER_PROPERTY_NAME;
import static com.alibaba.dubbo.config.spring.context.annotation.DubboConfigConfigurationRegistrar.DUBBO_CONFIG_ORDER_PROPERTY_NAME;

/**
* {@link EnableDubboConfig} Test
Expand All @@ -53,7 +53,7 @@ public void testOrder() {

environment.getPropertySources().addFirst(propertySource);

DubboConfigConfigurationSelector selector = new DubboConfigConfigurationSelector();
DubboConfigConfigurationRegistrar selector = new DubboConfigConfigurationRegistrar();

selector.setEnvironment(environment);

Expand Down

0 comments on commit b328a7d

Please sign in to comment.