Polish #615, rename spring-cloud-alibaba-sentinel-zuul to spring-cloud-alibaba-sentinel-gateway

pom.xml

@@ -93,7 +93,7 @@
         <module>spring-cloud-alibaba-dependencies</module>
         <module>spring-cloud-alibaba-sentinel</module>
         <module>spring-cloud-alibaba-sentinel-datasource</module>
-        <module>spring-cloud-alibaba-sentinel-zuul</module>
+        <module>spring-cloud-alibaba-sentinel-gateway</module>
         <module>spring-cloud-alibaba-nacos-config</module>
         <module>spring-cloud-alibaba-nacos-discovery</module>
         <module>spring-cloud-alibaba-seata</module>

spring-cloud-alibaba-dependencies/pom.xml

@@ -268,7 +268,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-sentinel-zuul</artifactId>
+                <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml

@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel-zuul</artifactId>
+            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
         </dependency>
 
         <!--<dependency>-->

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml

@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel-zuul</artifactId>
+            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
         </dependency>
 
         <!--<dependency>-->

spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java

@@ -18,45 +18,43 @@ package org.springframework.cloud.alibaba.cloud.examples;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.BlockResponse;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */
 @Configuration
 public class ZuulConfiguration {
 
-	@Bean
+    @Bean
-	public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() {
+    public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() {
-		return new ZuulBlockFallbackProvider() {
+        return new ZuulBlockFallbackProvider() {
-			@Override
+            @Override
-			public String getRoute() {
+            public String getRoute() {
-				return "*";
+                return "*";
-			}
+            }
 
-			@Override
+            @Override
-			public BlockResponse fallbackResponse(String route, Throwable cause) {
+            public BlockResponse fallbackResponse(String route, Throwable cause) {
-				if (route.equals("my-service3")) {
+                if (route.equals("my-service3")) {
-					return new BlockResponse(433, "Sentinel Block3", route);
+                    return new BlockResponse(433, "Sentinel Block3", route);
-				}
+                } else if (route.equals("my-service4")) {
-				else if (route.equals("my-service4")) {
+                    return new BlockResponse(444, "my-service4", route);
-					return new BlockResponse(444, "my-service4", route);
+                } else {
-				}
+                    return new BlockResponse(499, "Sentinel Block 499", route);
-				else {
+                }
-					return new BlockResponse(499, "Sentinel Block 499", route);
+            }
-				}
+        };
-			}
+    }
-		};
-	}
 
-	@Bean
+    @Bean
-	public RequestOriginParser requestOriginParser() {
+    public RequestOriginParser requestOriginParser() {
-	    return new RequestOriginParser() {
+        return new RequestOriginParser() {
 
             @Override
             public String parseOrigin(HttpServletRequest request) {

spring-cloud-alibaba-sentinel-gateway/README.md

@@ -14,7 +14,7 @@ Sentinel can provide `ServiceId` level and `API Path` level flow control for spr
 ```xml
 <dependency>
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-alibaba-sentinel-zuul</artifactId>
+    <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
     <version>x.y.z</version>
 </dependency>
 

spring-cloud-alibaba-sentinel-gateway/pom.xml

@@ -10,8 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-alibaba-sentinel-zuul</artifactId>
+    <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
-    <name>Spring Cloud Alibaba Sentinel Zuul</name>
+    <name>Spring Cloud Alibaba Sentinel Gateway</name>
 
     <dependencies>
         <dependency>

spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelSpringCloudGatewayAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.zuul;
+package org.springframework.cloud.alibaba.sentinel.gateway;
 
 import java.util.Collections;
 import java.util.List;

spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelZuulAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.zuul;
+package org.springframework.cloud.alibaba.sentinel.gateway;
 
 import java.util.Optional;
 
@@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.sentinel.zuul.handler.FallBackProviderHandler;
+import org.springframework.cloud.alibaba.sentinel.gateway.handler.FallBackProviderHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/handler/FallBackProviderHandler.java

@@ -0,0 +1,44 @@
+package org.springframework.cloud.alibaba.sentinel.gateway.handler;
+
+import java.util.Map;
+
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.DefaultBlockFallbackProvider;
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackManager;
+import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * @author tiger
+ */
+public class FallBackProviderHandler implements SmartInitializingSingleton {
+
+    private static final Logger logger = LoggerFactory
+        .getLogger(FallBackProviderHandler.class);
+
+    private final DefaultListableBeanFactory beanFactory;
+
+    public FallBackProviderHandler(DefaultListableBeanFactory beanFactory) {
+        this.beanFactory = beanFactory;
+    }
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        Map<String, ZuulBlockFallbackProvider> providerMap = beanFactory
+            .getBeansOfType(ZuulBlockFallbackProvider.class);
+        if (!CollectionUtils.isEmpty(providerMap)) {
+            providerMap.forEach((k, v) -> {
+                logger.info("[Sentinel Zuul] Register provider name:{}, instance: {}", k,
+                    v);
+                ZuulBlockFallbackManager.registerProvider(v);
+            });
+        } else {
+            logger.info("[Sentinel Zuul] Register default fallback provider. ");
+            ZuulBlockFallbackManager.registerProvider(new DefaultBlockFallbackProvider());
+        }
+    }
+}

spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.alibaba.sentinel.gateway.SentinelZuulAutoConfiguration,\
+org.springframework.cloud.alibaba.sentinel.gateway.SentinelSpringCloudGatewayAutoConfiguration

spring-cloud-alibaba-sentinel-zuul/src/main/java/org/springframework/cloud/alibaba/sentinel/zuul/handler/FallBackProviderHandler.java

@@ -1,45 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.zuul.handler;
-
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.util.CollectionUtils;
-
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.DefaultBlockFallbackProvider;
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackManager;
-import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
-
-/**
- * @author tiger
- */
-public class FallBackProviderHandler implements SmartInitializingSingleton {
-
-	private static final Logger logger = LoggerFactory
-			.getLogger(FallBackProviderHandler.class);
-
-	private final DefaultListableBeanFactory beanFactory;
-
-	public FallBackProviderHandler(DefaultListableBeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	@Override
-	public void afterSingletonsInstantiated() {
-		Map<String, ZuulBlockFallbackProvider> providerMap = beanFactory
-				.getBeansOfType(ZuulBlockFallbackProvider.class);
-		if (!CollectionUtils.isEmpty(providerMap)) {
-			providerMap.forEach((k, v) -> {
-				logger.info("[Sentinel Zuul] Register provider name:{}, instance: {}", k,
-						v);
-				ZuulBlockFallbackManager.registerProvider(v);
-			});
-		}
-		else {
-			logger.info("[Sentinel Zuul] Register default fallback provider. ");
-			ZuulBlockFallbackManager.registerProvider(new DefaultBlockFallbackProvider());
-		}
-	}
-}

spring-cloud-alibaba-sentinel-zuul/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.sentinel.zuul.SentinelZuulAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.zuul.SentinelSpringCloudGatewayAutoConfiguration