2023.x support nacos config annotation split

pom.xml

@@ -335,5 +335,4 @@
             </distributionManagement>
         </profile>
     </profiles>
-
 </project>

spring-cloud-alibaba-dependencies/pom.xml

@@ -240,6 +240,11 @@
                 <artifactId>spring-cloud-starter-alibaba-ai</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-alibaba-nacos-config</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
@@ -381,7 +386,5 @@
                 </repository>
             </distributionManagement>
         </profile>
-
     </profiles>
-
 </project>

spring-cloud-alibaba-starters/pom.xml

@@ -15,6 +15,8 @@
     <description>Spring Cloud Alibaba Starters</description>
 
     <modules>
+
+        <module>spring-alibaba-nacos-config</module>
         <module>spring-cloud-starter-alibaba-nacos-config</module>
         <module>spring-cloud-starter-alibaba-nacos-discovery</module>
         <module>spring-cloud-starter-alibaba-seata</module>

spring-cloud-alibaba-starters/spring-alibaba-nacos-config/pom.xml

@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.alibaba.cloud</groupId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring-alibaba-nacos-config</artifactId>
+    <name>Spring Alibaba Nacos Config</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
+        </dependency>
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java → spring-cloud-alibaba-starters/spring-alibaba-nacos-config/src/main/java/com.alibaba.cloud.nacos/NacosConfigAutoConfiguration.java

@@ -16,39 +16,39 @@
 
 package com.alibaba.cloud.nacos;
 
+import com.alibaba.cloud.nacos.annotation.NacosAnnotationProcessor;
 import com.alibaba.cloud.nacos.refresh.NacosContextRefresher;
 import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
-import com.alibaba.cloud.nacos.refresh.SmartConfigurationPropertiesRebinder;
-import com.alibaba.cloud.nacos.refresh.condition.ConditionalOnNonDefaultBehavior;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.cloud.context.properties.ConfigurationPropertiesBeans;
-import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author juven.xuxb
  * @author freeman
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
+@Conditional(NacosConfigEnabledCondition.class)
 public class NacosConfigAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(value = NacosConfigProperties.class, search = SearchStrategy.CURRENT)
 	public NacosConfigProperties nacosConfigProperties(ApplicationContext context) {
-		if (context.getParent() != null
-				&& BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
-						context.getParent(), NacosConfigProperties.class).length > 0) {
-			return BeanFactoryUtils.beanOfTypeIncludingAncestors(context.getParent(),
-					NacosConfigProperties.class);
+		if (context.getParent() != null && BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context.getParent(),
+				NacosConfigProperties.class).length > 0) {
+			return BeanFactoryUtils.beanOfTypeIncludingAncestors(context.getParent(), NacosConfigProperties.class);
+		}
+		if (NacosConfigManager.getInstance() == null) { // this should never happen except for some unit tests
+			return new NacosConfigProperties();
+		}
+		else {
+			return NacosConfigManager.getInstance().getNacosConfigProperties();
 		}
-		return new NacosConfigProperties();
 	}
 
 	@Bean
@@ -57,29 +57,22 @@ public NacosRefreshHistory nacosRefreshHistory() {
 	}
 
 	@Bean
-	public NacosConfigManager nacosConfigManager(
-			NacosConfigProperties nacosConfigProperties) {
-		return new NacosConfigManager(nacosConfigProperties);
+	public NacosConfigManager nacosConfigManager(NacosConfigProperties nacosConfigProperties) {
+		return NacosConfigManager.getInstance(nacosConfigProperties);
+	}
+
+	@Bean
+	public NacosAnnotationProcessor nacosAnnotationProcessor() {
+		return new NacosAnnotationProcessor();
 	}
 
 	@Bean
-	public NacosContextRefresher nacosContextRefresher(
-			NacosConfigManager nacosConfigManager,
+	public NacosContextRefresher nacosContextRefresher(NacosConfigManager nacosConfigManager,
 			NacosRefreshHistory nacosRefreshHistory) {
 		// Consider that it is not necessary to be compatible with the previous
 		// configuration
 		// and use the new configuration if necessary.
 		return new NacosContextRefresher(nacosConfigManager, nacosRefreshHistory);
 	}
 
-	@Bean
-	@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
-	@ConditionalOnNonDefaultBehavior
-	public ConfigurationPropertiesRebinder smartConfigurationPropertiesRebinder(
-			ConfigurationPropertiesBeans beans) {
-		// If using default behavior, not use SmartConfigurationPropertiesRebinder.
-		// Minimize te possibility of making mistakes.
-		return new SmartConfigurationPropertiesRebinder(beans);
-	}
-
 }

spring-cloud-alibaba-starters/spring-alibaba-nacos-config/src/main/java/com.alibaba.cloud.nacos/NacosConfigBootstrapConfiguration.java

@@ -0,0 +1,45 @@
+/*
+ * 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
+ *
+ *      https://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.cloud.nacos;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiaojing
+ * @author freeman
+ */
+@Configuration(proxyBeanMethods = false)
+@Conditional(NacosConfigEnabledCondition.class)
+public class NacosConfigBootstrapConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosConfigProperties nacosConfigProperties() {
+		return new NacosConfigProperties();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosConfigManager nacosConfigManager(
+			NacosConfigProperties nacosConfigProperties) {
+		return new NacosConfigManager(nacosConfigProperties);
+	}
+
+}

spring-cloud-alibaba-starters/spring-alibaba-nacos-config/src/main/java/com.alibaba.cloud.nacos/NacosConfigEnabledCondition.java

@@ -0,0 +1,32 @@
+/*
+ * 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
+ *
+ *      https://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.cloud.nacos;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author shiyiyue
+ */
+public class NacosConfigEnabledCondition implements Condition {
+	@Override
+	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+		String prefix = NacosPropertiesPrefixer.getPrefix(context.getEnvironment());
+		return context.getEnvironment().getProperty(prefix + ".config.enabled", Boolean.class, true);
+	}
+}

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java → spring-cloud-alibaba-starters/spring-alibaba-nacos-config/src/main/java/com.alibaba.cloud.nacos/NacosConfigManager.java

@@ -32,34 +32,49 @@ public class NacosConfigManager {
 
 	private static final Logger log = LoggerFactory.getLogger(NacosConfigManager.class);
 
-	private static ConfigService service = null;
+	private static ConfigService service;
+
+	private static NacosConfigManager INSTANCE;
 
 	private NacosConfigProperties nacosConfigProperties;
 
 	public NacosConfigManager(NacosConfigProperties nacosConfigProperties) {
 		this.nacosConfigProperties = nacosConfigProperties;
 	}
 
+	public static NacosConfigManager getInstance() {
+		return INSTANCE;
+	}
+
+	public static NacosConfigManager getInstance(NacosConfigProperties properties) {
+		if (INSTANCE != null) {
+			return INSTANCE;
+		}
+		synchronized (NacosConfigManager.class) {
+			if (INSTANCE == null) {
+				INSTANCE = new NacosConfigManager(properties);
+				INSTANCE.createConfigService(properties);
+			}
+		}
+		return INSTANCE;
+	}
+
 	/**
 	 * Compatible with old design,It will be perfected in the future.
 	 */
-	static ConfigService createConfigService(
+	private ConfigService createConfigService(
 			NacosConfigProperties nacosConfigProperties) {
-		if (Objects.isNull(service)) {
-			synchronized (NacosConfigManager.class) {
-				try {
-					if (Objects.isNull(service)) {
-						service = NacosFactory.createConfigService(
-								nacosConfigProperties.assembleConfigServiceProperties());
-					}
-				}
-				catch (NacosException e) {
-					log.error(e.getMessage());
-					throw new NacosConnectionFailureException(
-							nacosConfigProperties.getServerAddr(), e.getMessage(), e);
-				}
+		try {
+			if (Objects.isNull(service)) {
+				service = NacosFactory.createConfigService(
+						nacosConfigProperties.assembleConfigServiceProperties());
 			}
 		}
+		catch (NacosException e) {
+			log.error(e.getMessage());
+			throw new NacosConnectionFailureException(
+					nacosConfigProperties.getServerAddr(), e.getMessage(), e);
+		}
 		return service;
 	}