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 2b1edcf8086 Remove useless @Builder of ContextManagerBuilderParameter
(#18590)
2b1edcf8086 is described below
commit 2b1edcf80866fce3951447ae742b21ed7327b072
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jun 25 23:19:52 2022 +0800
Remove useless @Builder of ContextManagerBuilderParameter (#18590)
---
.../core/datasource/ShardingSphereDataSource.java | 10 +-
.../manager/ContextManagerBuilderParameter.java | 12 +-
.../ContextManagerBuilderParameterTest.java | 126 +++------------------
.../ClusterContextManagerCoordinatorTest.java | 13 ++-
.../StandaloneContextManagerBuilderTextTest.java | 27 +++--
.../proxy/initializer/BootstrapInitializer.java | 10 +-
6 files changed, 56 insertions(+), 142 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 8af1987411d..161cf3e817c 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -75,12 +75,10 @@ public final class ShardingSphereDataSource extends
AbstractDataSourceAdapter im
private ContextManager createContextManager(final String databaseName,
final ModeConfiguration modeConfig, final Map<String, DataSource> dataSourceMap,
final
Collection<RuleConfiguration> ruleConfigs, final Properties props) throws
SQLException {
- ContextManagerBuilderParameter parameter =
ContextManagerBuilderParameter.builder()
- .modeConfig(modeConfig)
- .databaseConfigs(Collections.singletonMap(databaseName, new
DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs)))
- .globalRuleConfigs(ruleConfigs.stream().filter(each -> each
instanceof GlobalRuleConfiguration).collect(Collectors.toList()))
- .props(props)
- .instanceDefinition(new InstanceDefinition(InstanceType.JDBC,
InstanceIdGeneratorFactory.getInstance(modeConfig).generate(InstanceType.JDBC))).build();
+ InstanceDefinition instanceDefinition = new
InstanceDefinition(InstanceType.JDBC,
InstanceIdGeneratorFactory.getInstance(modeConfig).generate(InstanceType.JDBC));
+ Collection<RuleConfiguration> globalRuleConfigs =
ruleConfigs.stream().filter(each -> each instanceof
GlobalRuleConfiguration).collect(Collectors.toList());
+ ContextManagerBuilderParameter parameter = new
ContextManagerBuilderParameter(modeConfig,
Collections.singletonMap(databaseName,
+ new DataSourceProvidedDatabaseConfiguration(dataSourceMap,
ruleConfigs)), globalRuleConfigs, props, Collections.emptyList(),
instanceDefinition);
return
ContextManagerBuilderFactory.getInstance(modeConfig).build(parameter);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
index 1014ce26c8a..b437c20408b 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.mode.manager;
-import lombok.Builder;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
+import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.definition.InstanceDefinition;
import java.util.Collection;
@@ -31,7 +31,7 @@ import java.util.Properties;
/**
* Context manager builder parameter.
*/
-@Builder
+@RequiredArgsConstructor
@Getter
public final class ContextManagerBuilderParameter {
@@ -48,12 +48,12 @@ public final class ContextManagerBuilderParameter {
private final InstanceDefinition instanceDefinition;
/**
- * Whether is empty or not.
+ * Whether parameter is empty.
*
- * @return is empty or not
+ * @return parameter is empty or not
*/
public boolean isEmpty() {
- return props.isEmpty() && globalRuleConfigs.isEmpty()
+ return globalRuleConfigs.isEmpty() && props.isEmpty()
&& databaseConfigs.entrySet().stream().allMatch(entry ->
entry.getValue().getDataSources().isEmpty() &&
entry.getValue().getRuleConfigurations().isEmpty());
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
index 99421bfa00f..298ba24e9fe 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
@@ -28,136 +28,46 @@ import java.util.Properties;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public final class ContextManagerBuilderParameterTest {
@Test
- public void assertIsEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(true, true);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertTrue(contextManagerBuilderParameter.isEmpty());
+ public void assertIsEmptyWithoutAllParameters() {
+ assertTrue(new ContextManagerBuilderParameter(null,
Collections.emptyMap(), Collections.emptyList(), new Properties(), null,
null).isEmpty());
}
@Test
- public void assertIsEmptyWhenAllFieldIsEmpty() {
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(Collections.emptyMap())
- .build();
- assertTrue(contextManagerBuilderParameter.isEmpty());
+ public void assertIsEmptyWithDatabaseAndWithoutConfigurations() {
+ assertTrue(new ContextManagerBuilderParameter(null,
mockDatabaseConfigurations(true, true), Collections.emptyList(), new
Properties(), null, null).isEmpty());
}
@Test
- public void assertIsEmptyWhenAllFieldIsNotEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(false, false);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
+ public void assertIsNotEmptyWhenGlobalRuleIsNotEmpty() {
+ assertFalse(new ContextManagerBuilderParameter(null,
Collections.emptyMap(), Collections.singleton(mock(RuleConfiguration.class)),
new Properties(), null, null).isEmpty());
}
@Test
- public void assertIsEmptyWhenPropsIsNotEmpty() {
- Properties props = createProperties();
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(props)
- .databaseConfigs(Collections.emptyMap())
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
+ public void assertIsNotEmptyWhenPropsIsNotEmpty() {
+ assertFalse(new ContextManagerBuilderParameter(null,
Collections.emptyMap(), Collections.emptyList(), createProperties(), null,
null).isEmpty());
}
@Test
- public void assertIsEmptyWhenGlobalRuleConfigsIsNotEmpty() {
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
-
.globalRuleConfigs(Collections.singleton(mock(RuleConfiguration.class)))
- .props(new Properties())
- .databaseConfigs(Collections.emptyMap())
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
+ public void assertIsEmptyWhenDataSourceIsNotEmpty() {
+ assertFalse(new ContextManagerBuilderParameter(null,
mockDatabaseConfigurations(false, true), Collections.emptyList(), new
Properties(), null, null).isEmpty());
}
@Test
- public void assertIsEmptyWhenSchemaConfigsIsNotEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(false, false);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
+ public void assertIsEmptyWhenDatabaseRuleIsNotEmpty() {
+ assertFalse(new ContextManagerBuilderParameter(null,
mockDatabaseConfigurations(true, false), Collections.emptyList(), new
Properties(), null, null).isEmpty());
}
- @Test
- public void assertIsEmptyWhenDataSourcesIsNotEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(false, true);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
- }
-
- @Test
- public void assertIsEmptyWhenRuleConfigurationsIsNotEmpty() {
- Map<String, DatabaseConfiguration> databaseConfigs =
mockSchemaConfigurations(true, false);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(new Properties())
- .databaseConfigs(databaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
- }
-
- @Test
- public void assertIsEmptyWhenOnlyPropsIsEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(true, true);
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
-
.globalRuleConfigs(Collections.singleton(mock(RuleConfiguration.class)))
- .props(new Properties())
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
- }
-
- @Test
- public void assertIsEmptyWhenOnlyGlobalRuleConfigsIsEmpty() {
- Map<String, DatabaseConfiguration> mockDatabaseConfigs =
mockSchemaConfigurations(true, true);
- Properties props = createProperties();
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
- .globalRuleConfigs(Collections.emptyList())
- .props(props)
- .databaseConfigs(mockDatabaseConfigs)
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
- }
-
- @Test
- public void assertIsEmptyWhenOnlySchemaConfigsIsEmpty() {
- Properties props = createProperties();
- ContextManagerBuilderParameter contextManagerBuilderParameter =
ContextManagerBuilderParameter.builder()
-
.globalRuleConfigs(Collections.singleton(mock(RuleConfiguration.class)))
- .props(props)
- .databaseConfigs(Collections.emptyMap())
- .build();
- assertFalse(contextManagerBuilderParameter.isEmpty());
- }
-
- private Map<String, DatabaseConfiguration> mockSchemaConfigurations(final
boolean dataSourcesIsEmpty, final boolean ruleConfigurationsIsEmpty) {
- DatabaseConfiguration result = mock(DatabaseConfiguration.class,
RETURNS_DEEP_STUBS);
-
lenient().when(result.getDataSources().isEmpty()).thenReturn(dataSourcesIsEmpty);
-
lenient().when(result.getRuleConfigurations().isEmpty()).thenReturn(ruleConfigurationsIsEmpty);
- return Collections.singletonMap("logic", result);
+ private Map<String, DatabaseConfiguration>
mockDatabaseConfigurations(final boolean isEmptyDataSources, final boolean
isEmptyRuleConfigs) {
+ DatabaseConfiguration databaseConfig =
mock(DatabaseConfiguration.class, RETURNS_DEEP_STUBS);
+
when(databaseConfig.getDataSources().isEmpty()).thenReturn(isEmptyDataSources);
+
when(databaseConfig.getRuleConfigurations().isEmpty()).thenReturn(isEmptyRuleConfigs);
+ return Collections.singletonMap("foo_ds", databaseConfig);
}
private Properties createProperties() {
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index f8839740810..38cec876fcc 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -135,17 +135,20 @@ public final class ClusterContextManagerCoordinatorTest {
@Before
public void setUp() throws SQLException {
- ModeConfiguration modeConfig = new ModeConfiguration("Cluster", new
ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()),
false);
- contextManager = new
ClusterContextManagerBuilder().build(ContextManagerBuilderParameter.builder().modeConfig(modeConfig).databaseConfigs(Collections.emptyMap())
- .globalRuleConfigs(Collections.emptyList()).props(new
Properties()).instanceDefinition(new InstanceDefinition(InstanceType.PROXY,
3307, "foo_instance_id")).build());
+ contextManager = new
ClusterContextManagerBuilder().build(createContextManagerBuilderParameter());
assertTrue(contextManager.getMetaDataContexts().getPersistService().isPresent());
contextManager.renewMetaDataContexts(new
MetaDataContexts(contextManager.getMetaDataContexts().getPersistService().get(),
- new ShardingSphereMetaData(createDatabases(),
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(),
- new ConfigurationProperties(new Properties())),
+ new ShardingSphereMetaData(createDatabases(),
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(), new
ConfigurationProperties(new Properties())),
createOptimizerContext()));
coordinator = new
ClusterContextManagerCoordinator(metaDataPersistService, contextManager, new
RegistryCenter(mock(ClusterPersistRepository.class)));
}
+ private ContextManagerBuilderParameter
createContextManagerBuilderParameter() {
+ ModeConfiguration modeConfig = new ModeConfiguration("Cluster", new
ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()),
false);
+ InstanceDefinition instanceDefinition = new
InstanceDefinition(InstanceType.PROXY, 3307, "foo_instance_id");
+ return new ContextManagerBuilderParameter(modeConfig,
Collections.emptyMap(), Collections.emptyList(), new Properties(),
Collections.emptyList(), instanceDefinition);
+ }
+
private Map<String, ShardingSphereDatabase> createDatabases() {
when(database.getName()).thenReturn("db");
ShardingSphereResource resource = mock(ShardingSphereResource.class);
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
index 008e3154a68..8f5f05ca71e 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mode.manager.standalone;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
+import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
import
org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.definition.InstanceDefinition;
@@ -33,7 +34,9 @@ import
org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Test;
import java.sql.SQLException;
+import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
import java.util.Properties;
import static org.junit.Assert.assertNotNull;
@@ -44,18 +47,22 @@ public final class StandaloneContextManagerBuilderTextTest {
@Test
public void assertBuild() throws SQLException {
- ContextManager actual = new
StandaloneContextManagerBuilder().build(ContextManagerBuilderParameter.builder()
- .modeConfig(new ModeConfiguration("Standalone", null, false))
- .databaseConfigs(Collections.singletonMap("foo_schema",
- new
DataSourceProvidedDatabaseConfiguration(Collections.singletonMap("foo_ds", new
MockedDataSource()), Collections.singleton(mock(RuleConfiguration.class)))))
-
.globalRuleConfigs(Collections.singleton(mock(RuleConfiguration.class))).props(new
Properties())
- .instanceDefinition(new InstanceDefinition(InstanceType.PROXY,
3307,
InstanceIdGeneratorFactory.getInstance(null).generate(InstanceType.PROXY))).build());
-
assertNotNull(actual.getMetaDataContexts().getMetaData().getDatabases().get("foo_schema"));
+ ContextManager actual = new
StandaloneContextManagerBuilder().build(createContextManagerBuilderParameter());
+
assertNotNull(actual.getMetaDataContexts().getMetaData().getDatabases().get("foo_db"));
assertTrue(actual.getMetaDataContexts().getPersistService().isPresent());
PersistRepository repository =
actual.getMetaDataContexts().getPersistService().get().getRepository();
assertNotNull(repository.get(GlobalNode.getGlobalRuleNode()));
-
assertNotNull(repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_schema",
"0")));
-
assertNotNull(repository.get(DatabaseMetaDataNode.getRulePath("foo_schema",
"0")));
-
assertTrue(actual.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getResources().containsKey("foo_schema"));
+
assertNotNull(repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_db",
"0")));
+
assertNotNull(repository.get(DatabaseMetaDataNode.getRulePath("foo_db", "0")));
+
assertTrue(actual.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class).getResources().containsKey("foo_db"));
+ }
+
+ private ContextManagerBuilderParameter
createContextManagerBuilderParameter() {
+ ModeConfiguration modeConfig = new ModeConfiguration("Standalone",
null, false);
+ Map<String, DatabaseConfiguration> databaseConfigs =
Collections.singletonMap(
+ "foo_db", new
DataSourceProvidedDatabaseConfiguration(Collections.singletonMap("foo_ds", new
MockedDataSource()), Collections.singleton(mock(RuleConfiguration.class))));
+ Collection<RuleConfiguration> globalRuleConfigs =
Collections.singleton(mock(RuleConfiguration.class));
+ InstanceDefinition instanceDefinition = new
InstanceDefinition(InstanceType.PROXY, 3307,
InstanceIdGeneratorFactory.getInstance(null).generate(InstanceType.PROXY));
+ return new ContextManagerBuilderParameter(modeConfig, databaseConfigs,
globalRuleConfigs, new Properties(), Collections.emptyList(),
instanceDefinition);
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
index d1988164c38..358dd4c801c 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
@@ -61,13 +61,9 @@ public final class BootstrapInitializer {
private ContextManager createContextManager(final YamlProxyConfiguration
yamlConfig, final ModeConfiguration modeConfig, final int port) throws
SQLException {
ProxyConfiguration proxyConfig = new
YamlProxyConfigurationSwapper().swap(yamlConfig);
- ContextManagerBuilderParameter parameter =
ContextManagerBuilderParameter.builder()
- .modeConfig(modeConfig)
- .databaseConfigs(proxyConfig.getDatabaseConfigurations())
-
.globalRuleConfigs(proxyConfig.getGlobalConfiguration().getRules())
- .props(proxyConfig.getGlobalConfiguration().getProperties())
- .labels(proxyConfig.getGlobalConfiguration().getLabels())
- .instanceDefinition(new InstanceDefinition(InstanceType.PROXY,
port,
InstanceIdGeneratorFactory.getInstance(modeConfig).generate(InstanceType.PROXY))).build();
+ InstanceDefinition instanceDefinition = new
InstanceDefinition(InstanceType.PROXY, port,
InstanceIdGeneratorFactory.getInstance(modeConfig).generate(InstanceType.PROXY));
+ ContextManagerBuilderParameter parameter = new
ContextManagerBuilderParameter(modeConfig,
proxyConfig.getDatabaseConfigurations(),
+ proxyConfig.getGlobalConfiguration().getRules(),
proxyConfig.getGlobalConfiguration().getProperties(),
proxyConfig.getGlobalConfiguration().getLabels(), instanceDefinition);
return
ContextManagerBuilderFactory.getInstance(modeConfig).build(parameter);
}
