Bug fix : DubboServiceRegistrationAutoConfiguration does not work in some cases

spring-cloud-alibaba-dubbo/pom.xml

@@ -64,12 +64,6 @@
             <artifactId>spring-cloud-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-config-monitor</artifactId>-->
-            <!--<optional>true</optional>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

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

@@ -16,7 +16,6 @@
  */
 package org.springframework.cloud.alibaba.dubbo.autoconfigure;
 
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
 import org.springframework.cloud.alibaba.dubbo.metadata.service.MetadataConfigService;
@@ -25,7 +24,6 @@ import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.Ordered;
 
 /**
  * Spring Boot Auto-Configuration class for Dubbo Metadata
@@ -34,7 +32,6 @@ import org.springframework.core.Ordered;
  */
 @Configuration
 @Import(DubboServiceMetadataRepository.class)
-@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
 public class DubboMetadataAutoConfiguration {
 
     @Bean

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java

@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
-
-import com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration;
-
-import org.springframework.beans.BeansException;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * {@link DubboServiceRegistrationAutoConfiguration} will register the Dubbo services as the specified Spring cloud
- * applications that will not be considered normal ones, but only are used to Dubbo's service discovery even if it is
- * based on Spring Cloud Commons abstraction. However, current application will be registered by other
- * DiscoveryClientAutoConfiguration.
- *
- * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
- */
-@Configuration
-@AutoConfigureBefore({AutoServiceRegistrationAutoConfiguration.class, DubboAutoConfiguration.class})
-public class DubboServiceRegistrationAutoConfiguration implements ApplicationContextAware {
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        // Set ApplicationContext into SpringCloudRegistryFactory before Dubbo Service Register
-        SpringCloudRegistryFactory.setApplicationContext(applicationContext);
-    }
-}

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.alibaba.dubbo.context;
+
+import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+/**
+ * The Dubbo services will be registered as the specified Spring cloud applications that will not be considered
+ * normal ones, but only are used to Dubbo's service discovery even if it is based on Spring Cloud Commons abstraction.
+ * However, current application will be registered by other DiscoveryClientAutoConfiguration.
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ */
+public class DubboServiceRegistrationApplicationContextInitializer implements
+        ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    @Override
+    public void initialize(ConfigurableApplicationContext applicationContext) {
+        // Set ApplicationContext into SpringCloudRegistryFactory before Dubbo Service Register
+        SpringCloudRegistryFactory.setApplicationContext(applicationContext);
+    }
+}

spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,7 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboMetadataAutoConfiguration,\
   org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration,\
-  org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration,\
   org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboRestMetadataRegistrationAutoConfiguration
+
+org.springframework.context.ApplicationContextInitializer=\
+  org.springframework.cloud.alibaba.dubbo.context.DubboServiceRegistrationApplicationContextInitializer