This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 1c29880684a Eliminate warns (#24266)
1c29880684a is described below
commit 1c29880684ae03292a8ca03f7769ade120358336
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 21 06:25:06 2023 +0800
Eliminate warns (#24266)
* Refactor packages of db backend modules
* Eliminate warns
* Refactor DatabaseAdminBackendHandlerFactory
---
.../admin/DatabaseAdminBackendHandlerFactory.java | 29 ++++++++++------------
...iableUpdatableRALUpdaterBackendHandlerTest.java | 16 ++++++------
.../ral/updatable/SetDistVariableUpdaterTest.java | 14 +++++------
3 files changed, 27 insertions(+), 32 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
index aa1bce4746c..55d99fce79b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminBackendHandlerFactory.java
@@ -37,8 +37,7 @@ import java.util.Optional;
public final class DatabaseAdminBackendHandlerFactory {
/**
- * Create new instance of database admin backend handler,
- * and this handler requires a connection containing a schema to be used.
+ * Create new instance of database admin backend handler, and this handler
requires a connection containing a schema to be used.
*
* @param databaseType database type
* @param sqlStatementContext SQL statement context
@@ -46,11 +45,11 @@ public final class DatabaseAdminBackendHandlerFactory {
* @return created instance
*/
public static Optional<ProxyBackendHandler> newInstance(final DatabaseType
databaseType, final SQLStatementContext<?> sqlStatementContext, final
ConnectionSession connectionSession) {
- Optional<DatabaseAdminExecutorCreator> creator =
TypedSPILoader.findService(DatabaseAdminExecutorCreator.class,
databaseType.getType());
- if (!creator.isPresent()) {
+ Optional<DatabaseAdminExecutorCreator> executorCreator =
TypedSPILoader.findService(DatabaseAdminExecutorCreator.class,
databaseType.getType());
+ if (!executorCreator.isPresent()) {
return Optional.empty();
}
- Optional<DatabaseAdminExecutor> executor =
creator.get().create(sqlStatementContext);
+ Optional<DatabaseAdminExecutor> executor =
executorCreator.get().create(sqlStatementContext);
return executor.map(optional ->
createProxyBackendHandler(sqlStatementContext, connectionSession, optional));
}
@@ -63,21 +62,19 @@ public final class DatabaseAdminBackendHandlerFactory {
* @param sql SQL being executed
* @return created instance
*/
- public static Optional<ProxyBackendHandler> newInstance(final DatabaseType
databaseType, final SQLStatementContext<?> sqlStatementContext,
- final
ConnectionSession connectionSession, final String sql) {
- Optional<DatabaseAdminExecutorCreator> executorFactory =
TypedSPILoader.findService(DatabaseAdminExecutorCreator.class,
databaseType.getType());
- if (!executorFactory.isPresent()) {
+ public static Optional<ProxyBackendHandler> newInstance(final DatabaseType
databaseType,
+ final
SQLStatementContext<?> sqlStatementContext, final ConnectionSession
connectionSession, final String sql) {
+ Optional<DatabaseAdminExecutorCreator> executorCreator =
TypedSPILoader.findService(DatabaseAdminExecutorCreator.class,
databaseType.getType());
+ if (!executorCreator.isPresent()) {
return Optional.empty();
}
- Optional<DatabaseAdminExecutor> executor =
executorFactory.get().create(sqlStatementContext, sql,
connectionSession.getDatabaseName());
+ Optional<DatabaseAdminExecutor> executor =
executorCreator.get().create(sqlStatementContext, sql,
connectionSession.getDatabaseName());
return executor.map(optional ->
createProxyBackendHandler(sqlStatementContext, connectionSession, optional));
}
- private static ProxyBackendHandler createProxyBackendHandler(final
SQLStatementContext<?> sqlStatementContext,
- final
ConnectionSession connectionSession, final DatabaseAdminExecutor executor) {
- if (executor instanceof DatabaseAdminQueryExecutor) {
- return new DatabaseAdminQueryBackendHandler(connectionSession,
(DatabaseAdminQueryExecutor) executor);
- }
- return new DatabaseAdminUpdateBackendHandler(connectionSession,
sqlStatementContext.getSqlStatement(), executor);
+ private static ProxyBackendHandler createProxyBackendHandler(final
SQLStatementContext<?> sqlStatementContext, final ConnectionSession
connectionSession, final DatabaseAdminExecutor executor) {
+ return executor instanceof DatabaseAdminQueryExecutor
+ ? new DatabaseAdminQueryBackendHandler(connectionSession,
(DatabaseAdminQueryExecutor) executor)
+ : new DatabaseAdminUpdateBackendHandler(connectionSession,
sqlStatementContext.getSqlStatement(), executor);
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALUpdaterBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALUpdaterBackendHandlerTest.java
index 221b0787cd7..678cba04e9b 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALUpdaterBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALUpdaterBackendHandlerTest.java
@@ -92,7 +92,7 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test
public void assertSwitchTransactionTypeXA() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement("transaction_type", "XA"), connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement("transaction_type", "XA"), connectionSession);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(connectionSession.getTransactionStatus().getTransactionType(),
is(TransactionType.XA));
@@ -101,7 +101,7 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test
public void assertSwitchTransactionTypeBASE() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement("transaction_type", "BASE"), connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement("transaction_type", "BASE"), connectionSession);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(connectionSession.getTransactionStatus().getTransactionType(),
is(TransactionType.BASE));
@@ -110,7 +110,7 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test
public void assertSwitchTransactionTypeLOCAL() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement("transaction_type", "LOCAL"), connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement("transaction_type", "LOCAL"), connectionSession);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(connectionSession.getTransactionStatus().getTransactionType(),
is(TransactionType.LOCAL));
@@ -119,20 +119,20 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test(expected = UnsupportedVariableException.class)
public void assertSwitchTransactionTypeFailed() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement("transaction_type", "XXX"), connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement("transaction_type", "XXX"), connectionSession);
handler.execute();
}
@Test(expected = UnsupportedVariableException.class)
public void assertNotSupportedVariable() throws SQLException {
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new SetDistVariableStatement("@@session",
"XXX"), connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new SetDistVariableStatement("@@session",
"XXX"), connectionSession);
handler.execute();
}
@Test
public void assertSetAgentPluginsEnabledTrue() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.TRUE.toString()), null);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.TRUE.toString()), null);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(SystemPropertyUtil.getSystemProperty(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.FALSE.toString()), is(Boolean.TRUE.toString()));
@@ -141,7 +141,7 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test
public void assertSetAgentPluginsEnabledFalse() throws SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.FALSE.toString()), null);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.FALSE.toString()), null);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(SystemPropertyUtil.getSystemProperty(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.FALSE.toString()), is(Boolean.FALSE.toString()));
@@ -150,7 +150,7 @@ public final class
SetDistVariableUpdatableRALUpdaterBackendHandlerTest extends
@Test
public void assertSetAgentPluginsEnabledFalseWithUnknownValue() throws
SQLException {
connectionSession.setCurrentDatabase(String.format(DATABASE_PATTERN,
0));
- UpdatableRALUpdaterBackendHandler handler = new
UpdatableRALUpdaterBackendHandler(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(), "xxx"),
connectionSession);
+ UpdatableRALUpdaterBackendHandler<?> handler = new
UpdatableRALUpdaterBackendHandler<>(new
SetDistVariableStatement(VariableEnum.AGENT_PLUGINS_ENABLED.name(), "xxx"),
connectionSession);
ResponseHeader actual = handler.execute();
assertThat(actual, instanceOf(UpdateResponseHeader.class));
assertThat(SystemPropertyUtil.getSystemProperty(VariableEnum.AGENT_PLUGINS_ENABLED.name(),
Boolean.FALSE.toString()), is(Boolean.FALSE.toString()));
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java
index a9e90cb249d..f5f84c003c3 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java
@@ -46,8 +46,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.sql.SQLException;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@@ -60,7 +58,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
private ConnectionSession connectionSession;
@Test
- public void assertExecuteWithTransactionType() throws SQLException {
+ public void assertExecuteWithTransactionType() {
SetDistVariableStatement statement = new
SetDistVariableStatement("transaction_type", "local");
when(connectionSession.getTransactionStatus()).thenReturn(new
TransactionStatus(TransactionType.XA));
SetDistVariableUpdater updater = new SetDistVariableUpdater();
@@ -69,7 +67,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
}
@Test
- public void assertExecuteWithAgent() throws SQLException {
+ public void assertExecuteWithAgent() {
SetDistVariableStatement statement = new
SetDistVariableStatement("AGENT_PLUGINS_ENABLED", Boolean.FALSE.toString());
SetDistVariableUpdater updater = new SetDistVariableUpdater();
updater.executeUpdate(connectionSession, statement);
@@ -78,7 +76,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
}
@Test
- public void assertExecuteWithConfigurationKey() throws SQLException {
+ public void assertExecuteWithConfigurationKey() {
ContextManager contextManager = mockContextManager();
SetDistVariableStatement statement = new
SetDistVariableStatement("proxy_frontend_flush_threshold", "1024");
SetDistVariableUpdater updater = new SetDistVariableUpdater();
@@ -89,7 +87,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
}
@Test
- public void assertExecuteWithInternalConfigurationKey() throws
SQLException {
+ public void assertExecuteWithInternalConfigurationKey() {
ContextManager contextManager = mockContextManager();
SetDistVariableStatement statement = new
SetDistVariableStatement("proxy_meta_data_collector_enabled", "false");
SetDistVariableUpdater updater = new SetDistVariableUpdater();
@@ -100,7 +98,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
}
@Test
- public void assertExecuteWithSystemLogLevel() throws SQLException {
+ public void assertExecuteWithSystemLogLevel() {
ContextManager contextManager = mockContextManager();
SetDistVariableStatement statement = new
SetDistVariableStatement("system_log_level", "debug");
SetDistVariableUpdater updater = new SetDistVariableUpdater();
@@ -111,7 +109,7 @@ public final class SetDistVariableUpdaterTest extends
ProxyContextRestorer {
}
@Test(expected = InvalidValueException.class)
- public void assertExecuteWithWrongSystemLogLevel() throws SQLException {
+ public void assertExecuteWithWrongSystemLogLevel() {
mockContextManager();
SetDistVariableStatement statement = new
SetDistVariableStatement("system_log_level", "invalid");
SetDistVariableUpdater updater = new SetDistVariableUpdater();
