study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Change configuration item name and add it to json file

Browse Source 
Change configuration item name from `spring.cloud.alicloud.acm.enable`
to `spring.cloud.alicloud.acm.enabled` and add this configuration item
to `additional-spring-configuration-metadata.json` file.
This commit is contained in:
Rivers-Shall 2019-07-26 19:07:57 +08:00
parent 3193311af9
commit 888f138c79
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
View File

@ -38,7 +38,7 @@ import com.taobao.diamond.client.Diamond;
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Diamond.class }) @ConditionalOnClass({ Diamond.class })
@ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enable", matchIfMissing = true) @ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enabled", matchIfMissing = true)
public class AcmAutoConfiguration implements ApplicationContextAware { public class AcmAutoConfiguration implements ApplicationContextAware {
private ApplicationContext applicationContext; private ApplicationContext applicationContext;

2
spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
View File

@ -29,7 +29,7 @@ import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
* @author juven.xuxb * @author juven.xuxb
* @author xiaolongzuo * @author xiaolongzuo
*/ */
@ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enable", matchIfMissing = true) @ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enabled", matchIfMissing = true)
public class AcmPropertySourceLocator implements PropertySourceLocator { public class AcmPropertySourceLocator implements PropertySourceLocator {
private static final String DIAMOND_PROPERTY_SOURCE_NAME = "diamond"; private static final String DIAMOND_PROPERTY_SOURCE_NAME = "diamond";

2
spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
View File

@ -33,7 +33,7 @@ import com.alibaba.alicloud.context.acm.AcmProperties;
*/ */
@ConditionalOnWebApplication @ConditionalOnWebApplication
@ConditionalOnClass(name = "org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration") @ConditionalOnClass(name = "org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration")
@ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enable", matchIfMissing = true) @ConditionalOnProperty(name = "spring.cloud.alicloud.acm.enabled", matchIfMissing = true)
public class AcmEndpointAutoConfiguration { public class AcmEndpointAutoConfiguration {
@Autowired @Autowired

6
spring-cloud-alicloud-acm/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -4,6 +4,12 @@
"name": "spring.application.group", "name": "spring.application.group",
"type": "java.lang.String", "type": "java.lang.String",
"description": "spring application group." "description": "spring application group."
},
{
"name": "spring.cloud.alicloud.acm.enabled",
"type": "java.lang.Boolean",
"defaultValue": true,
"description": "enable acm or not."
} }
] ]
} }