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

Fix code format error.

Browse Source
This commit is contained in:
xiaolongzuo 2019-01-22 16:49:12 +08:00
parent 2de5362f4d
commit 65397e861c
7 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
View File

@ -51,6 +51,7 @@ public class AcmEndpointAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean
public AcmHealthIndicator acmHealthIndicator(AcmProperties acmProperties,
AcmPropertySourceRepository acmPropertySourceRepository) {
return new AcmHealthIndicator(acmProperties, acmPropertySourceRepository);

7
spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java
View File

@ -27,12 +27,13 @@ public class NacosParameterInitListener
EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
.getEdasChangeOrderConfiguration();
log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
edasChangeOrderConfiguration.isEdasManaged());
if (!edasChangeOrderConfiguration.isEdasManaged()) {
return;
}
log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
edasChangeOrderConfiguration.isEdasManaged());
// initialize nacos configuration
System.getProperties().setProperty("spring.cloud.nacos.config.server-addr", "");
System.getProperties().setProperty("spring.cloud.nacos.config.endpoint",

9
spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
View File

@ -26,22 +26,23 @@ import org.springframework.context.event.ContextClosedEvent;
import com.aliyun.oss.OSS;
/**
* Shutdown All OSS Clients when {@code ApplicationContext} gets closed {@link ApplicationListener}
* Shutdown All OSS Clients when {@code ApplicationContext} gets closed
* {@link ApplicationListener}
*
* @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
*/
public class OssApplicationListener implements ApplicationListener<ContextClosedEvent> {
private static final Logger logger = LoggerFactory
private static final Logger log = LoggerFactory
.getLogger(OssApplicationListener.class);
@Override
public void onApplicationEvent(ContextClosedEvent event) {
Map<String, OSS> ossClientMap = event.getApplicationContext()
.getBeansOfType(OSS.class);
logger.info("{} OSSClients will be shutdown soon", ossClientMap.size());
log.info("{} OSSClients will be shutdown soon", ossClientMap.size());
ossClientMap.keySet().forEach(beanName -> {
logger.info("shutdown ossClient: {}", beanName);
log.info("shutdown ossClient: {}", beanName);
ossClientMap.get(beanName).shutdown();
});
}

2
spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
View File

@ -34,7 +34,7 @@ public class OssEndpointAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint
public OssEndpoint sentinelEndPoint() {
public OssEndpoint ossEndpoint() {
return new OssEndpoint();
}

9
spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java
View File

@ -39,7 +39,7 @@ public class OssStorageProtocolResolver
public static final String PROTOCOL = "oss://";
private static final Logger logger = LoggerFactory
private static final Logger log = LoggerFactory
.getLogger(OssStorageProtocolResolver.class);
private ConfigurableListableBeanFactory beanFactory;
@ -49,8 +49,9 @@ public class OssStorageProtocolResolver
private OSS getOSS() {
if (this.oss == null) {
if (this.beanFactory.getBeansOfType(OSS.class).size() > 1) {
logger.warn(
"There are multiple OSS instances, consider marking one of them as @Primary to resolve oss protocol.");
log.warn(
"There are multiple OSS instances, consider marking one of them as @Primary to resolve oss "
+ "protocol.");
}
this.oss = this.beanFactory.getBean(OSS.class);
}
@ -71,7 +72,7 @@ public class OssStorageProtocolResolver
((DefaultResourceLoader) resourceLoader).addProtocolResolver(this);
}
else {
logger.warn("The provided delegate resource loader is not an implementation "
log.warn("The provided delegate resource loader is not an implementation "
+ "of DefaultResourceLoader. Custom Protocol using oss:// prefix will not be enabled.");
}
}

6
spring-cloud-alicloud-schedulerx/pom.xml
View File

@ -38,6 +38,12 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>

14
spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
View File

@ -16,8 +16,10 @@
package org.springframework.cloud.alicloud.scx.endpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.cloud.alicloud.context.edas.EdasProperties;
import org.springframework.cloud.alicloud.context.scx.ScxProperties;
@ -30,8 +32,12 @@ import org.springframework.context.annotation.Bean;
@ConditionalOnClass(Endpoint.class)
public class ScxEndpointAutoConfiguration {
@Bean
public ScxEndpoint scxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) {
return new ScxEndpoint(edasProperties, scxProperties);
}
@Bean
@ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint
public ScxEndpoint scxEndpoint(EdasProperties edasProperties,
ScxProperties scxProperties) {
return new ScxEndpoint(edasProperties, scxProperties);
}
}