Merge branch 'master' into fix-order-dependent-test-Resilience4JPluginTest

Author: Aias00

script/shenyu_checkstyle.xml

@@ -211,7 +211,7 @@
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>
-        <module name="UnnecessaryParentheses"/>
+<!--        <module name="UnnecessaryParentheses"/>-->
         <module name="VariableDeclarationUsageDistance"/>
         <!--Checks that classes that override equals() also override hashCode()-->
         <module name="EqualsHashCode"/>

shenyu-admin-listener/shenyu-admin-listener-zookeeper/pom.xml

@@ -35,13 +35,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
+            <groupId>org.apache.shenyu</groupId>
+            <artifactId>shenyu-infra-zookeeper</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

shenyu-admin-listener/shenyu-admin-listener-zookeeper/src/main/java/org/apache/shenyu/admin/config/ZookeeperSyncConfiguration.java

@@ -17,16 +17,18 @@
 
 package org.apache.shenyu.admin.config;
 
-import org.apache.shenyu.admin.config.properties.ZookeeperConfig;
-import org.apache.shenyu.admin.config.properties.ZookeeperProperties;
 import org.apache.shenyu.admin.listener.DataChangedInit;
 import org.apache.shenyu.admin.listener.DataChangedListener;
-import org.apache.shenyu.admin.listener.zookeeper.ZookeeperClient;
 import org.apache.shenyu.admin.listener.zookeeper.ZookeeperDataChangedInit;
 import org.apache.shenyu.admin.listener.zookeeper.ZookeeperDataChangedListener;
+import org.apache.shenyu.infra.zookeeper.autoconfig.ZookeeperConfiguration;
+import org.apache.shenyu.infra.zookeeper.autoconfig.ZookeeperProperties;
+import org.apache.shenyu.infra.zookeeper.autoconfig.ConditionOnSyncZookeeper;
+import org.apache.shenyu.infra.zookeeper.client.ZookeeperClient;
+import org.apache.shenyu.infra.zookeeper.config.ZookeeperConfig;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -35,9 +37,11 @@
 /**
  * The type Zookeeper listener.
  */
+
 @Configuration
-@ConditionalOnProperty(prefix = "shenyu.sync.zookeeper", name = "url")
-@EnableConfigurationProperties(ZookeeperProperties.class)
+@ConditionOnSyncZookeeper
+@AutoConfiguration(after = {ZookeeperConfiguration.class})
+@ImportAutoConfiguration(ZookeeperConfiguration.class)
 public class ZookeeperSyncConfiguration {
 
     /**
@@ -49,14 +53,16 @@ public class ZookeeperSyncConfiguration {
     @Bean
     @ConditionalOnMissingBean(ZookeeperClient.class)
     public ZookeeperClient zookeeperClient(final ZookeeperProperties zookeeperProp) {
-        int sessionTimeout = Objects.isNull(zookeeperProp.getSessionTimeout()) ? 3000 : zookeeperProp.getSessionTimeout();
-        int connectionTimeout = Objects.isNull(zookeeperProp.getConnectionTimeout()) ? 3000 : zookeeperProp.getConnectionTimeout();
-        ZookeeperConfig zkConfig = new ZookeeperConfig(zookeeperProp.getUrl());
-        zkConfig.setSessionTimeoutMilliseconds(sessionTimeout)
-                .setConnectionTimeoutMilliseconds(connectionTimeout);
-        ZookeeperClient client = new ZookeeperClient(zkConfig);
-        client.start();
-        return client;
+
+        int sessionTimeout = Objects.isNull(zookeeperProp.getZookeeper().getSessionTimeoutMilliseconds()) ? 3000 : zookeeperProp.getZookeeper().getSessionTimeoutMilliseconds();
+        int connectionTimeout = Objects.isNull(zookeeperProp.getZookeeper().getConnectionTimeoutMilliseconds()) ? 3000 : zookeeperProp.getZookeeper().getConnectionTimeoutMilliseconds();
+
+        ZookeeperConfig zkConfig = ZookeeperConfig.builder()
+                .url(zookeeperProp.getZookeeper().getUrl())
+                .sessionTimeoutMilliseconds(sessionTimeout)
+                .connectionTimeoutMilliseconds(connectionTimeout)
+                .build();
+        return new ZookeeperClient(zkConfig);
     }
 
     /**