You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/06/18 16:31:56 UTC
[shardingsphere] branch master updated: Revise code format with RDL
and RQL backend handler (#10878)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 a5e4706 Revise code format with RDL and RQL backend handler (#10878)
a5e4706 is described below
commit a5e470645e899e24b2ed88ccef1beabbc1957be5
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jun 19 00:31:32 2021 +0800
Revise code format with RDL and RQL backend handler (#10878)
* For code format with RDL and RQL backend handler
* Fix test case
---
.../text/distsql/rdl/RDLBackendHandlerFactory.java | 2 +-
...terShardingBindingTableRulesBackendHandler.java | 9 +-
...rShardingBroadcastTableRulesBackendHandler.java | 2 +-
...ateShardingBindingTableRulesBackendHandler.java | 4 +-
.../text/distsql/rdl/impl/RDLBackendHandler.java | 12 +-
.../rql/impl/DataSourcesQueryBackendHandler.java | 4 +-
.../DatabaseDiscoveryRulesQueryBackendHandler.java | 6 +-
.../rql/impl/EncryptRulesQueryBackendHandler.java | 8 +-
...ardingBindingTableRulesQueryBackendHandler.java | 14 +-
...dingBroadcastTableRulesQueryBackendHandler.java | 17 +-
.../ShardingTableRulesQueryBackendHandler.java | 171 ++++++++++-----------
...opReadwriteSplittingRuleBackendHandlerTest.java | 2 +-
...hardingBindingTableRulesBackendHandlerTest.java | 5 +-
...rdingBroadcastTableRulesBackendHandlerTest.java | 4 +-
.../DropShardingTableRuleBackendHandlerTest.java | 4 +-
...abaseDiscoveryRulesQueryBackendHandlerTest.java | 30 ++--
.../impl/EncryptRulesQueryBackendHandlerTest.java | 34 ++--
...writeSplittingRulesQueryBackendHandlerTest.java | 14 +-
...ngBindingTableRulesQueryBackendHandlerTest.java | 37 +++--
...BroadcastTableRulesQueryBackendHandlerTest.java | 28 ++--
.../ShardingTableRulesQueryBackendHandlerTest.java | 22 +--
21 files changed, 206 insertions(+), 223 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
index a2cc4d8..22a7efd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
@@ -101,7 +101,7 @@ public final class RDLBackendHandlerFactory {
throw new SQLException(String.format("No Registry center to execute `%s` SQL", sqlStatement.getClass().getSimpleName()));
}
}
-
+
private static Optional<TextProtocolBackendHandler> createRDLBackendHandler(final DatabaseType databaseType, final SQLStatement sqlStatement, final BackendConnection backendConnection) {
if (sqlStatement instanceof AddResourceStatement) {
return Optional.of(new AddResourceBackendHandler(databaseType, (AddResourceStatement) sqlStatement, backendConnection));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
index 600e8cc..ee3fb9c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBindingTableRulesBackendHandler.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rdl.impl;
-import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBindingTableRulesStatement;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.exception.DuplicateBindingTablesException;
import org.apache.shardingsphere.proxy.backend.exception.ShardingBindingTableRulesNotExistsException;
@@ -28,9 +26,11 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.converter.ShardingRuleStatementConverter;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBindingTableRulesStatement;
import java.util.Collection;
import java.util.HashSet;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
@@ -69,8 +69,7 @@ public final class AlterShardingBindingTableRulesBackendHandler extends RDLBacke
@Override
public void doExecute(final String schemaName, final AlterShardingBindingTableRulesStatement sqlStatement) {
getShardingRuleConfiguration(schemaName).get().getBindingTableGroups().clear();
- getShardingRuleConfiguration(schemaName).get().getBindingTableGroups()
- .addAll(ShardingRuleStatementConverter.convert(sqlStatement).getBindingTables());
+ getShardingRuleConfiguration(schemaName).get().getBindingTableGroups().addAll(ShardingRuleStatementConverter.convert(sqlStatement).getBindingTables());
}
private Collection<String> getLogicTables(final String schemaName) {
@@ -85,7 +84,7 @@ public final class AlterShardingBindingTableRulesBackendHandler extends RDLBacke
Collection<String> tables = new HashSet<>();
return table -> notEquals(table, tables);
}
-
+
private boolean notEquals(final String table, final Collection<String> tables) {
for (String each : tables) {
if (table.equals(each) || (table.length() == each.length() && Splitter.on(",").splitToList(each)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
index b0a2fee..dce3b9b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AlterShardingBroadcastTableRulesBackendHandler.java
@@ -32,7 +32,7 @@ public final class AlterShardingBroadcastTableRulesBackendHandler extends RDLBac
public AlterShardingBroadcastTableRulesBackendHandler(final AlterShardingBroadcastTableRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
}
-
+
@Override
public void before(final String schemaName, final AlterShardingBroadcastTableRulesStatement sqlStatement) {
Optional<ShardingRuleConfiguration> shardingRuleConfig = getShardingRuleConfiguration(schemaName);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
index f3ce84d..d2706fb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/CreateShardingBindingTableRulesBackendHandler.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rdl.impl;
-import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingBindingTableRulesStatement;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.exception.DuplicateBindingTablesException;
import org.apache.shardingsphere.proxy.backend.exception.ShardingBindingTableRulesNotExistsException;
@@ -28,11 +26,13 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.converter.ShardingRuleStatementConverter;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingBindingTableRulesStatement;
import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import java.util.Collection;
import java.util.HashSet;
import java.util.Optional;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
index f342426..eda8ffe 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/RDLBackendHandler.java
@@ -47,7 +47,7 @@ public abstract class RDLBackendHandler<T extends SQLStatement> extends SchemaRe
}
@Override
- protected ResponseHeader execute(final String schemaName, final T sqlStatement) {
+ protected final ResponseHeader execute(final String schemaName, final T sqlStatement) {
before(schemaName, sqlStatement);
doExecute(schemaName, sqlStatement);
after(schemaName);
@@ -63,27 +63,27 @@ public abstract class RDLBackendHandler<T extends SQLStatement> extends SchemaRe
ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations()));
}
- protected Optional<ReadwriteSplittingRuleConfiguration> getReadwriteSplittingRuleConfiguration(final String schemaName) {
+ protected final Optional<ReadwriteSplittingRuleConfiguration> getReadwriteSplittingRuleConfiguration(final String schemaName) {
return ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof ReadwriteSplittingRuleConfiguration).map(each -> (ReadwriteSplittingRuleConfiguration) each).findFirst();
}
- protected Optional<EncryptRuleConfiguration> getEncryptRuleConfiguration(final String schemaName) {
+ protected final Optional<EncryptRuleConfiguration> getEncryptRuleConfiguration(final String schemaName) {
return ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof EncryptRuleConfiguration).map(each -> (EncryptRuleConfiguration) each).findFirst();
}
- protected Optional<DatabaseDiscoveryRuleConfiguration> getDatabaseDiscoveryRuleConfiguration(final String schemaName) {
+ protected final Optional<DatabaseDiscoveryRuleConfiguration> getDatabaseDiscoveryRuleConfiguration(final String schemaName) {
return ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof DatabaseDiscoveryRuleConfiguration).map(each -> (DatabaseDiscoveryRuleConfiguration) each).findFirst();
}
- protected Optional<ShardingRuleConfiguration> getShardingRuleConfiguration(final String schemaName) {
+ protected final Optional<ShardingRuleConfiguration> getShardingRuleConfiguration(final String schemaName) {
return ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().stream()
.filter(each -> each instanceof ShardingRuleConfiguration).map(each -> (ShardingRuleConfiguration) each).findFirst();
}
- protected Collection<String> getInvalidResources(final String schemaName, final Collection<String> resources) {
+ protected final Collection<String> getInvalidResources(final String schemaName, final Collection<String> resources) {
return resources.stream().filter(each -> !isValidResource(schemaName, each)).collect(Collectors.toSet());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DataSourcesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DataSourcesQueryBackendHandler.java
index d25b160..0256b43 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DataSourcesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DataSourcesQueryBackendHandler.java
@@ -68,7 +68,7 @@ public final class DataSourcesQueryBackendHandler extends SchemaRequiredBackendH
}
private List<QueryHeader> generateResponseHeader() {
- List<QueryHeader> result = new LinkedList();
+ List<QueryHeader> result = new LinkedList<>();
result.add(new QueryHeader(schema, "", "name", "name", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
result.add(new QueryHeader(schema, "", "type", "type", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
result.add(new QueryHeader(schema, "", "host", "host", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
@@ -87,7 +87,7 @@ public final class DataSourcesQueryBackendHandler extends SchemaRequiredBackendH
public Collection<Object> getRowData() {
String dataSourceName = dataSourceNames.next();
DataSourceMetaData dataSourceMetaData = ProxyContext.getInstance().getMetaData(schema).getResource().getDataSourcesMetaData().getDataSourceMetaData(dataSourceName);
- Map<Object, Object> attributeMap = new HashMap();
+ Map<Object, Object> attributeMap = new HashMap<>();
attributeMap.put("connectionTimeoutMilliseconds", dataSourceParameterMap.get(dataSourceName).getConnectionTimeoutMilliseconds());
attributeMap.put("idleTimeoutMilliseconds", dataSourceParameterMap.get(dataSourceName).getIdleTimeoutMilliseconds());
attributeMap.put("maxLifetimeMilliseconds", dataSourceParameterMap.get(dataSourceName).getMaxLifetimeMilliseconds());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
index 15b1006..b201c08 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
@@ -47,11 +47,11 @@ import java.util.stream.Collectors;
* Backend handler for show database discovery rules.
*/
public final class DatabaseDiscoveryRulesQueryBackendHandler extends SchemaRequiredBackendHandler<ShowDatabaseDiscoveryRulesStatement> {
-
+
private Iterator<DatabaseDiscoveryDataSourceRuleConfiguration> data;
-
+
private Map<String, ShardingSphereAlgorithmConfiguration> discoverTypes;
-
+
public DatabaseDiscoveryRulesQueryBackendHandler(final ShowDatabaseDiscoveryRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
index 2706b63..595a6e0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
@@ -51,11 +51,11 @@ import java.util.stream.Collectors;
* Backend handler for show encrypt rules.
*/
public final class EncryptRulesQueryBackendHandler extends SchemaRequiredBackendHandler<ShowEncryptRulesStatement> {
-
+
private Iterator<Entry<String, EncryptColumnRuleConfiguration>> data;
-
+
private Map<String, ShardingSphereAlgorithmConfiguration> encryptors;
-
+
public EncryptRulesQueryBackendHandler(final ShowEncryptRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
}
@@ -83,7 +83,7 @@ public final class EncryptRulesQueryBackendHandler extends SchemaRequiredBackend
}
return result;
}
-
+
private Map<String, EncryptColumnRuleConfiguration> buildEncryptColumnRuleConfigurationMap(final EncryptTableRuleConfiguration encryptTableRuleConfiguration) {
return encryptTableRuleConfiguration.getColumns().stream().collect(Collectors.toMap(each -> Joiner.on(".")
.join(encryptTableRuleConfiguration.getName(), each.getLogicColumn()), each -> each));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandler.java
index e66e009..7aa6a47 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandler.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rql.impl;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBindingTableRulesStatement;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -25,10 +24,11 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryRespon
import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBindingTableRulesStatement;
import java.sql.Types;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -38,11 +38,11 @@ import java.util.Optional;
* Backend handler for show sharding binding table rules.
*/
public final class ShardingBindingTableRulesQueryBackendHandler extends SchemaRequiredBackendHandler<ShowShardingBindingTableRulesStatement> {
-
+
private Iterator<String> data;
-
+
private final String schema;
-
+
public ShardingBindingTableRulesQueryBackendHandler(final ShowShardingBindingTableRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
schema = sqlStatement.getSchema().isPresent() ? sqlStatement.getSchema().get().getIdentifier().getValue() : backendConnection.getSchemaName();
@@ -54,7 +54,7 @@ public final class ShardingBindingTableRulesQueryBackendHandler extends SchemaRe
data = loadRuleConfiguration();
return new QueryResponseHeader(queryHeader);
}
-
+
private List<QueryHeader> getQueryHeader() {
List<QueryHeader> result = new LinkedList<>();
result.add(new QueryHeader(schema, "", "shardingBindingTables", "shardingBindingTables", Types.CHAR, "CHAR", 255, 0, false, false, false, false));
@@ -78,6 +78,6 @@ public final class ShardingBindingTableRulesQueryBackendHandler extends SchemaRe
@Override
public Collection<Object> getRowData() {
- return Arrays.asList(data.next());
+ return Collections.singleton(data.next());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandler.java
index 1acc99a..f0555ad 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandler.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rql.impl;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBroadcastTableRulesStatement;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -25,10 +24,11 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryRespon
import org.apache.shardingsphere.proxy.backend.response.header.query.impl.QueryHeader;
import org.apache.shardingsphere.proxy.backend.text.SchemaRequiredBackendHandler;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBroadcastTableRulesStatement;
import java.sql.Types;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -38,11 +38,11 @@ import java.util.Optional;
* Backend handler for show sharding broadcast table rules.
*/
public final class ShardingBroadcastTableRulesQueryBackendHandler extends SchemaRequiredBackendHandler<ShowShardingBroadcastTableRulesStatement> {
-
+
private Iterator<String> data;
-
+
private final String schema;
-
+
public ShardingBroadcastTableRulesQueryBackendHandler(final ShowShardingBroadcastTableRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
schema = sqlStatement.getSchema().isPresent() ? sqlStatement.getSchema().get().getIdentifier().getValue() : backendConnection.getSchemaName();
@@ -62,10 +62,9 @@ public final class ShardingBroadcastTableRulesQueryBackendHandler extends Schema
}
private Iterator<String> loadBroadcastTableRules() {
- Collection<String> result = new LinkedList<>();
- Optional<ShardingRuleConfiguration> shardingRuleConfiguration = ProxyContext.getInstance().getMetaData(schema).getRuleMetaData().getConfigurations()
+ Optional<ShardingRuleConfiguration> shardingRuleConfig = ProxyContext.getInstance().getMetaData(schema).getRuleMetaData().getConfigurations()
.stream().filter(each -> each instanceof ShardingRuleConfiguration).map(each -> (ShardingRuleConfiguration) each).findFirst();
- return shardingRuleConfiguration.isPresent() ? shardingRuleConfiguration.get().getBroadcastTables().iterator() : result.iterator();
+ return shardingRuleConfig.map(optional -> optional.getBroadcastTables().iterator()).orElse(Collections.emptyIterator());
}
@Override
@@ -75,6 +74,6 @@ public final class ShardingBroadcastTableRulesQueryBackendHandler extends Schema
@Override
public Collection<Object> getRowData() {
- return Arrays.asList(data.next());
+ return Collections.singleton(data.next());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
index 29b64e9..774ffdc 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
@@ -50,13 +50,13 @@ import java.util.stream.Collectors;
* Backend handler for show sharding table rules.
*/
public final class ShardingTableRulesQueryBackendHandler extends SchemaRequiredBackendHandler<ShowShardingTableRulesStatement> {
-
+
private Iterator<ShardingTableRuleConfiguration> tables;
-
+
private Iterator<ShardingAutoTableRuleConfiguration> autoTables;
-
+
private ShardingRuleConfiguration shardingRuleConfiguration;
-
+
public ShardingTableRulesQueryBackendHandler(final ShowShardingTableRulesStatement sqlStatement, final BackendConnection backendConnection) {
super(sqlStatement, backendConnection);
}
@@ -74,12 +74,12 @@ public final class ShardingTableRulesQueryBackendHandler extends SchemaRequiredB
tables = ruleConfig.map(optional -> optional.getTables().iterator()).orElse(Collections.emptyIterator());
autoTables = ruleConfig.map(optional -> optional.getAutoTables().iterator()).orElse(Collections.emptyIterator());
} else {
- tables = ruleConfig.isPresent() ? ruleConfig.get().getTables().stream().filter(each -> tableName.equalsIgnoreCase(each.getLogicTable()))
- .collect(Collectors.toList()).iterator() : Collections.emptyIterator();
- autoTables = ruleConfig.isPresent() ? ruleConfig.get().getAutoTables().stream().filter(each -> tableName.equalsIgnoreCase(each.getLogicTable()))
- .collect(Collectors.toList()).iterator() : Collections.emptyIterator();
+ tables = ruleConfig.map(optional
+ -> optional.getTables().stream().filter(each -> tableName.equalsIgnoreCase(each.getLogicTable())).collect(Collectors.toList()).iterator()).orElse(Collections.emptyIterator());
+ autoTables = ruleConfig.map(optional
+ -> optional.getAutoTables().stream().filter(each -> tableName.equalsIgnoreCase(each.getLogicTable())).collect(Collectors.toList()).iterator()).orElse(Collections.emptyIterator());
}
- shardingRuleConfiguration = ruleConfig.isPresent() ? ruleConfig.get() : null;
+ shardingRuleConfiguration = ruleConfig.orElse(null);
}
private List<QueryHeader> getQueryHeader(final String schemaName) {
@@ -110,129 +110,122 @@ public final class ShardingTableRulesQueryBackendHandler extends SchemaRequiredB
public Collection<Object> getRowData() {
return tables.hasNext() ? buildTableRowData(tables.next()) : buildAutoTableRowData(autoTables.next());
}
-
- private Collection<Object> buildTableRowData(final ShardingTableRuleConfiguration shardingTableRuleConfiguration) {
+
+ private Collection<Object> buildTableRowData(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
Collection<Object> result = new LinkedList<>();
- result.add(shardingTableRuleConfiguration.getLogicTable());
- result.add(shardingTableRuleConfiguration.getActualDataNodes());
+ result.add(shardingTableRuleConfig.getLogicTable());
+ result.add(shardingTableRuleConfig.getActualDataNodes());
result.add("");
- result.add(getDatabaseStrategyType(shardingTableRuleConfiguration));
- result.add(getDatabaseShardingColumn(shardingTableRuleConfiguration));
- result.add(getAlgorithmType(getDatabaseShardingStrategy(shardingTableRuleConfiguration)));
- result.add(getAlgorithmProps(getDatabaseShardingStrategy(shardingTableRuleConfiguration)));
- result.add(getTableStrategyType(shardingTableRuleConfiguration.getTableShardingStrategy()));
- result.add(getTableShardingColumn(shardingTableRuleConfiguration.getTableShardingStrategy()));
- result.add(getAlgorithmType(getTableShardingStrategy(shardingTableRuleConfiguration.getTableShardingStrategy())));
- result.add(getAlgorithmProps(getTableShardingStrategy(shardingTableRuleConfiguration.getTableShardingStrategy())));
- result.add(getKeyGenerateColumn(shardingTableRuleConfiguration.getKeyGenerateStrategy()));
- result.add(getKeyGeneratorType(shardingTableRuleConfiguration.getKeyGenerateStrategy()));
- result.add(getKeyGeneratorProps(shardingTableRuleConfiguration.getKeyGenerateStrategy()));
+ result.add(getDatabaseStrategyType(shardingTableRuleConfig));
+ result.add(getDatabaseShardingColumn(shardingTableRuleConfig));
+ result.add(getAlgorithmType(getDatabaseShardingStrategy(shardingTableRuleConfig)));
+ result.add(getAlgorithmProps(getDatabaseShardingStrategy(shardingTableRuleConfig)));
+ result.add(getTableStrategyType(shardingTableRuleConfig.getTableShardingStrategy()));
+ result.add(getTableShardingColumn(shardingTableRuleConfig.getTableShardingStrategy()));
+ result.add(getAlgorithmType(getTableShardingStrategy(shardingTableRuleConfig.getTableShardingStrategy())));
+ result.add(getAlgorithmProps(getTableShardingStrategy(shardingTableRuleConfig.getTableShardingStrategy())));
+ result.add(getKeyGenerateColumn(shardingTableRuleConfig.getKeyGenerateStrategy()));
+ result.add(getKeyGeneratorType(shardingTableRuleConfig.getKeyGenerateStrategy()));
+ result.add(getKeyGeneratorProps(shardingTableRuleConfig.getKeyGenerateStrategy()));
return result;
}
-
- private Collection<Object> buildAutoTableRowData(final ShardingAutoTableRuleConfiguration shardingAutoTableRuleConfiguration) {
+
+ private Collection<Object> buildAutoTableRowData(final ShardingAutoTableRuleConfiguration shardingAutoTableRuleConfig) {
Collection<Object> result = new LinkedList<>();
- result.add(shardingAutoTableRuleConfiguration.getLogicTable());
+ result.add(shardingAutoTableRuleConfig.getLogicTable());
result.add("");
- result.add(shardingAutoTableRuleConfiguration.getActualDataSources());
+ result.add(shardingAutoTableRuleConfig.getActualDataSources());
result.add("");
result.add("");
result.add("");
result.add("");
- result.add(getTableStrategyType(shardingAutoTableRuleConfiguration.getShardingStrategy()));
- result.add(getTableShardingColumn(shardingAutoTableRuleConfiguration.getShardingStrategy()));
- result.add(getAlgorithmType(getTableShardingStrategy(shardingAutoTableRuleConfiguration.getShardingStrategy())));
- result.add(getAlgorithmProps(getTableShardingStrategy(shardingAutoTableRuleConfiguration.getShardingStrategy())));
- result.add(getKeyGenerateColumn(shardingAutoTableRuleConfiguration.getKeyGenerateStrategy()));
- result.add(getKeyGeneratorType(shardingAutoTableRuleConfiguration.getKeyGenerateStrategy()));
- result.add(getKeyGeneratorProps(shardingAutoTableRuleConfiguration.getKeyGenerateStrategy()));
+ result.add(getTableStrategyType(shardingAutoTableRuleConfig.getShardingStrategy()));
+ result.add(getTableShardingColumn(shardingAutoTableRuleConfig.getShardingStrategy()));
+ result.add(getAlgorithmType(getTableShardingStrategy(shardingAutoTableRuleConfig.getShardingStrategy())));
+ result.add(getAlgorithmProps(getTableShardingStrategy(shardingAutoTableRuleConfig.getShardingStrategy())));
+ result.add(getKeyGenerateColumn(shardingAutoTableRuleConfig.getKeyGenerateStrategy()));
+ result.add(getKeyGeneratorType(shardingAutoTableRuleConfig.getKeyGenerateStrategy()));
+ result.add(getKeyGeneratorProps(shardingAutoTableRuleConfig.getKeyGenerateStrategy()));
return result;
}
-
- private String getDatabaseStrategyType(final ShardingTableRuleConfiguration shardingTableRuleConfiguration) {
- Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfiguration);
+
+ private String getDatabaseStrategyType(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
+ Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfig);
return databaseShardingStrategy.isPresent() && !(databaseShardingStrategy.get() instanceof NoneShardingStrategyConfiguration)
? getAlgorithmConfiguration(databaseShardingStrategy.get().getShardingAlgorithmName()).getType() : "";
}
-
- private String getDatabaseShardingColumn(final ShardingTableRuleConfiguration shardingTableRuleConfiguration) {
- Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfiguration);
+
+ private String getDatabaseShardingColumn(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
+ Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfig);
return databaseShardingStrategy.isPresent() ? getShardingColumn(databaseShardingStrategy.get()) : "";
}
-
- private String getShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- if (shardingStrategyConfiguration instanceof StandardShardingStrategyConfiguration) {
- return ((StandardShardingStrategyConfiguration) shardingStrategyConfiguration).getShardingColumn();
- } else if (shardingStrategyConfiguration instanceof ComplexShardingStrategyConfiguration) {
- return ((ComplexShardingStrategyConfiguration) shardingStrategyConfiguration).getShardingColumns();
+
+ private String getShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ if (shardingStrategyConfig instanceof StandardShardingStrategyConfiguration) {
+ return ((StandardShardingStrategyConfiguration) shardingStrategyConfig).getShardingColumn();
+ }
+ if (shardingStrategyConfig instanceof ComplexShardingStrategyConfiguration) {
+ return ((ComplexShardingStrategyConfiguration) shardingStrategyConfig).getShardingColumns();
}
return "";
}
-
+
private String getAlgorithmType(final Optional<ShardingStrategyConfiguration> databaseShardingStrategy) {
return databaseShardingStrategy.isPresent() && !(databaseShardingStrategy.get() instanceof NoneShardingStrategyConfiguration)
? getAlgorithmConfiguration(databaseShardingStrategy.get().getShardingAlgorithmName()).getType() : "";
}
-
+
private String getAlgorithmProps(final Optional<ShardingStrategyConfiguration> databaseShardingStrategy) {
return databaseShardingStrategy.isPresent() && !(databaseShardingStrategy.get() instanceof NoneShardingStrategyConfiguration)
? buildProperties(getAlgorithmConfiguration(databaseShardingStrategy.get().getShardingAlgorithmName()).getProps()) : "";
}
-
- private Optional<ShardingStrategyConfiguration> getDatabaseShardingStrategy(final ShardingTableRuleConfiguration shardingTableRuleConfiguration) {
- return Objects.nonNull(shardingTableRuleConfiguration.getDatabaseShardingStrategy())
- ? Optional.ofNullable(shardingTableRuleConfiguration.getDatabaseShardingStrategy())
- : Optional.ofNullable(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy());
+
+ private Optional<ShardingStrategyConfiguration> getDatabaseShardingStrategy(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
+ return null == shardingTableRuleConfig.getDatabaseShardingStrategy()
+ ? Optional.ofNullable(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy()) : Optional.ofNullable(shardingTableRuleConfig.getDatabaseShardingStrategy());
}
-
+
private ShardingSphereAlgorithmConfiguration getAlgorithmConfiguration(final String algorithmName) {
return shardingRuleConfiguration.getShardingAlgorithms().get(algorithmName);
}
-
- private String getTableStrategyType(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfiguration);
+
+ private String getTableStrategyType(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfig);
return tableShardingStrategy.isPresent() ? getStrategyType(tableShardingStrategy.get()) : "";
}
-
- private String getStrategyType(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- return shardingStrategyConfiguration instanceof NoneShardingStrategyConfiguration ? "none"
- : getAlgorithmConfiguration(shardingStrategyConfiguration.getShardingAlgorithmName()).getType();
+
+ private String getStrategyType(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ return shardingStrategyConfig instanceof NoneShardingStrategyConfiguration ? "none" : getAlgorithmConfiguration(shardingStrategyConfig.getShardingAlgorithmName()).getType();
}
-
- private Optional<ShardingStrategyConfiguration> getTableShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- return Objects.nonNull(shardingStrategyConfiguration)
- ? Optional.ofNullable(shardingStrategyConfiguration)
- : Optional.ofNullable(shardingRuleConfiguration.getDefaultTableShardingStrategy());
+
+ private Optional<ShardingStrategyConfiguration> getTableShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ return null == shardingStrategyConfig ? Optional.ofNullable(shardingRuleConfiguration.getDefaultTableShardingStrategy()) : Optional.of(shardingStrategyConfig);
}
-
- private String getTableShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfiguration);
+
+ private String getTableShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfig);
return tableShardingStrategy.isPresent() ? getShardingColumn(tableShardingStrategy.get()) : "";
}
-
- private String getKeyGenerateColumn(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration) {
- return getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfiguration).isPresent()
- ? getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfiguration).get().getColumn() : "";
+
+ private String getKeyGenerateColumn(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ return getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfig).isPresent() ? getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfig).get().getColumn() : "";
}
-
+
private String getKeyGeneratorType(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration) {
- Optional<KeyGenerateStrategyConfiguration> optional = getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfiguration);
- return optional.isPresent() ? shardingRuleConfiguration.getKeyGenerators().get(optional.get().getKeyGeneratorName()).getType() : "";
+ Optional<KeyGenerateStrategyConfiguration> keyGenerateStrategyConfig = getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfiguration);
+ return keyGenerateStrategyConfig.isPresent() ? shardingRuleConfiguration.getKeyGenerators().get(keyGenerateStrategyConfig.get().getKeyGeneratorName()).getType() : "";
}
-
- private String getKeyGeneratorProps(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration) {
- Optional<KeyGenerateStrategyConfiguration> optional = getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfiguration);
- return optional.isPresent() ? buildProperties(shardingRuleConfiguration.getKeyGenerators().get(optional.get().getKeyGeneratorName()).getProps()) : "";
+
+ private String getKeyGeneratorProps(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ return getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfig).map(
+ optional -> buildProperties(shardingRuleConfiguration.getKeyGenerators().get(optional.getKeyGeneratorName()).getProps())).orElse("");
}
-
- private Optional<KeyGenerateStrategyConfiguration> getKeyGenerateStrategyConfiguration(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfiguration) {
- return Objects.nonNull(keyGenerateStrategyConfiguration)
- ? Optional.ofNullable(keyGenerateStrategyConfiguration)
- : Optional.ofNullable(shardingRuleConfiguration.getDefaultKeyGenerateStrategy());
+
+ private Optional<KeyGenerateStrategyConfiguration> getKeyGenerateStrategyConfiguration(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
+ return null == keyGenerateStrategyConfig ? Optional.ofNullable(shardingRuleConfiguration.getDefaultKeyGenerateStrategy()) : Optional.of(keyGenerateStrategyConfig);
}
-
+
private String buildProperties(final Properties properties) {
- return Objects.nonNull(properties) ? Joiner.on(",").join(properties.entrySet().stream()
- .map(each -> Joiner.on("=").join(each.getKey(), each.getValue())).collect(Collectors.toList())) : "";
+ return null == properties ? "" : Joiner.on(",").join(properties.entrySet().stream().map(each -> Joiner.on("=").join(each.getKey(), each.getValue())).collect(Collectors.toList()));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandlerTest.java
index 4b4603c..3997c05 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropReadwriteSplittingRuleBackendHandlerTest.java
@@ -105,7 +105,7 @@ public final class DropReadwriteSplittingRuleBackendHandlerTest {
when(ruleMetaData.getConfigurations()).thenReturn(Collections.emptyList());
handler.execute("test", sqlStatement);
}
-
+
@Test(expected = ReadwriteSplittingRulesNotExistedException.class)
public void assertExecuteWithNoDroppedReadwriteSplittingRules() {
when(sqlStatement.getRuleNames()).thenReturn(Collections.singleton("pr_ds"));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandlerTest.java
index 8884187..d5b4382 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBindingTableRulesBackendHandlerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rdl.impl;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingBindingTableRulesStatement;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -30,6 +29,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResp
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingBindingTableRulesStatement;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +38,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -85,7 +84,7 @@ public final class DropShardingBindingTableRulesBackendHandlerTest {
@Test(expected = ShardingBindingTableRulesNotExistsException.class)
public void assertExecuteWithNotExistBindingTableRule() {
- when(ruleMetaData.getConfigurations()).thenReturn(Arrays.asList(new ShardingRuleConfiguration()));
+ when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(new ShardingRuleConfiguration()));
handler.execute("test", sqlStatement);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandlerTest.java
index 3093aa3..aa420cd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingBroadcastTableRulesBackendHandlerTest.java
@@ -81,13 +81,13 @@ public final class DropShardingBroadcastTableRulesBackendHandlerTest {
public void assertExecuteWithoutShardingRule() {
handler.execute("test", sqlStatement);
}
-
+
@Test(expected = ShardingBroadcastTableRulesNotExistsException.class)
public void assertExecuteWithNotExistBroadcastTableRule() {
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(new ShardingRuleConfiguration()));
handler.execute("test", sqlStatement);
}
-
+
@Test
public void assertExecute() {
when(ruleMetaData.getConfigurations()).thenReturn(buildShardingConfigurations());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandlerTest.java
index 8ab8e1d..e7f2b8b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropShardingTableRuleBackendHandlerTest.java
@@ -97,7 +97,7 @@ public final class DropShardingTableRuleBackendHandlerTest {
when(sqlStatement.getTableNames()).thenReturn(Collections.singleton(tableRuleSegment));
handler.execute("test", sqlStatement);
}
-
+
@Test(expected = ShardingTableRulesInUsedException.class)
public void assertExecuteWithBindingTableRule() {
TableNameSegment tableRuleSegment = new TableNameSegment(0, 3, new IdentifierValue("t_order_item"));
@@ -105,7 +105,7 @@ public final class DropShardingTableRuleBackendHandlerTest {
when(sqlStatement.getTableNames()).thenReturn(Collections.singleton(tableRuleSegment));
handler.execute("test", sqlStatement);
}
-
+
@Test
public void assertExecute() {
TableNameSegment tableRuleSegment = new TableNameSegment(0, 3, new IdentifierValue("t_order"));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandlerTest.java
index 83262d8..3ff974d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandlerTest.java
@@ -51,27 +51,27 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class DatabaseDiscoveryRulesQueryBackendHandlerTest {
-
+
@Mock
private BackendConnection backendConnection;
-
+
@Mock
private ShowDatabaseDiscoveryRulesStatement sqlStatement;
-
+
@Mock
private MetaDataContexts metaDataContexts;
-
+
@Mock
private TransactionContexts transactionContexts;
-
+
@Mock
private ShardingSphereMetaData shardingSphereMetaData;
-
+
@Mock
private ShardingSphereRuleMetaData ruleMetaData;
-
+
private DatabaseDiscoveryRulesQueryBackendHandler handler;
-
+
@Before
public void setUp() {
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
@@ -81,7 +81,7 @@ public final class DatabaseDiscoveryRulesQueryBackendHandlerTest {
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(buildDatabaseDiscoveryRuleConfiguration()));
}
-
+
@Test
public void assertExecute() {
ResponseHeader responseHeader = handler.execute("test", sqlStatement);
@@ -93,15 +93,13 @@ public final class DatabaseDiscoveryRulesQueryBackendHandlerTest {
assertTrue(rowData.contains("ds_0,ds_1"));
assertTrue(rowData.contains("MGR"));
}
-
+
private DatabaseDiscoveryRuleConfiguration buildDatabaseDiscoveryRuleConfiguration() {
- DatabaseDiscoveryDataSourceRuleConfiguration databaseDiscoveryDataSourceRuleConfiguration =
+ DatabaseDiscoveryDataSourceRuleConfiguration databaseDiscoveryDataSourceRuleConfig =
new DatabaseDiscoveryDataSourceRuleConfiguration("ms_group", Arrays.asList("ds_0", "ds_1"), "test");
- ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfiguration = new ShardingSphereAlgorithmConfiguration("MGR", new Properties());
+ ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("MGR", new Properties());
Map<String, ShardingSphereAlgorithmConfiguration> discoverTypes = new HashMap<>();
- discoverTypes.put("test", shardingSphereAlgorithmConfiguration);
- DatabaseDiscoveryRuleConfiguration result =
- new DatabaseDiscoveryRuleConfiguration(Collections.singleton(databaseDiscoveryDataSourceRuleConfiguration), discoverTypes);
- return result;
+ discoverTypes.put("test", shardingSphereAlgorithmConfig);
+ return new DatabaseDiscoveryRuleConfiguration(Collections.singleton(databaseDiscoveryDataSourceRuleConfig), discoverTypes);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandlerTest.java
index 31c456e..06f0e0d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandlerTest.java
@@ -51,27 +51,27 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class EncryptRulesQueryBackendHandlerTest {
-
+
@Mock
private BackendConnection backendConnection;
-
+
@Mock
private ShowEncryptRulesStatement sqlStatement;
-
+
@Mock
private MetaDataContexts metaDataContexts;
-
+
@Mock
private TransactionContexts transactionContexts;
-
+
@Mock
private ShardingSphereMetaData shardingSphereMetaData;
-
+
@Mock
private ShardingSphereRuleMetaData ruleMetaData;
-
+
private EncryptRulesQueryBackendHandler handler;
-
+
@Before
public void setUp() {
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
@@ -81,7 +81,7 @@ public final class EncryptRulesQueryBackendHandlerTest {
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(buildEncryptRuleConfiguration()));
}
-
+
@Test
public void assertExecute() {
ResponseHeader responseHeader = handler.execute("test", sqlStatement);
@@ -95,17 +95,13 @@ public final class EncryptRulesQueryBackendHandlerTest {
assertTrue(rowData.contains("user_plain"));
assertTrue(rowData.contains("md5"));
}
-
+
private EncryptRuleConfiguration buildEncryptRuleConfiguration() {
- EncryptColumnRuleConfiguration encryptColumnRuleConfiguration =
- new EncryptColumnRuleConfiguration("user_id", "user_cipher", null, "user_plain", "test");
- EncryptTableRuleConfiguration encryptTableRuleConfiguration =
- new EncryptTableRuleConfiguration("t_encrypt", Collections.singleton(encryptColumnRuleConfiguration));
- ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfiguration = new ShardingSphereAlgorithmConfiguration("md5", new Properties());
+ EncryptColumnRuleConfiguration encryptColumnRuleConfig = new EncryptColumnRuleConfiguration("user_id", "user_cipher", null, "user_plain", "test");
+ EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_encrypt", Collections.singleton(encryptColumnRuleConfig));
+ ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("md5", new Properties());
Map<String, ShardingSphereAlgorithmConfiguration> encryptors = new HashMap<>();
- encryptors.put("test", shardingSphereAlgorithmConfiguration);
- EncryptRuleConfiguration result =
- new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfiguration), encryptors);
- return result;
+ encryptors.put("test", shardingSphereAlgorithmConfig);
+ return new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfig), encryptors);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
index c98200f..7fc5784 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
@@ -98,18 +98,18 @@ public final class ReadwriteSplittingRulesQueryBackendHandlerTest {
}
private ReadwriteSplittingRuleConfiguration buildReadwriteSplittingRuleConfiguration() {
- ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfiguration =
+ ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig =
new ReadwriteSplittingDataSourceRuleConfiguration("pr_ds", "ms_group",
"ds_primary", Arrays.asList("ds_slave_0", "ds_slave_1"), "test");
- ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfiguration = new ShardingSphereAlgorithmConfiguration("random", buildProps());
+ ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfiguration = new ShardingSphereAlgorithmConfiguration("random", buildProperties());
Map<String, ShardingSphereAlgorithmConfiguration> loadBalancers = new HashMap<>();
loadBalancers.put("test", shardingSphereAlgorithmConfiguration);
- return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceRuleConfiguration), loadBalancers);
+ return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceRuleConfig), loadBalancers);
}
- private Properties buildProps() {
- Properties props = new Properties();
- props.setProperty("read_weight", "2:1");
- return props;
+ private Properties buildProperties() {
+ Properties result = new Properties();
+ result.setProperty("read_weight", "2:1");
+ return result;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandlerTest.java
index 4e0869b..fe3c412 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBindingTableRulesQueryBackendHandlerTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rql.impl;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBindingTableRulesStatement;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
@@ -27,6 +26,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingBindingTableRulesStatement;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.SchemaSegment;
import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
@@ -36,7 +36,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Optional;
@@ -47,27 +46,27 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class ShardingBindingTableRulesQueryBackendHandlerTest {
-
+
@Mock
private BackendConnection backendConnection;
-
+
@Mock
private ShowShardingBindingTableRulesStatement sqlStatement;
-
+
@Mock
private MetaDataContexts metaDataContexts;
-
+
@Mock
private TransactionContexts transactionContexts;
-
+
@Mock
private ShardingSphereMetaData shardingSphereMetaData;
-
+
@Mock
private ShardingSphereRuleMetaData ruleMetaData;
-
+
private ShardingBindingTableRulesQueryBackendHandler handler;
-
+
@Before
public void setUp() {
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
@@ -78,7 +77,7 @@ public final class ShardingBindingTableRulesQueryBackendHandlerTest {
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(buildShardingRuleConfiguration()));
}
-
+
@Test
public void assertExecute() {
ResponseHeader responseHeader = handler.execute("test", sqlStatement);
@@ -87,14 +86,14 @@ public final class ShardingBindingTableRulesQueryBackendHandlerTest {
assertTrue(handler.next());
assertTrue(handler.getRowData().contains("t_order,t_order_item"));
}
-
+
private ShardingRuleConfiguration buildShardingRuleConfiguration() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- shardingRuleConfiguration.getTables().add(new ShardingTableRuleConfiguration("t_order"));
- shardingRuleConfiguration.getTables().add(new ShardingTableRuleConfiguration("t_order_item"));
- shardingRuleConfiguration.getTables().add(new ShardingTableRuleConfiguration("t_1"));
- shardingRuleConfiguration.getTables().add(new ShardingTableRuleConfiguration("t_2"));
- shardingRuleConfiguration.getBindingTableGroups().addAll(Arrays.asList("t_order,t_order_item"));
- return shardingRuleConfiguration;
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ result.getTables().add(new ShardingTableRuleConfiguration("t_order"));
+ result.getTables().add(new ShardingTableRuleConfiguration("t_order_item"));
+ result.getTables().add(new ShardingTableRuleConfiguration("t_1"));
+ result.getTables().add(new ShardingTableRuleConfiguration("t_2"));
+ result.getBindingTableGroups().addAll(Collections.singleton("t_order,t_order_item"));
+ return result;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandlerTest.java
index dafbd04..e3f059a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingBroadcastTableRulesQueryBackendHandlerTest.java
@@ -48,27 +48,27 @@ import static org.hamcrest.CoreMatchers.is;
@RunWith(MockitoJUnitRunner.class)
public final class ShardingBroadcastTableRulesQueryBackendHandlerTest {
-
+
@Mock
private BackendConnection backendConnection;
-
+
@Mock
private ShowShardingBroadcastTableRulesStatement sqlStatement;
-
+
@Mock
private MetaDataContexts metaDataContexts;
-
+
@Mock
private TransactionContexts transactionContexts;
-
+
@Mock
private ShardingSphereMetaData shardingSphereMetaData;
-
+
@Mock
private ShardingSphereRuleMetaData ruleMetaData;
-
+
private ShardingBroadcastTableRulesQueryBackendHandler handler;
-
+
@Before
public void setUp() {
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
@@ -79,19 +79,19 @@ public final class ShardingBroadcastTableRulesQueryBackendHandlerTest {
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(buildShardingRuleConfiguration()));
}
-
+
@Test
public void assertExecute() {
ResponseHeader responseHeader = handler.execute("test", sqlStatement);
assertNotNull(responseHeader);
assertTrue(responseHeader instanceof QueryResponseHeader);
assertTrue(handler.next());
- assertThat(handler.getRowData(), is(Arrays.asList("t_order")));
+ assertThat(handler.getRowData(), is(Collections.singleton("t_order")));
}
-
+
private ShardingRuleConfiguration buildShardingRuleConfiguration() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- shardingRuleConfiguration.getBroadcastTables().addAll(Arrays.asList("t_order", "t_order_item"));
- return shardingRuleConfiguration;
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ result.getBroadcastTables().addAll(Arrays.asList("t_order", "t_order_item"));
+ return result;
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
index 7336cda..d767fa4 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
@@ -53,27 +53,27 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class ShardingTableRulesQueryBackendHandlerTest {
-
+
@Mock
private BackendConnection backendConnection;
-
+
@Mock
private ShowShardingTableRulesStatement sqlStatement;
-
+
@Mock
private MetaDataContexts metaDataContexts;
-
+
@Mock
private TransactionContexts transactionContexts;
-
+
@Mock
private ShardingSphereMetaData shardingSphereMetaData;
-
+
@Mock
private ShardingSphereRuleMetaData ruleMetaData;
-
+
private ShardingTableRulesQueryBackendHandler handler;
-
+
@Before
public void setUp() {
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
@@ -83,7 +83,7 @@ public final class ShardingTableRulesQueryBackendHandlerTest {
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
when(ruleMetaData.getConfigurations()).thenReturn(buildShardingConfiguration());
}
-
+
@Test
public void assertExecute() {
ResponseHeader responseHeader = handler.execute("test", sqlStatement);
@@ -108,11 +108,11 @@ public final class ShardingTableRulesQueryBackendHandlerTest {
assertThat(rowDataList.get(12), is("SNOWFLAKE"));
assertThat(rowDataList.get(13), is("worker-id=123"));
}
-
+
private Collection<RuleConfiguration> buildShardingConfiguration() {
return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(), Collection.class));
}
-
+
@SneakyThrows
private String readYAML() {
return Files.readAllLines(Paths.get(ClassLoader.getSystemResource("yaml/config-sharding.yaml").toURI()))