Remove db-discovery feature (apache#24906)

mzdbxqh · Apr 1, 2023 · 5d744d6 · 5d744d6
1 parent edbdd26
commit 5d744d6
Show file tree

Hide file tree

Showing 251 changed files with 105 additions and 11,342 deletions.
diff --git a/.github/workflows/e2e-discovery.yml b/.github/workflows/e2e-discovery.yml
diff --git a/...ngsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl b/...ngsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
@@ -55,12 +55,6 @@ import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguratio
 import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
 import org.apache.shardingsphere.sql.parser.api.CacheOption;
 </#if>
-<#if feature?contains("db-discovery")>
-import org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryRuleConfiguration;
-import org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryDataSourceRuleConfiguration;
-import org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryHeartBeatConfiguration;
-import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
-</#if>
 <#if feature?contains("mask")>
 import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
 import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration;
@@ -133,9 +127,6 @@ public final class Configuration {
     <#if transaction!="local">
         result.add(createTransactionRuleConfiguration());
     </#if>
-    <#if feature?contains("db-discovery")>
-        result.add(createDatabaseDiscoveryRuleConfiguration());
-    </#if>
     <#if feature?contains("encrypt")>
         result.add(createEncryptRuleConfiguration());
     </#if>

diff --git a/...ingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl b/...ingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl
diff --git a/...ardingsphere-example-generator/src/main/resources/template/proxy/feature/db-discovery.ftl b/...ardingsphere-example-generator/src/main/resources/template/proxy/feature/db-discovery.ftl
diff --git a/features/db-discovery/api/pom.xml b/features/db-discovery/api/pom.xml
diff --git a/.../org/apache/shardingsphere/dbdiscovery/api/config/DatabaseDiscoveryRuleConfiguration.java b/.../org/apache/shardingsphere/dbdiscovery/api/config/DatabaseDiscoveryRuleConfiguration.java
diff --git a/...rdingsphere/dbdiscovery/api/config/rule/DatabaseDiscoveryDataSourceRuleConfiguration.java b/...rdingsphere/dbdiscovery/api/config/rule/DatabaseDiscoveryDataSourceRuleConfiguration.java
diff --git a/...e/shardingsphere/dbdiscovery/api/config/rule/DatabaseDiscoveryHeartBeatConfiguration.java b/...e/shardingsphere/dbdiscovery/api/config/rule/DatabaseDiscoveryHeartBeatConfiguration.java
diff --git a/...in/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryProviderException.java b/...in/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryProviderException.java