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 c58cd10 Revise #12915 (#12919)
c58cd10 is described below
commit c58cd10b796bdddad94440c23f91c84ff937f6a6
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 7 18:59:04 2021 +0800
Revise #12915 (#12919)
---
...tement.java => CreateFixtureRuleStatement.java} | 5 +--
.../distsql/fixture/FixtureRuleConfiguration.java | 6 +---
.../FixtureRuleDefinitionCreateUpdater.java | 23 +++++--------
.../distsql/fixture/TestDatabaseDiscoveryType.java | 3 --
.../fixture/TestReplicaLoadBalanceAlgorithm.java | 3 --
.../rql/RuleDefinitionBackendHandlerTest.java | 39 ++++++++--------------
6 files changed, 25 insertions(+), 54 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureCreateRuleStatement.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/CreateFixtureRuleStatement.java
similarity index 90%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureCreateRuleStatement.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/CreateFixtureRuleStatement.java
index 6afd021..4553e88 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureCreateRuleStatement.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/CreateFixtureRuleStatement.java
@@ -19,8 +19,5 @@ package
org.apache.shardingsphere.proxy.backend.text.distsql.fixture;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement;
-/**
- * Test CreateRuleStatement type.
- */
-public final class FixtureCreateRuleStatement extends CreateRuleStatement {
+public final class CreateFixtureRuleStatement extends CreateRuleStatement {
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleConfiguration.java
index 45f9dfd..e1c8fab 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleConfiguration.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleConfiguration.java
@@ -17,11 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.fixture;
-import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.function.EnhancedRuleConfiguration;
-/**
- * Test RuleConfiguration type.
- */
-public final class FixtureRuleConfiguration implements RuleConfiguration,
EnhancedRuleConfiguration {
+public final class FixtureRuleConfiguration implements
EnhancedRuleConfiguration {
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
index 56f72e3..404855e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/FixtureRuleDefinitionCreateUpdater.java
@@ -18,36 +18,31 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.fixture;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
import
org.apache.shardingsphere.infra.distsql.update.RuleDefinitionCreateUpdater;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-/**
- * Test RuleDefinitionCreateUpdater type.
- */
-public final class FixtureRuleDefinitionCreateUpdater implements
RuleDefinitionCreateUpdater<FixtureCreateRuleStatement,
FixtureRuleConfiguration> {
-
+public final class FixtureRuleDefinitionCreateUpdater implements
RuleDefinitionCreateUpdater<CreateFixtureRuleStatement,
FixtureRuleConfiguration> {
+
@Override
- public RuleConfiguration buildToBeCreatedRuleConfiguration(final
FixtureCreateRuleStatement sqlStatement) {
+ public RuleConfiguration buildToBeCreatedRuleConfiguration(final
CreateFixtureRuleStatement sqlStatement) {
return new FixtureRuleConfiguration();
}
-
+
@Override
public void updateCurrentRuleConfiguration(final FixtureRuleConfiguration
currentRuleConfig, final FixtureRuleConfiguration toBeCreatedRuleConfig) {
}
-
+
@Override
- public void checkSQLStatement(final ShardingSphereMetaData
shardingSphereMetaData, final FixtureCreateRuleStatement sqlStatement, final
FixtureRuleConfiguration currentRuleConfig)
- throws DistSQLException {
+ public void checkSQLStatement(final ShardingSphereMetaData
shardingSphereMetaData, final CreateFixtureRuleStatement sqlStatement, final
FixtureRuleConfiguration currentRuleConfig) {
}
-
+
@Override
public Class<FixtureRuleConfiguration> getRuleConfigurationClass() {
return FixtureRuleConfiguration.class;
}
-
+
@Override
public String getType() {
- return FixtureCreateRuleStatement.class.getCanonicalName();
+ return CreateFixtureRuleStatement.class.getCanonicalName();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestDatabaseDiscoveryType.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestDatabaseDiscoveryType.java
index 652a448..7daca47 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestDatabaseDiscoveryType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestDatabaseDiscoveryType.java
@@ -23,9 +23,6 @@ import javax.sql.DataSource;
import java.util.Collection;
import java.util.Map;
-/**
- * Test database discovery type.
- */
public final class TestDatabaseDiscoveryType implements DatabaseDiscoveryType {
@Override
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestReplicaLoadBalanceAlgorithm.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestReplicaLoadBalanceAlgorithm.java
index 79217b3..c33724a 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/fixture/TestReplicaLoadBalanceAlgorithm.java
@@ -24,9 +24,6 @@ import
org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgori
import java.util.List;
import java.util.Properties;
-/**
- * Test replica load balance algorithm.
- */
@Getter
@Setter
public final class TestReplicaLoadBalanceAlgorithm implements
ReplicaLoadBalanceAlgorithm {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleDefinitionBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleDefinitionBackendHandlerTest.java
index 5c43347..1cf62ca 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleDefinitionBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/RuleDefinitionBackendHandlerTest.java
@@ -18,22 +18,18 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rql;
import org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
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;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.fixture.FixtureCreateRuleStatement;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.fixture.CreateFixtureRuleStatement;
import
org.apache.shardingsphere.proxy.backend.text.distsql.rdl.rule.RuleDefinitionBackendHandler;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
import java.sql.SQLException;
import java.util.Collections;
@@ -45,33 +41,26 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
public final class RuleDefinitionBackendHandlerTest {
-
- private final BackendConnection backendConnection = new
BackendConnection(TransactionType.LOCAL);
-
- static {
- ShardingSphereServiceLoader.register(RuleDefinitionUpdater.class);
- }
-
+
@Before
public void setUp() {
- MetaDataContexts metaDataContexts = mock(MetaDataContexts.class);
-
when(metaDataContexts.getAllSchemaNames()).thenReturn(Collections.singleton("test"));
- ShardingSphereRuleMetaData ruleMetaData =
mock(ShardingSphereRuleMetaData.class);
- ShardingSphereMetaData shardingSphereMetaData =
mock(ShardingSphereMetaData.class);
-
when(shardingSphereMetaData.getRuleMetaData()).thenReturn(ruleMetaData);
-
when(metaDataContexts.getMetaData("test")).thenReturn(shardingSphereMetaData);
- ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
-
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
- ProxyContext.getInstance().init(contextManager);
+ ShardingSphereServiceLoader.register(RuleDefinitionUpdater.class);
+ ProxyContext.getInstance().init(mockContextManager());
}
-
+
+ private ContextManager mockContextManager() {
+ ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
+
when(result.getMetaDataContexts().getAllSchemaNames()).thenReturn(Collections.singleton("test"));
+
when(result.getMetaDataContexts().getMetaData("test").getRuleMetaData()).thenReturn(mock(ShardingSphereRuleMetaData.class));
+ return result;
+ }
+
@Test
public void assertExecute() throws SQLException {
+ BackendConnection backendConnection = new
BackendConnection(TransactionType.LOCAL);
backendConnection.setCurrentSchema("test");
- RuleDefinitionBackendHandler handler = new
RuleDefinitionBackendHandler(new FixtureCreateRuleStatement(),
backendConnection);
- ResponseHeader response = handler.execute();
+ ResponseHeader response = new RuleDefinitionBackendHandler<>(new
CreateFixtureRuleStatement(), backendConnection).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
assertThat(backendConnection.getTransactionStatus().getTransactionType(),
is(TransactionType.LOCAL));
}
