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

format code and change apache log to slf4j

Browse Source
This commit is contained in:
flystar32 2019-02-21 14:36:52 +08:00
parent f96869e1d2
commit 2cfabd353a
18 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java
View File

@ -21,15 +21,11 @@ import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.DiscoveryClient;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
public class AnsDiscoveryClient implements DiscoveryClient { public class AnsDiscoveryClient implements DiscoveryClient {

1
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java
View File

@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
@Configuration @Configuration
@Conditional(MigrateOnConditionMissingClass.class) @Conditional(MigrateOnConditionMissingClass.class)

1
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java
View File

@ -31,6 +31,7 @@ import java.util.Set;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
@Endpoint(id = "ans") @Endpoint(id = "ans")
public class AnsEndpoint { public class AnsEndpoint {

6
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java
View File

@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate; package org.springframework.cloud.alicloud.ans.migrate;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentMap;
@Endpoint(id = "migrate") @Endpoint(id = "migrate")
public class MigrateEndpoint { public class MigrateEndpoint {
private static final Log log = LogFactory.getLog(MigrateEndpoint.class); private static final Logger log = LoggerFactory.getLogger(MigrateEndpoint.class);
public MigrateEndpoint() { public MigrateEndpoint() {
} }

3
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java
View File

@ -6,6 +6,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
/**
* @author pbting
*/
@ConditionalOnWebApplication @ConditionalOnWebApplication
@ConditionalOnClass(value = Endpoint.class) @ConditionalOnClass(value = Endpoint.class)
@Conditional(MigrateOnConditionClass.class) @Conditional(MigrateOnConditionClass.class)

3
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnCondition.java
View File

@ -35,7 +35,7 @@ public abstract class MigrateOnCondition implements Condition, BeanClassLoaderAw
forName(className, classLoader); forName(className, classLoader);
return true; return true;
} }
catch (Throwable var3) { catch (Throwable throwable) {
return false; return false;
} }
} }
@ -45,5 +45,4 @@ public abstract class MigrateOnCondition implements Condition, BeanClassLoaderAw
return classLoader != null ? classLoader.loadClass(className) return classLoader != null ? classLoader.loadClass(className)
: Class.forName(className); : Class.forName(className);
} }
} }

9
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java
View File

@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate; package org.springframework.cloud.alicloud.ans.migrate;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.core.type.AnnotatedTypeMetadata;
@ -10,13 +10,14 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
*/ */
public class MigrateOnConditionClass extends MigrateOnCondition { public class MigrateOnConditionClass extends MigrateOnCondition {
protected static final Log log = LogFactory.getLog(MigrateOnConditionClass.class); private static final Logger log = LoggerFactory
.getLogger(MigrateOnConditionClass.class);
@Override @Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
boolean result = isPresent(conditionOnClass[0], classLoader) boolean result = isPresent(conditionOnClass[0], classLoader)
|| isPresent(conditionOnClass[1], classLoader); || isPresent(conditionOnClass[1], classLoader);
log.info("the result of match is :" + result); log.info("the result of matcher is " + result);
return result; return result;
} }
} }

11
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java
View File

@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate; package org.springframework.cloud.alicloud.ans.migrate;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.core.type.AnnotatedTypeMetadata;
@ -9,14 +9,13 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
* @author pbting * @author pbting
*/ */
public class MigrateOnConditionMissingClass extends MigrateOnConditionClass { public class MigrateOnConditionMissingClass extends MigrateOnConditionClass {
private static final Logger log = LoggerFactory
protected static final Log log = LogFactory .getLogger(MigrateOnConditionMissingClass.class);
.getLog(MigrateOnConditionMissingClass.class);
@Override @Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
boolean result = !super.matches(context, metadata); boolean result = !super.matches(context, metadata);
log.info("the result of match is :" + result); log.info(" the result of matcher is " + result);
return result; return result;
} }

6
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java
View File

@ -5,8 +5,8 @@ import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList; import com.netflix.loadbalancer.ServerList;
import org.aopalliance.aop.Advice; import org.aopalliance.aop.Advice;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.aop.AfterReturningAdvice; import org.springframework.aop.AfterReturningAdvice;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/ */
final class MigrateProxyManager { final class MigrateProxyManager {
private final static Log log = LogFactory.getLog(MigrateProxyManager.class); private static final Logger log = LoggerFactory.getLogger(MigrateProxyManager.class);
private final static AtomicBoolean IS_PROXY = new AtomicBoolean(true); private final static AtomicBoolean IS_PROXY = new AtomicBoolean(true);
private final static Set<String> SERVICES_ID = new ConcurrentSkipListSet<>(); private final static Set<String> SERVICES_ID = new ConcurrentSkipListSet<>();

6
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java
View File

@ -3,8 +3,8 @@ package org.springframework.cloud.alicloud.ans.migrate;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.ServerList; import com.netflix.loadbalancer.ServerList;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.BeanPostProcessor;
@ -12,7 +12,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
public class MigrateRibbonBeanPostProcessor public class MigrateRibbonBeanPostProcessor
implements BeanPostProcessor, BeanClassLoaderAware { implements BeanPostProcessor, BeanClassLoaderAware {
protected static final Log log = LogFactory.getLog(MigrateOnCondition.class); private static final Logger log = LoggerFactory.getLogger(MigrateOnCondition.class);
private ClassLoader classLoader; private ClassLoader classLoader;
private IClientConfig clientConfig; private IClientConfig clientConfig;

7
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java
View File

@ -1,7 +1,7 @@
package org.springframework.cloud.alicloud.ans.migrate; package org.springframework.cloud.alicloud.ans.migrate;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.cloud.alicloud.ans.registry.AnsRegistration; import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry; import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
@ -19,7 +19,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Component @Component
public class MigrateServiceRegistry { public class MigrateServiceRegistry {
private static final Log log = LogFactory.getLog(MigrateServiceRegistry.class); private static final Logger log = LoggerFactory
.getLogger(MigrateServiceRegistry.class);
private AtomicBoolean running = new AtomicBoolean(false); private AtomicBoolean running = new AtomicBoolean(false);

3
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrationAutoconfiguration.java
View File

@ -12,6 +12,9 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
/**
* @author pbting
*/
@Configuration @Configuration
@EnableConfigurationProperties @EnableConfigurationProperties
@Conditional(MigrateOnConditionClass.class) @Conditional(MigrateOnConditionClass.class)

16
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java
View File

@ -4,17 +4,12 @@ import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.alicloud.ans.ribbon.AnsServer; import org.springframework.cloud.alicloud.ans.ribbon.AnsServer;
import org.springframework.cloud.alicloud.ans.ribbon.AnsServerList; import org.springframework.cloud.alicloud.ans.ribbon.AnsServerList;
import java.util.Collections; import java.util.*;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ConcurrentSkipListSet;
@ -22,11 +17,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
/** /**
* * @author pbting
*/ */
class ServerListInvocationHandler implements MethodInterceptor { class ServerListInvocationHandler implements MethodInterceptor {
private final static Log log = LogFactory.getLog(ServerListInvocationHandler.class); private static final Logger log = LoggerFactory
.getLogger(ServerListInvocationHandler.class);
private final static ConcurrentMap<String, AnsServerList> SERVER_LIST_CONCURRENT_MAP = new ConcurrentHashMap<>(); private final static ConcurrentMap<String, AnsServerList> SERVER_LIST_CONCURRENT_MAP = new ConcurrentHashMap<>();

3
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerWrapper.java
View File

@ -4,6 +4,9 @@ import com.netflix.loadbalancer.Server;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
/**
* @author pbting
*/
public class ServerWrapper { public class ServerWrapper {
private Server server; private Server server;

8
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
View File

@ -16,8 +16,8 @@
package org.springframework.cloud.alicloud.ans.registry; package org.springframework.cloud.alicloud.ans.registry;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration; import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
@ -27,10 +27,12 @@ import org.springframework.util.StringUtils;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
public class AnsAutoServiceRegistration public class AnsAutoServiceRegistration
extends AbstractAutoServiceRegistration<AnsRegistration> { extends AbstractAutoServiceRegistration<AnsRegistration> {
private static final Log log = LogFactory.getLog(AnsAutoServiceRegistration.class); private static final Logger log = LoggerFactory
.getLogger(AnsAutoServiceRegistration.class);
@Autowired @Autowired
private AnsRegistration registration; private AnsRegistration registration;

6
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java
View File

@ -19,8 +19,8 @@ package org.springframework.cloud.alicloud.ans.registry;
import com.alibaba.ans.core.NamingService; import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor; import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import java.util.ArrayList; import java.util.ArrayList;
@ -32,7 +32,7 @@ import java.util.Map;
*/ */
public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> { public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
private static Log log = LogFactory.getLog(AnsServiceRegistry.class); private static final Logger log = LoggerFactory.getLogger(AnsServiceRegistry.class);
private static final String SEPARATOR = ","; private static final String SEPARATOR = ",";

1
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java
View File

@ -26,6 +26,7 @@ import org.springframework.context.annotation.Configuration;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
@Configuration @Configuration
@Conditional(MigrateOnConditionMissingClass.class) @Conditional(MigrateOnConditionMissingClass.class)

1
spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java
View File

@ -26,6 +26,7 @@ import java.util.List;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author pbting
*/ */
public class AnsServerList extends AbstractServerList<AnsServer> { public class AnsServerList extends AbstractServerList<AnsServer> {