You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/06/12 08:08:10 UTC
[shardingsphere] branch master updated: Refactor ExportableRule (#18310)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7e7f396f35a Refactor ExportableRule (#18310)
7e7f396f35a is described below
commit 7e7f396f35ad5871991e02ba9ae6287c137a8639
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jun 12 16:07:57 2022 +0800
Refactor ExportableRule (#18310)
---
.../dbdiscovery/rule/DatabaseDiscoveryRule.java | 11 +++++------
.../dbdiscovery/rule/DatabaseDiscoveryRuleTest.java | 2 +-
.../fixture/DatabaseDiscoveryRuleExportableFixture.java | 9 ++-------
.../fixture/ReadwriteSplittingRuleExportableFixture.java | 9 ++++-----
.../readwritesplitting/rule/ReadwriteSplittingRule.java | 11 +++++------
.../fixture/DatabaseDiscoveryRuleExportableFixture.java | 9 ++-------
.../fixture/ReadwriteSplittingRuleExportableFixture.java | 9 ++++-----
.../infra/rule/identifier/type/exportable/ExportableRule.java | 7 +++----
.../rule/identifier/type/exportable/RuleExportEngine.java | 11 +++--------
.../shardingsphere/singletable/rule/SingleTableRule.java | 7 +++----
.../text/distsql/rql/SchemaRulesCountResultSetTest.java | 2 +-
11 files changed, 33 insertions(+), 54 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
index 1b3d760460f..7e4b5feab39 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
@@ -27,19 +27,19 @@ import org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDiscoveryHe
import org.apache.shardingsphere.dbdiscovery.factory.DatabaseDiscoveryProviderAlgorithmFactory;
import org.apache.shardingsphere.dbdiscovery.heartbeat.HeartbeatJob;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
-import org.apache.shardingsphere.infra.datasource.strategy.DynamicDataSourceStrategyFactory;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
+import org.apache.shardingsphere.infra.datasource.strategy.DynamicDataSourceStrategyFactory;
import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.rule.event.DataSourceStatusChangedEvent;
import org.apache.shardingsphere.infra.rule.identifier.scope.SchemaRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
-import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.infra.rule.identifier.type.InstanceAwareRule;
import org.apache.shardingsphere.infra.rule.identifier.type.StatusContainedRule;
+import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
-import org.apache.shardingsphere.mode.metadata.storage.event.StorageNodeDataSourceChangedEvent;
import org.apache.shardingsphere.mode.metadata.storage.event.PrimaryDataSourceChangedEvent;
+import org.apache.shardingsphere.mode.metadata.storage.event.StorageNodeDataSourceChangedEvent;
import org.apache.shardingsphere.schedule.core.api.CronJob;
import org.apache.shardingsphere.schedule.core.api.ModeScheduleContext;
import org.apache.shardingsphere.schedule.core.api.ModeScheduleContextFactory;
@@ -53,7 +53,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Properties;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
@@ -171,8 +170,8 @@ public final class DatabaseDiscoveryRule implements SchemaRule, DataSourceContai
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, this::exportPrimaryDataSourceMap);
+ public Map<String, Object> getExportData() {
+ return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, exportPrimaryDataSourceMap());
}
private Map<String, String> exportPrimaryDataSourceMap() {
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
index f764c9e64d1..66b4e076fb3 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
@@ -77,7 +77,7 @@ public final class DatabaseDiscoveryRuleTest {
@Test
public void assertGetExportedMethods() {
DatabaseDiscoveryRule databaseDiscoveryRule = createRule();
- assertThat(databaseDiscoveryRule.getExportData().get(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES).get(), is(Collections.singletonMap("test_pr", "primary")));
+ assertThat(databaseDiscoveryRule.getExportData().get(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES), is(Collections.singletonMap("test_pr", "primary")));
}
private DatabaseDiscoveryRule createRule() {
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DatabaseDiscoveryR [...]
index 51d6b3ae721..f7ac5092dfb 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.infra.rule.identifier.type.exportable.Exportabl
import java.util.Collections;
import java.util.Map;
-import java.util.function.Supplier;
public final class DatabaseDiscoveryRuleExportableFixture implements ExportableRule {
@@ -32,11 +31,7 @@ public final class DatabaseDiscoveryRuleExportableFixture implements ExportableR
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, this::exportedMethod);
- }
-
- private Map<String, String> exportedMethod() {
- return Collections.singletonMap("ms_group", "ds_0");
+ public Map<String, Object> getExportData() {
+ return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, Collections.singletonMap("ms_group", "ds_0"));
}
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/ReadwriteSplittin [...]
index f7cc3ce0a40..27a53541d42 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.function.Supplier;
public final class ReadwriteSplittingRuleExportableFixture implements ExportableRule {
@@ -35,10 +34,10 @@ public final class ReadwriteSplittingRuleExportableFixture implements Exportable
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- Map<String, Supplier<Object>> result = new HashMap<>(4, 1);
- result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, this::exportDynamicDataSources);
- result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, this::exportStaticDataSources);
+ public Map<String, Object> getExportData() {
+ Map<String, Object> result = new HashMap<>(4, 1);
+ result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, exportDynamicDataSources());
+ result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, exportStaticDataSources());
return result;
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index 4880098c8c3..9ab196ba1e6 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.distsql.constant.ExportableItemConstants;
import org.apache.shardingsphere.infra.rule.event.DataSourceStatusChangedEvent;
import org.apache.shardingsphere.infra.rule.identifier.scope.SchemaRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
-import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.infra.rule.identifier.type.StatusContainedRule;
+import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.mode.metadata.storage.StorageNodeStatus;
import org.apache.shardingsphere.mode.metadata.storage.event.StorageNodeDataSourceChangedEvent;
import org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmProvidedReadwriteSplittingRuleConfiguration;
@@ -42,7 +42,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
-import java.util.function.Supplier;
/**
* Readwrite-splitting rule.
@@ -119,10 +118,10 @@ public final class ReadwriteSplittingRule implements SchemaRule, DataSourceConta
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- Map<String, Supplier<Object>> result = new HashMap<>(2, 1);
- result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, this::exportDynamicDataSources);
- result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, this::exportStaticDataSources);
+ public Map<String, Object> getExportData() {
+ Map<String, Object> result = new HashMap<>(2, 1);
+ result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, exportDynamicDataSources());
+ result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, exportStaticDataSources());
return result;
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readw [...]
index 94d7cfc542f..da9aaecb7a2 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/DatabaseDiscoveryRuleExportableFixture.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.infra.rule.identifier.type.exportable.Exportabl
import java.util.Collections;
import java.util.Map;
-import java.util.function.Supplier;
public final class DatabaseDiscoveryRuleExportableFixture implements ExportableRule {
@@ -32,11 +31,7 @@ public final class DatabaseDiscoveryRuleExportableFixture implements ExportableR
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, this::exportedMethod);
- }
-
- private Map<String, String> exportedMethod() {
- return Collections.singletonMap("ms_group", "ds_0");
+ public Map<String, Object> getExportData() {
+ return Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, Collections.singletonMap("ms_group", "ds_0"));
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/read [...]
index 6c3df2d075d..fa4dc193fd5 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/fixture/ReadwriteSplittingRuleExportableFixture.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.infra.rule.identifier.type.exportable.Exportabl
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.function.Supplier;
public final class ReadwriteSplittingRuleExportableFixture implements ExportableRule {
@@ -34,10 +33,10 @@ public final class ReadwriteSplittingRuleExportableFixture implements Exportable
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- Map<String, Supplier<Object>> result = new HashMap<>(4, 1);
- result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, this::exportDynamicDataSources);
- result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, this::exportStaticDataSources);
+ public Map<String, Object> getExportData() {
+ Map<String, Object> result = new HashMap<>(4, 1);
+ result.put(ExportableConstants.EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE, exportDynamicDataSources());
+ result.put(ExportableConstants.EXPORT_STATIC_READWRITE_SPLITTING_RULE, exportStaticDataSources());
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/ExportableRule.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/ExportableRule.java
index 1f51f7100db..ea7e50f79a4 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/ExportableRule.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/ExportableRule.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.infra.rule.identifier.type.exportable;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Map;
-import java.util.function.Supplier;
/**
* Exportable rule.
@@ -28,9 +27,9 @@ import java.util.function.Supplier;
public interface ExportableRule extends ShardingSphereRule {
/**
- * The methods that the rule can supply.
+ * Get export data.
*
- * @return export method supplier
+ * @return exported data
*/
- Map<String, Supplier<Object>> getExportData();
+ Map<String, Object> getExportData();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/RuleExportEngine.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/RuleExportEngine.java
index 1294b88c461..ab84506bfb9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/RuleExportEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/exportable/RuleExportEngine.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import java.util.function.Supplier;
/**
* Rule export engine.
@@ -40,11 +39,11 @@ public final class RuleExportEngine {
* @return data map
*/
public Map<String, Object> export(final Collection<String> keys) {
- Map<String, Supplier<Object>> exportMethods = rule.getExportData();
+ Map<String, Object> exportMethods = rule.getExportData();
Map<String, Object> result = new HashMap<>(keys.size(), 1);
keys.forEach(each -> {
if (exportMethods.containsKey(each)) {
- result.put(each, exportMethods.get(each).get());
+ result.put(each, exportMethods.get(each));
}
});
return result;
@@ -57,11 +56,7 @@ public final class RuleExportEngine {
* @return data
*/
public Optional<Object> export(final String key) {
- Map<String, Supplier<Object>> exportMethods = rule.getExportData();
- if (exportMethods.containsKey(key)) {
- return Optional.ofNullable(exportMethods.get(key).get());
- }
- return Optional.empty();
+ return Optional.ofNullable(rule.getExportData().get(key));
}
/**
diff --git a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java
index 6a639b83ba5..33167c78c9b 100644
--- a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java
+++ b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java
@@ -29,9 +29,9 @@ import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.scope.SchemaRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
-import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
+import org.apache.shardingsphere.infra.rule.identifier.type.exportable.ExportableRule;
import org.apache.shardingsphere.singletable.config.SingleTableRuleConfiguration;
import org.apache.shardingsphere.singletable.datanode.SingleTableDataNodeLoader;
@@ -46,7 +46,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.TreeSet;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
@@ -268,7 +267,7 @@ public final class SingleTableRule implements SchemaRule, DataNodeContainedRule,
}
@Override
- public Map<String, Supplier<Object>> getExportData() {
- return Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES, tableNames::keySet);
+ public Map<String, Object> getExportData() {
+ return Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES, tableNames.keySet());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/SchemaRulesCountResultSetTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/SchemaRulesCountResultSetTest.java
index 1c8bf5fb919..bb4551182e5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/SchemaRulesCountResultSetTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/SchemaRulesCountResultSetTest.java
@@ -74,7 +74,7 @@ public final class SchemaRulesCountResultSetTest {
private SingleTableRule mockSingleTableRule() {
SingleTableRule result = mock(SingleTableRule.class);
- when(result.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES, () -> Arrays.asList("single_table_1", "single_table_2")));
+ when(result.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES, Arrays.asList("single_table_1", "single_table_2")));
return result;
}