This is an automated email from the ASF dual-hosted git repository.

panjuan 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 1be781b  Rename YamlProxyRuleConfiguration to 
YamlProxySchemaConfiguration (#14628)
1be781b is described below

commit 1be781b7b770ad86c39c769844220e26bf85133c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 9 13:26:40 2022 +0800

    Rename YamlProxyRuleConfiguration to YamlProxySchemaConfiguration (#14628)
---
 .../proxy/config/ProxyConfigurationLoader.java     | 25 ++++++++-------
 .../proxy/config/YamlProxyConfiguration.java       |  4 +--
 ...tion.java => YamlProxySchemaConfiguration.java} |  4 +--
 .../swapper/YamlProxyConfigurationSwapper.java     | 16 +++++-----
 .../proxy/config/ProxyConfigurationLoaderTest.java | 16 +++++-----
 .../swapper/YamlProxyConfigurationSwapperTest.java | 37 ++++++++--------------
 6 files changed, 47 insertions(+), 55 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
index 6be086f..3a5a3fa 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
@@ -24,7 +24,7 @@ import lombok.SneakyThrows;
 import 
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRuleConfiguration;
 import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
-import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
+import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
 
 import java.io.File;
@@ -47,7 +47,7 @@ public final class ProxyConfigurationLoader {
     
     private static final String SERVER_CONFIG_FILE = "server.yaml";
     
-    private static final Pattern RULE_CONFIG_FILE_PATTERN = 
Pattern.compile("config-.+\\.yaml");
+    private static final Pattern SCHEMA_CONFIG_FILE_PATTERN = 
Pattern.compile("config-.+\\.yaml");
     
     /**
      * Load configuration of ShardingSphere-Proxy.
@@ -59,9 +59,9 @@ public final class ProxyConfigurationLoader {
     public static YamlProxyConfiguration load(final String path) throws 
IOException {
         YamlProxyServerConfiguration serverConfig = 
loadServerConfiguration(getResourceFile(String.join("/", path, 
SERVER_CONFIG_FILE)));
         File configPath = getResourceFile(path);
-        Collection<YamlProxyRuleConfiguration> ruleConfigs = 
loadRuleConfigurations(configPath);
-        return new YamlProxyConfiguration(serverConfig, 
ruleConfigs.stream().collect(Collectors.toMap(
-                YamlProxyRuleConfiguration::getSchemaName, each -> each, 
(oldValue, currentValue) -> oldValue, LinkedHashMap::new)));
+        Collection<YamlProxySchemaConfiguration> schemaConfigs = 
loadSchemaConfigurations(configPath);
+        return new YamlProxyConfiguration(serverConfig, 
schemaConfigs.stream().collect(Collectors.toMap(
+                YamlProxySchemaConfiguration::getSchemaName, each -> each, 
(oldValue, currentValue) -> oldValue, LinkedHashMap::new)));
     }
 
     @SneakyThrows(URISyntaxException.class)
@@ -80,20 +80,21 @@ public final class ProxyConfigurationLoader {
         return result;
     }
     
-    private static Collection<YamlProxyRuleConfiguration> 
loadRuleConfigurations(final File configPath) throws IOException {
+    private static Collection<YamlProxySchemaConfiguration> 
loadSchemaConfigurations(final File configPath) throws IOException {
         Collection<String> loadedSchemaNames = new HashSet<>();
-        Collection<YamlProxyRuleConfiguration> result = new LinkedList<>();
+        Collection<YamlProxySchemaConfiguration> result = new LinkedList<>();
         for (File each : findRuleConfigurationFiles(configPath)) {
-            loadRuleConfiguration(each).ifPresent(yamlProxyRuleConfig -> {
-                
Preconditions.checkState(loadedSchemaNames.add(yamlProxyRuleConfig.getSchemaName()),
 "Schema name `%s` must unique at all rule configurations.", 
yamlProxyRuleConfig.getSchemaName());
+            loadSchemaConfiguration(each).ifPresent(yamlProxyRuleConfig -> {
+                Preconditions.checkState(
+                        
loadedSchemaNames.add(yamlProxyRuleConfig.getSchemaName()), "Schema name `%s` 
must unique at all schema configurations.", 
yamlProxyRuleConfig.getSchemaName());
                 result.add(yamlProxyRuleConfig);
             });
         }
         return result;
     }
     
-    private static Optional<YamlProxyRuleConfiguration> 
loadRuleConfiguration(final File yamlFile) throws IOException {
-        YamlProxyRuleConfiguration result = YamlEngine.unmarshal(yamlFile, 
YamlProxyRuleConfiguration.class);
+    private static Optional<YamlProxySchemaConfiguration> 
loadSchemaConfiguration(final File yamlFile) throws IOException {
+        YamlProxySchemaConfiguration result = YamlEngine.unmarshal(yamlFile, 
YamlProxySchemaConfiguration.class);
         if (null == result) {
             return Optional.empty();
         }
@@ -103,6 +104,6 @@ public final class ProxyConfigurationLoader {
     }
     
     private static File[] findRuleConfigurationFiles(final File path) {
-        return path.listFiles(each -> 
RULE_CONFIG_FILE_PATTERN.matcher(each.getName()).matches());
+        return path.listFiles(each -> 
SCHEMA_CONFIG_FILE_PATTERN.matcher(each.getName()).matches());
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
index e80ac2e..23d2c1e 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.config;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
+import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
 
 import java.util.Map;
@@ -33,5 +33,5 @@ public final class YamlProxyConfiguration {
     
     private final YamlProxyServerConfiguration serverConfiguration;
     
-    private final Map<String, YamlProxyRuleConfiguration> ruleConfigurations;
+    private final Map<String, YamlProxySchemaConfiguration> 
schemaConfigurations;
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxySchemaConfiguration.java
similarity index 91%
rename from 
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
rename to 
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxySchemaConfiguration.java
index 3f67d13..820c20b 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxySchemaConfiguration.java
@@ -28,11 +28,11 @@ import java.util.LinkedList;
 import java.util.Map;
 
 /**
- * YAML rule configuration for ShardingSphere-Proxy.
+ * YAML schema configuration for ShardingSphere-Proxy.
  */
 @Getter
 @Setter
-public final class YamlProxyRuleConfiguration implements YamlConfiguration {
+public final class YamlProxySchemaConfiguration implements YamlConfiguration {
     
     private String schemaName;
     
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
index 030baf6..2172963 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
@@ -23,7 +23,7 @@ import 
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfiguration
 import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
 import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
 import 
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfigurationConverter;
-import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
+import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -44,21 +44,21 @@ public final class YamlProxyConfigurationSwapper {
      * @return proxy configuration
      */
     public ProxyConfiguration swap(final YamlProxyConfiguration yamlConfig) {
-        Map<String, Map<String, ProxyResourceConfiguration>> 
schemaResourceConfigs = 
getResourceConfigurationMap(yamlConfig.getRuleConfigurations());
-        Map<String, Collection<RuleConfiguration>> schemaRules = 
getRuleConfigurations(yamlConfig.getRuleConfigurations());
+        Map<String, Map<String, ProxyResourceConfiguration>> 
schemaResourceConfigs = 
getResourceConfigurationMap(yamlConfig.getSchemaConfigurations());
+        Map<String, Collection<RuleConfiguration>> schemaConfigs = 
getSchemaConfigurations(yamlConfig.getSchemaConfigurations());
         Collection<RuleConfiguration> globalRules = new 
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(yamlConfig.getServerConfiguration().getRules());
         Properties props = yamlConfig.getServerConfiguration().getProps();
-        return new ProxyConfiguration(schemaResourceConfigs, schemaRules, 
globalRules, props, yamlConfig.getServerConfiguration().getLabels());
+        return new ProxyConfiguration(schemaResourceConfigs, schemaConfigs, 
globalRules, props, yamlConfig.getServerConfiguration().getLabels());
     }
     
-    private Map<String, Collection<RuleConfiguration>> 
getRuleConfigurations(final Map<String, YamlProxyRuleConfiguration> 
yamlRuleConfigurations) {
+    private Map<String, Collection<RuleConfiguration>> 
getSchemaConfigurations(final Map<String, YamlProxySchemaConfiguration> 
yamlSchemaConfigs) {
         YamlRuleConfigurationSwapperEngine swapperEngine = new 
YamlRuleConfigurationSwapperEngine();
-        return 
yamlRuleConfigurations.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
 
+        return 
yamlSchemaConfigs.entrySet().stream().collect(Collectors.toMap(Entry::getKey, 
             entry -> 
swapperEngine.swapToRuleConfigurations(entry.getValue().getRules()), (oldValue, 
currentValue) -> oldValue, LinkedHashMap::new));
     }
     
-    private Map<String, Map<String, ProxyResourceConfiguration>> 
getResourceConfigurationMap(final Map<String, YamlProxyRuleConfiguration> 
yamlRuleConfigurations) {
-        return yamlRuleConfigurations.entrySet().stream().collect(
+    private Map<String, Map<String, ProxyResourceConfiguration>> 
getResourceConfigurationMap(final Map<String, YamlProxySchemaConfiguration> 
yamlSchemaConfigs) {
+        return yamlSchemaConfigs.entrySet().stream().collect(
                 Collectors.toMap(Entry::getKey, entry -> 
ProxyResourceConfigurationConverter.getResourceConfigurationMap(entry.getValue().getDataSources()),
                     (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
     }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
index 9c5b3c7..64ffb7f 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
@@ -21,7 +21,7 @@ import 
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguratio
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRuleConfiguration;
 import 
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxyResourceConfiguration;
-import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
+import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
 import 
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
 import 
org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
@@ -47,13 +47,13 @@ public final class ProxyConfigurationLoaderTest {
         // TODO assert mode
         // TODO assert authority rule
         actualGlobalRules.next();
-        assertThat(actual.getRuleConfigurations().size(), is(3));
-        
assertShardingRuleConfiguration(actual.getRuleConfigurations().get("sharding_db"));
-        
assertReadwriteSplittingRuleConfiguration(actual.getRuleConfigurations().get("readwrite_splitting_db"));
-        
assertEncryptRuleConfiguration(actual.getRuleConfigurations().get("encrypt_db"));
+        assertThat(actual.getSchemaConfigurations().size(), is(3));
+        
assertShardingRuleConfiguration(actual.getSchemaConfigurations().get("sharding_db"));
+        
assertReadwriteSplittingRuleConfiguration(actual.getSchemaConfigurations().get("readwrite_splitting_db"));
+        
assertEncryptRuleConfiguration(actual.getSchemaConfigurations().get("encrypt_db"));
     }
     
-    private void assertShardingRuleConfiguration(final 
YamlProxyRuleConfiguration actual) {
+    private void assertShardingRuleConfiguration(final 
YamlProxySchemaConfiguration actual) {
         assertThat(actual.getSchemaName(), is("sharding_db"));
         assertThat(actual.getDataSources().size(), is(2));
         assertResourceConfiguration(actual.getDataSources().get("ds_0"), 
"jdbc:mysql://127.0.0.1:3306/ds_0");
@@ -76,7 +76,7 @@ public final class ProxyConfigurationLoaderTest {
         assertNotNull(actual.getDefaultDatabaseStrategy().getNone());
     }
     
-    private void assertReadwriteSplittingRuleConfiguration(final 
YamlProxyRuleConfiguration actual) {
+    private void assertReadwriteSplittingRuleConfiguration(final 
YamlProxySchemaConfiguration actual) {
         assertThat(actual.getSchemaName(), is("readwrite_splitting_db"));
         assertThat(actual.getDataSources().size(), is(3));
         assertResourceConfiguration(actual.getDataSources().get("write_ds"), 
"jdbc:mysql://127.0.0.1:3306/write_ds");
@@ -102,7 +102,7 @@ public final class ProxyConfigurationLoaderTest {
         assertThat(replicaDataSourceNames.next(), is("read_ds_1"));
     }
     
-    private void assertEncryptRuleConfiguration(final 
YamlProxyRuleConfiguration actual) {
+    private void assertEncryptRuleConfiguration(final 
YamlProxySchemaConfiguration actual) {
         assertThat(actual.getSchemaName(), is("encrypt_db"));
         assertThat(actual.getDataSources().size(), is(1));
         assertResourceConfiguration(actual.getDataSources().get("ds_0"), 
"jdbc:mysql://127.0.0.1:3306/encrypt_ds");
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
index db936ef..215972d 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
@@ -20,16 +20,15 @@ package org.apache.shardingsphere.proxy.config.yaml.swapper;
 import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
 import 
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import 
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
 import org.apache.shardingsphere.infra.metadata.user.Grantee;
 import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
 import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
-import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRuleConfiguration;
 import 
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
 import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
 import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
+import 
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxyResourceConfiguration;
-import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
+import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
 import 
org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
 import 
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
 import 
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
@@ -38,7 +37,6 @@ import org.junit.Test;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
@@ -121,9 +119,9 @@ public final class YamlProxyConfigurationSwapperTest {
         YamlProxyServerConfiguration yamlProxyServerConfig = 
getYamlProxyServerConfiguration(result);
         mockAuthentication(yamlProxyServerConfig);
         mockProps(yamlProxyServerConfig);
-        YamlProxyRuleConfiguration yamlProxyRuleConfig = 
mockRuleConfigurations(result);
-        mockDataSources(yamlProxyRuleConfig);
-        mockRules(yamlProxyRuleConfig);
+        YamlProxySchemaConfiguration yamlProxySchemaConfig = 
mockSchemaConfigurations(result);
+        mockResources(yamlProxySchemaConfig);
+        
when(yamlProxySchemaConfig.getRules()).thenReturn(Collections.singletonList(new 
YamlReadwriteSplittingRuleConfiguration()));
         return result;
     }
     
@@ -133,15 +131,15 @@ public final class YamlProxyConfigurationSwapperTest {
         when(yamlProxyServerConfig.getProps()).thenReturn(props);
     }
     
-    private YamlProxyRuleConfiguration mockRuleConfigurations(final 
YamlProxyConfiguration yamlProxyConfig) {
-        Map<String, YamlProxyRuleConfiguration> yamlProxyRuleConfigMap = new 
HashMap<>(1, 1);
-        
when(yamlProxyConfig.getRuleConfigurations()).thenReturn(yamlProxyRuleConfigMap);
-        YamlProxyRuleConfiguration result = 
mock(YamlProxyRuleConfiguration.class);
-        yamlProxyRuleConfigMap.put("yamlProxyRule1", result);
+    private YamlProxySchemaConfiguration mockSchemaConfigurations(final 
YamlProxyConfiguration yamlProxyConfig) {
+        Map<String, YamlProxySchemaConfiguration> yamlSchemaConfigs = new 
HashMap<>(1, 1);
+        
when(yamlProxyConfig.getSchemaConfigurations()).thenReturn(yamlSchemaConfigs);
+        YamlProxySchemaConfiguration result = 
mock(YamlProxySchemaConfiguration.class);
+        yamlSchemaConfigs.put("yamlProxyRule1", result);
         return result;
     }
     
-    private void mockDataSources(final YamlProxyRuleConfiguration 
yamlProxyRuleConfig) {
+    private void mockResources(final YamlProxySchemaConfiguration 
yamlProxySchemaConfig) {
         YamlProxyResourceConfiguration yamlResourceConfig = new 
YamlProxyResourceConfiguration();
         yamlResourceConfig.setUrl("url1");
         yamlResourceConfig.setUsername("username1");
@@ -152,16 +150,9 @@ public final class YamlProxyConfigurationSwapperTest {
         yamlResourceConfig.setMaxPoolSize(4);
         yamlResourceConfig.setMinPoolSize(5);
         yamlResourceConfig.setReadOnly(true);
-        Map<String, YamlProxyResourceConfiguration> yamlResourceMap = new 
HashMap<>(1, 1);
-        yamlResourceMap.put("ds1", yamlResourceConfig);
-        when(yamlProxyRuleConfig.getDataSources()).thenReturn(yamlResourceMap);
-    }
-    
-    private void mockRules(final YamlProxyRuleConfiguration 
yamlProxyRuleConfig) {
-        Collection<YamlRuleConfiguration> rules = new LinkedList<>();
-        YamlRuleConfiguration testRuleConfig = new 
YamlReadwriteSplittingRuleConfiguration();
-        rules.add(testRuleConfig);
-        when(yamlProxyRuleConfig.getRules()).thenReturn(rules);
+        Map<String, YamlProxyResourceConfiguration> yamlResources = new 
HashMap<>(1, 1);
+        yamlResources.put("ds1", yamlResourceConfig);
+        when(yamlProxySchemaConfig.getDataSources()).thenReturn(yamlResources);
     }
     
     private void mockAuthentication(final YamlProxyServerConfiguration 
yamlProxyServerConfig) {

Reply via email to