Remove ETCD register center example in orchestration example (#188)

* Remove ETCD register center example in orchestration raw example * Remove ETCD register center example in orchestration spring-boot example * Remove ETCD register center example in orchestration spring-namespace example * fix error test case for orchestration raw example * change encrypt + orchestration example test case, reason: #3352
apache · Oct 28, 2019 · 679abb1 · 679abb1
1 parent c0ab3b7
commit 679abb1
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 374 deletions.
diff --git a/...nfig-utility/src/main/java/org/apache/shardingsphere/example/type/RegistryCenterType.java b/...nfig-utility/src/main/java/org/apache/shardingsphere/example/type/RegistryCenterType.java
@@ -19,5 +19,5 @@
 
 public enum RegistryCenterType {
 
-    ZOOKEEPER, ETCD
+    ZOOKEEPER, NACOS
 }
diff --git a/.../java/org/apache/shardingsphere/example/core/jdbc/repository/OrderItemRepositoryImpl.java b/.../java/org/apache/shardingsphere/example/core/jdbc/repository/OrderItemRepositoryImpl.java
@@ -85,7 +85,7 @@ public Long insert(final OrderItem orderItem) throws SQLException {
 
     @Override
     public void delete(final Long orderItemId) throws SQLException {
-        String sql = "DELETE FROM t_order_item WHERE order_item_id=?";
+        String sql = "DELETE FROM t_order_item WHERE order_id=?";
         try (Connection connection = dataSource.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
             preparedStatement.setLong(1, orderItemId);
@@ -95,7 +95,9 @@ public void delete(final Long orderItemId) throws SQLException {
 
     @Override
     public List<OrderItem> selectAll() throws SQLException {
-        String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id";
+        // TODO Associated query with encrypt may query and decrypt failed. see https://github.com/apache/incubator-shardingsphere/issues/3352
+//        String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id";
+        String sql = "SELECT * FROM t_order_item";
         return getOrderItems(sql);
     }
 

diff --git a/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/pom.xml b/sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/pom.xml
@@ -27,14 +27,10 @@
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-jdbc-orchestration</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>io.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-orchestration-reg-nacos</artifactId>

diff --git a/...rg/apache/shardingsphere/example/orchestration/raw/jdbc/JavaConfigurationExampleMain.java b/...rg/apache/shardingsphere/example/orchestration/raw/jdbc/JavaConfigurationExampleMain.java
@@ -39,7 +39,7 @@
 /*
  * 1. Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
  * 2. Please make sure sharding-orchestration-reg-zookeeper-curator in your pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
- * 3. Please make sure sharding-orchestration-reg-etcd in your pom if registryCenterType = RegistryCenterType.ETCD.
+ * 3. 3. Please make sure sharding-orchestration-reg-nacos in your pom if registryCenterType = RegistryCenterType.NACOS.
  */
 public class JavaConfigurationExampleMain {
 
@@ -50,9 +50,8 @@ public class JavaConfigurationExampleMain {
     private static boolean loadConfigFromRegCenter = false;
 //    private static boolean loadConfigFromRegCenter = true;
 
-    //    private static RegistryCenterType registryCenterType = RegistryCenterType.ZOOKEEPER;
-    //    private static RegistryCenterType registryCenterType = RegistryCenterType.ETCD;
-    private static RegistryCenterType registryCenterType = RegistryCenterType.NACOS;
+        private static RegistryCenterType registryCenterType = RegistryCenterType.ZOOKEEPER;
+//    private static RegistryCenterType registryCenterType = RegistryCenterType.NACOS;
 
     public static void main(final String[] args) throws Exception {
         DataSource dataSource = getDataSource(shardingType, loadConfigFromRegCenter);
@@ -84,8 +83,7 @@ private static DataSource getDataSource(final ShardingType shardingType, final b
     }
 
     private static RegistryCenterConfiguration getRegistryCenterConfiguration(final RegistryCenterType registryCenterType) {
-        return RegistryCenterType.ZOOKEEPER == registryCenterType ? RegistryCenterConfigurationUtil.getZooKeeperConfiguration()
-                : RegistryCenterType.NACOS == registryCenterType ? RegistryCenterConfigurationUtil.getNacosConfiguration() : RegistryCenterConfigurationUtil.getEtcdConfiguration();
+        return RegistryCenterType.ZOOKEEPER == registryCenterType ? RegistryCenterConfigurationUtil.getZooKeeperConfiguration() : RegistryCenterConfigurationUtil.getNacosConfiguration();
     }
 
     private static ExampleService getExampleService(final DataSource dataSource) {

diff --git a/...rg/apache/shardingsphere/example/orchestration/raw/jdbc/YamlConfigurationExampleMain.java b/...rg/apache/shardingsphere/example/orchestration/raw/jdbc/YamlConfigurationExampleMain.java
@@ -35,7 +35,7 @@
 /*
  * 1. Please make sure master-slave data sync on MySQL is running correctly. Otherwise this example will query empty data from slave.
  * 2. Please make sure sharding-orchestration-reg-zookeeper-curator in your pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
- * 3. Please make sure sharding-orchestration-reg-etcd in your pom if registryCenterType = RegistryCenterType.ETCD.
+ * 3. Please make sure sharding-orchestration-reg-nacos in your pom if registryCenterType = RegistryCenterType.NACOS.
  */
 public class YamlConfigurationExampleMain {
 
@@ -46,9 +46,8 @@ public class YamlConfigurationExampleMain {
     private static boolean loadConfigFromRegCenter = false;
 //    private static boolean loadConfigFromRegCenter = true;
 
-//    private static RegistryCenterType registryCenterType = RegistryCenterType.ZOOKEEPER;
-//    private static RegistryCenterType registryCenterType = RegistryCenterType.ETCD;
-    private static RegistryCenterType registryCenterType = RegistryCenterType.NACOS;
+    private static RegistryCenterType registryCenterType = RegistryCenterType.ZOOKEEPER;
+//    private static RegistryCenterType registryCenterType = RegistryCenterType.NACOS;
 
     public static void main(final String[] args) throws Exception {
         DataSource dataSource = getDataSource(registryCenterType, loadConfigFromRegCenter, shardingType);

diff --git a/...shardingsphere/example/orchestration/raw/jdbc/config/RegistryCenterConfigurationUtil.java b/...shardingsphere/example/orchestration/raw/jdbc/config/RegistryCenterConfigurationUtil.java
@@ -27,8 +27,6 @@ public class RegistryCenterConfigurationUtil {
 
     private static final String NAMESPACE = "orchestration-java-demo";
 
-    private static final String ETCD_CONNECTION_STRING = "http://localhost:2379";
-
     private static final String NACOS_CONNECTION_STRING = "localhost:8848";
 
     private static final String NACOS_NAMESPACE = "";
@@ -40,12 +38,6 @@ public static RegistryCenterConfiguration getZooKeeperConfiguration() {
         return result;
     }
 
-    public static RegistryCenterConfiguration getEtcdConfiguration() {
-        RegistryCenterConfiguration result = new RegistryCenterConfiguration("etcd");
-        result.setServerLists(ETCD_CONNECTION_STRING);
-        return result;
-    }
-
     public static RegistryCenterConfiguration getNacosConfiguration() {
         Properties properties = new Properties();
         properties.setProperty("group", "SHARDING_SPHERE_DEFAULT_GROUP");

diff --git a/sharding-jdbc-example/orchestration-example/orchestration-spring-boot-example/pom.xml b/sharding-jdbc-example/orchestration-example/orchestration-spring-boot-example/pom.xml
@@ -21,14 +21,10 @@
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-jdbc-orchestration-spring-boot-starter</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>io.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-orchestration-reg-nacos</artifactId>

diff --git a/...ation-example/orchestration-spring-boot-example/src/main/resources/application.properties b/...ation-example/orchestration-spring-boot-example/src/main/resources/application.properties
@@ -2,20 +2,14 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 spring.jpa.properties.hibernate.show_sql=false
 
-#spring.profiles.active=local-zookeeper-sharding-databases-tables
+spring.profiles.active=local-zookeeper-sharding-databases-tables
 #spring.profiles.active=local-zookeeper-master-slave
 
-#spring.profiles.active=local-etcd-sharding-databases-tables
-#spring.profiles.active=local-etcd-master-slave
-
 #spring.profiles.active=cloud-zookeeper-sharding-databases-tables
 #spring.profiles.active=cloud-zookeeper-master-slave
 
-#spring.profiles.active=cloud-etcd-sharding-databases-tables
-#spring.profiles.active=cloud-etcd-master-slave
-
 #spring.profiles.active=local-zookeeper-encrypt
 #spring.profiles.active=cloud-zookeeper-encrypt
 
-spring.profiles.active=local-nacos-sharding-databases-tables
+#spring.profiles.active=local-nacos-sharding-databases-tables
 #spring.profiles.active=cloud-nacos-sharding-databases-tables
diff --git a/sharding-jdbc-example/orchestration-example/orchestration-spring-namespace-example/pom.xml b/sharding-jdbc-example/orchestration-example/orchestration-spring-namespace-example/pom.xml
@@ -30,14 +30,10 @@
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-jdbc-orchestration-spring-namespace</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>io.shardingsphere</groupId>-->
-            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-orchestration-reg-nacos</artifactId>

diff --git a/...in/java/org/apache/shardingsphere/example/orchestration/spring/namespace/ExampleMain.java b/...in/java/org/apache/shardingsphere/example/orchestration/spring/namespace/ExampleMain.java
@@ -36,7 +36,6 @@ public class ExampleMain {
 //    private static boolean loadConfigFromRegCenter = true;
 
 //    private static RegistryCenterType registryCenterType = RegistryCenterType.ZOOKEEPER;
-//    private static RegistryCenterType registryCenterType = RegistryCenterType.ETCD;
     private static RegistryCenterType registryCenterType = RegistryCenterType.NACOS;
 
     public static void main(final String[] args) throws SQLException {

diff --git a/...-example/src/main/resources/META-INF/etcd/cloud/application-sharding-databases-tables.xml b/...-example/src/main/resources/META-INF/etcd/cloud/application-sharding-databases-tables.xml
diff --git a/...pace-example/src/main/resources/META-INF/etcd/cloud/application-sharding-master-slave.xml b/...pace-example/src/main/resources/META-INF/etcd/cloud/application-sharding-master-slave.xml