Remove apollo in ShardingSphere driver and move to ShardingSphere plu…

…gin repository (#28585) * Remove apollo in ShardingSphere driver and move to ShardingSphere plugin repository * Remove dbcp in pom
apache · Sep 26, 2023 · 78213ea · 78213ea
1 parent 267ddcd
commit 78213ea
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 144 deletions.
diff --git a/...nt/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md b/...nt/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.cn.md
@@ -21,7 +21,6 @@ ShardingSphere-JDBC 提供了 JDBC 驱动，可以仅通过配置变更即可使
 - 配置文件加载规则：
   - `absolutepath:` 前缀表示从绝对路径中加载配置文件
   - `classpath:` 前缀表示从类路径中加载配置文件
-  - `apollo:` 前缀表示从 apollo 中加载配置文件
 
 ## 操作步骤
 
@@ -35,16 +34,6 @@ ShardingSphere-JDBC 提供了 JDBC 驱动，可以仅通过配置变更即可使
 </dependency>
 ```
 
-如果使用 apollo 配置方式，还需要引入 `apollo-client` 依赖：
-
-```xml
-<dependency>
-    <groupId>com.ctrip.framework.apollo</groupId>
-    <artifactId>apollo-client</artifactId>
-    <version>${apollo-client.version}</version>
-</dependency>
-```
-
 2. 使用驱动
 
 * 使用原生驱动：
@@ -103,8 +92,3 @@ jdbc:shardingsphere:classpath:config.yaml
 ```
 jdbc:shardingsphere:absolutepath:/path/to/config.yaml
 ```
-
-加载 apollo 指定 namespace 中的 yaml 配置文件的 JDBC URL：
-```
-jdbc:shardingsphere:apollo:TEST.test_namespace
-```
diff --git a/...nt/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md b/...nt/content/user-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/_index.en.md
@@ -21,7 +21,6 @@ ShardingSphere-JDBC provides a JDBC Driver, which can be used only through confi
 - Configuration file loading rule:
   - `absolutepath:` prefix means to load the configuration file from the absolute path
   - `classpath:` prefix indicates that the configuration file is loaded from the classpath
-  - `apollo:` prefix means to load the configuration file from apollo
 
 ## Procedure
 
@@ -35,16 +34,6 @@ ShardingSphere-JDBC provides a JDBC Driver, which can be used only through confi
 </dependency>
 ```
 
-If you use the apollo configuration method, you also need to introduce the `apollo-client` dependency:
-
-```xml
-<dependency>
-    <groupId>com.ctrip.framework.apollo</groupId>
-    <artifactId>apollo-client</artifactId>
-    <version>${apollo-client.version}</version>
-</dependency>
-```
-
 2. Use drive
 
 * Use native drivers:
@@ -103,8 +92,3 @@ Load JDBC URL of config.yaml profile in absolute path
 ```
 jdbc:shardingsphere:absolutepath:/path/to/config.yaml
 ```
-
-Load JDBC URL of the yaml configuration file in the specified namespace of apollo:
-```
-jdbc:shardingsphere:apollo:TEST.test_namespace
-```
diff --git a/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.cn.md b/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.cn.md
@@ -29,7 +29,7 @@ spring.datasource.driver-class-name=org.apache.shardingsphere.driver.ShardingSph
 spring.datasource.url=jdbc:shardingsphere:classpath:xxx.yaml
 ```
 
-`spring.datasource.url` 中的 YAML 配置文件当前支持通过三种方式获取，绝对路径 `absolutepath:`、Apollo 配置中心 `apollo:` 以及 CLASSPATH `classpath:`，具体可参考 `org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider` 的实现。
+`spring.datasource.url` 中的 YAML 配置文件当前支持通过两种方式获取，绝对路径 `absolutepath:` 以及 CLASSPATH `classpath:`，具体可参考 `org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider` 的实现。
 
 ### 使用数据源
 

diff --git a/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.en.md b/...ser-manual/shardingsphere-jdbc/yaml-config/jdbc-driver/spring-boot/_index.en.md
@@ -29,7 +29,7 @@ spring.datasource.driver-class-name=org.apache.shardingsphere.driver.ShardingSph
 spring.datasource.url=jdbc:shardingsphere:classpath:xxx.yaml
 ```
 
-The YAML configuration file in 'spring.datasource.url' currently support in three ways, the absolute path 'absolutepath:', Apollo configuration center 'apollo:', and CLASSPATH 'classpath:', which can be referred to `org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider`'s implementation for details.
+The YAML configuration file in 'spring.datasource.url' currently support in two ways, the absolute path 'absolutepath:' and CLASSPATH 'classpath:', which can be referred to `org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider`'s implementation for details.
 
 ### Use Data Source
 

diff --git a/.../shardingsphere-jdbc-example-generator/src/main/resources/template/resources/registry.ftl b/.../shardingsphere-jdbc-example-generator/src/main/resources/template/resources/registry.ftl
@@ -40,13 +40,9 @@ registry {
 }
 
 config {
-  # file、apollo、zk
+  # file、zk
   type = "file"
 
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
   zk {
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000

diff --git a/infra/common/pom.xml b/infra/common/pom.xml
@@ -83,11 +83,6 @@
             <artifactId>shardingsphere-infra-data-source-pool-hikari</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-infra-data-source-pool-dbcp</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
             <artifactId>shardingsphere-parser-sql-engine</artifactId>

diff --git a/jdbc/core/pom.xml b/jdbc/core/pom.xml
@@ -200,11 +200,5 @@
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.ctrip.framework.apollo</groupId>
-            <artifactId>apollo-client</artifactId>
-        </dependency>
-
     </dependencies>
 </project>
diff --git a/...rc/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/ApolloURLProvider.java b/...rc/main/java/org/apache/shardingsphere/driver/jdbc/core/driver/spi/ApolloURLProvider.java
diff --git a/...-INF/services/org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider b/...-INF/services/org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLProvider
@@ -17,4 +17,3 @@
 
 org.apache.shardingsphere.driver.jdbc.core.driver.spi.AbsolutePathURLProvider
 org.apache.shardingsphere.driver.jdbc.core.driver.spi.ClasspathURLProvider
-org.apache.shardingsphere.driver.jdbc.core.driver.spi.ApolloURLProvider
diff --git a/.../java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManagerTest.java b/.../java/org/apache/shardingsphere/driver/jdbc/core/driver/ShardingSphereURLManagerTest.java
@@ -17,28 +17,18 @@
 
 package org.apache.shardingsphere.driver.jdbc.core.driver;
 
-import com.ctrip.framework.apollo.ConfigFile;
-import com.ctrip.framework.apollo.ConfigService;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
 import org.apache.shardingsphere.driver.jdbc.exception.syntax.URLProviderNotFoundException;
 import org.apache.shardingsphere.test.mock.AutoMockExtension;
-import org.apache.shardingsphere.test.mock.StaticMockSettings;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(ConfigService.class)
 class ShardingSphereURLManagerTest {
 
     private final int fooDriverConfigLength = 999;
@@ -62,14 +52,4 @@ void assertToAbsolutePathConfigurationFile() {
         byte[] actual = ShardingSphereURLManager.getContent("jdbc:shardingsphere:absolutepath:" + absolutePath, urlPrefix);
         assertThat(actual.length, is(fooDriverConfigLength));
     }
-
-    @Test
-    void assertToApolloConfigurationFile() {
-        ConfigFile configFile = mock(ConfigFile.class);
-        when(configFile.getContent()).thenReturn("config content");
-        when(ConfigService.getConfigFile(anyString(), any(ConfigFileFormat.class))).thenReturn(configFile);
-        String url = "jdbc:shardingsphere:apollo:namespace";
-        byte[] content = ShardingSphereURLManager.getContent(url, urlPrefix);
-        assertThat("config content".getBytes(StandardCharsets.UTF_8), is(content));
-    }
 }
diff --git a/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf b/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf
@@ -40,13 +40,9 @@ registry {
 }
 
 config {
-  # file、apollo、zk
+  # file、zk
   type = "file"
 
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
   zk {
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000

diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,6 @@
         <curator.version>5.4.0</curator.version>
         <jetcd.version>0.7.5</jetcd.version>
         <grpc.version>1.51.0</grpc.version>
-        <apollo-client.version>1.9.0</apollo-client.version>
 
         <elasticjob.version>3.0.3</elasticjob.version>
 
@@ -111,7 +110,6 @@
         <hbase.client.version>1.7.1</hbase.client.version>
 
         <hikari-cp.version>4.0.3</hikari-cp.version>
-        <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
 
         <junit.version>5.9.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
@@ -412,12 +410,6 @@
                 <artifactId>grpc-all</artifactId>
                 <version>${grpc.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.ctrip.framework.apollo</groupId>
-                <artifactId>apollo-client</artifactId>
-                <version>${apollo-client.version}</version>
-                <scope>provided</scope>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.shardingsphere.elasticjob</groupId>
@@ -530,12 +522,6 @@
                 <version>${hikari-cp.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-dbcp2</artifactId>
-                <version>${commons-dbcp2.version}</version>
-                <scope>test</scope>
-            </dependency>
 
             <dependency>
                 <groupId>org.junit.jupiter</groupId>

diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml
@@ -142,11 +142,6 @@
             <artifactId>HikariCP</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@

		org.apache.shardingsphere.driver.jdbc.core.driver.spi.AbsolutePathURLProvider
		org.apache.shardingsphere.driver.jdbc.core.driver.spi.ClasspathURLProvider
		org.apache.shardingsphere.driver.jdbc.core.driver.spi.ApolloURLProvider