You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/08/01 13:35:42 UTC
[shardingsphere] branch master updated: Revise #19743 (#19759)
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 bb97eeed5f2 Revise #19743 (#19759)
bb97eeed5f2 is described below
commit bb97eeed5f291f59744ee273c9e283d1926b7a99
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Aug 1 21:35:37 2022 +0800
Revise #19743 (#19759)
---
.../distsql/rdl/RDLBackendHandlerFactory.java | 4 --
.../distsql/rdl/RDLBackendHandlerFactoryTest.java | 45 ++++++++--------------
2 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
index f06e0088745..72bf871a0a3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
@@ -48,10 +48,6 @@ public final class RDLBackendHandlerFactory {
* @throws SQLException SQL exception
*/
public static ProxyBackendHandler newInstance(final RDLStatement sqlStatement, final ConnectionSession connectionSession) throws SQLException {
- return createBackendHandler(sqlStatement, connectionSession);
- }
-
- private static ProxyBackendHandler createBackendHandler(final RDLStatement sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof AddResourceStatement) {
return new AddResourceBackendHandler((AddResourceStatement) sqlStatement, connectionSession);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java
index 35675dbe2e7..ba7ab3956da 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java
@@ -17,57 +17,42 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rdl;
-import lombok.SneakyThrows;
+import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterResourceStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.create.AddResourceStatement;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropResourceStatement;
-import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource.AddResourceBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource.AlterResourceBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource.DropResourceBackendHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.RuleDefinitionBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+
+import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class RDLBackendHandlerFactoryTest {
- @Mock
- private AddResourceStatement addResourceStatement;
-
- @Mock
- private AlterResourceStatement alterResourceStatement;
-
- @Mock
- private DropResourceStatement dropResourceStatement;
-
- @Mock
- private ConnectionSession connectionSession;
-
@Test
- @SneakyThrows
- public void assertRDLBackendHandlerReturnAddResourceBackendHandler() {
- ProxyBackendHandler handler = RDLBackendHandlerFactory.newInstance(addResourceStatement, connectionSession);
- assertThat(handler, instanceOf(AddResourceBackendHandler.class));
+ public void assertNewInstanceWithAddResourceStatement() throws SQLException {
+ assertThat(RDLBackendHandlerFactory.newInstance(mock(AddResourceStatement.class), mock(ConnectionSession.class)), instanceOf(AddResourceBackendHandler.class));
}
@Test
- @SneakyThrows
- public void assertRDLBackendHandlerReturnAlterResourceStatement() {
- ProxyBackendHandler handler = RDLBackendHandlerFactory.newInstance(alterResourceStatement, connectionSession);
- assertThat(handler, instanceOf(AlterResourceBackendHandler.class));
+ public void assertNewInstanceWithAlterResourceStatement() throws SQLException {
+ assertThat(RDLBackendHandlerFactory.newInstance(mock(AlterResourceStatement.class), mock(ConnectionSession.class)), instanceOf(AlterResourceBackendHandler.class));
}
@Test
- @SneakyThrows
- public void assertRDLBackendHandlerReturnDropResourceStatement() {
- ProxyBackendHandler handler = RDLBackendHandlerFactory.newInstance(dropResourceStatement, connectionSession);
- assertThat(handler, instanceOf(DropResourceBackendHandler.class));
+ public void assertNewInstanceWithDropResourceStatement() throws SQLException {
+ assertThat(RDLBackendHandlerFactory.newInstance(mock(DropResourceStatement.class), mock(ConnectionSession.class)), instanceOf(DropResourceBackendHandler.class));
}
+ @Test
+ public void assertNewInstanceWithRuleDefinitionStatement() throws SQLException {
+ assertThat(RDLBackendHandlerFactory.newInstance(mock(RuleDefinitionStatement.class), mock(ConnectionSession.class)), instanceOf(RuleDefinitionBackendHandler.class));
+ }
}