From c470f56492d7595e71091c38ba7346dd4bca2f42 Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Mon, 4 Mar 2019 16:48:57 +0800
Subject: [PATCH] sentinel zuul refactor 1.x

---
 .../sentinel/zuul/SentinelZuulAutoConfiguration.java |  6 +++---
 .../FallBackProviderHandler.java}                    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/{listener/FallBackProviderListener.java => handler/FallBackProviderHandler.java} (73%)

diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java b/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java
index 84da3481..b2532f3c 100644
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/SentinelZuulAutoConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.sentinel.zuul.listener.FallBackProviderListener;
+import org.springframework.cloud.alibaba.sentinel.zuul.handler.FallBackProviderHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -106,9 +106,9 @@ public class SentinelZuulAutoConfiguration {
 	}
 
 	@Bean
-	public FallBackProviderListener fallBackProviderListener(
+	public FallBackProviderHandler fallBackProviderListener(
 			DefaultListableBeanFactory beanFactory) {
-		return new FallBackProviderListener(beanFactory);
+		return new FallBackProviderHandler(beanFactory);
 	}
 
 }
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/listener/FallBackProviderListener.java b/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java
similarity index 73%
rename from spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/listener/FallBackProviderListener.java
rename to spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java
index 31b9cafa..b7c97496 100644
--- a/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/listener/FallBackProviderListener.java
+++ b/spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.zuul.listener;
+package org.springframework.cloud.alibaba.sentinel.zuul.handler;
 
 import java.util.Map;
 
@@ -15,14 +15,14 @@ import com.alibaba.csp.sentinel.adapter.zuul.fallback.ZuulBlockFallbackProvider;
 /**
  * @author tiger
  */
-public class FallBackProviderListener implements SmartInitializingSingleton {
+public class FallBackProviderHandler implements SmartInitializingSingleton {
 
 	private static final Logger logger = LoggerFactory
-			.getLogger(FallBackProviderListener.class);
+			.getLogger(FallBackProviderHandler.class);
 
 	private final DefaultListableBeanFactory beanFactory;
 
-	public FallBackProviderListener(DefaultListableBeanFactory beanFactory) {
+	public FallBackProviderHandler(DefaultListableBeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
@@ -32,13 +32,13 @@ public class FallBackProviderListener implements SmartInitializingSingleton {
 				.getBeansOfType(ZuulBlockFallbackProvider.class);
 		if (MapUtils.isNotEmpty(providerMap)) {
 			for (String k : providerMap.keySet()) {
-				logger.info("[Sentinel] Register provider name:{}, instance: {}", k,
+				logger.info("[Sentinel Zuul] Register provider name:{}, instance: {}", k,
 						providerMap.get(k));
 				ZuulBlockFallbackManager.registerProvider(providerMap.get(k));
 			}
 		}
 		else {
-			logger.info("[Sentinel] Register default fallback provider. ");
+			logger.info("[Sentinel Zuul] Register default fallback provider. ");
 			ZuulBlockFallbackManager.registerProvider(new DefaultBlockFallbackProvider());
 		}
 	}