This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 9f4a9b3ae96 Fixes code inspections on feature module (#38762)
9f4a9b3ae96 is described below
commit 9f4a9b3ae965e353c2a907966330a44d354e9a41
Author: Liang Zhang <[email protected]>
AuthorDate: Sat May 30 23:01:42 2026 +0800
Fixes code inspections on feature module (#38762)
* Fixes code inspections on feature module
* Fixes code inspections on feature module
---
.../EncryptRuleConfigurationCheckerTest.java | 3 ++-
.../EncryptSQLRewriteContextDecoratorTest.java | 18 +++++++++------
.../update/AlterEncryptRuleExecutorTest.java | 5 +++--
.../update/CreateEncryptRuleExecutorTest.java | 3 ++-
.../update/DropEncryptRuleExecutorTest.java | 7 +++---
.../MaskAlgorithmPropertiesCheckerTest.java | 2 +-
.../handler/update/CreateMaskRuleExecutorTest.java | 5 +++--
.../handler/update/DropMaskRuleExecutorTest.java | 5 +++--
...writeSplittingRuleConfigurationCheckerTest.java | 3 ++-
.../column/ColumnShadowValueValidatorTest.java | 3 ++-
.../ShardingRuleConfigurationCheckerTest.java | 3 ++-
.../dql/groupby/GroupByRowComparatorTest.java | 6 ++---
...rdingKeyGenerateStrategyStatementConverter.java | 8 +++----
.../ShardingTableRuleStatementCheckerTest.java | 15 +++++++------
.../update/AlterShardingTableRuleExecutorTest.java | 3 ++-
.../CreateShardingTableRuleExecutorTest.java | 9 ++++----
.../DropDefaultShardingStrategyExecutorTest.java | 3 ++-
.../update/DropShardingAlgorithmExecutorTest.java | 3 ++-
.../update/DropShardingAuditorExecutorTest.java | 3 ++-
.../DropShardingKeyGeneratorExecutorTest.java | 3 ++-
.../DropShardingTableReferenceExecutorTest.java | 3 ++-
.../update/DropShardingTableRuleExecutorTest.java | 3 ++-
.../core/ShardingDistSQLStatementVisitorTest.java | 26 ++++++++++++----------
23 files changed, 83 insertions(+), 59 deletions(-)
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
index 93e0ff26a6a..a9ae12f132c 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
@@ -37,6 +37,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
class EncryptRuleConfigurationCheckerTest {
@@ -53,7 +54,7 @@ class EncryptRuleConfigurationCheckerTest {
@Test
void assertCheckSuccess() {
EncryptRuleConfiguration ruleConfig = createValidRuleConfiguration();
- checker.check("foo_db", ruleConfig, Collections.emptyMap(),
Collections.emptyList());
+ assertDoesNotThrow(() -> checker.check("foo_db", ruleConfig,
Collections.emptyMap(), Collections.emptyList()));
}
private EncryptRuleConfiguration createValidRuleConfiguration() {
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecoratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecoratorTest.java
index 1df73e7f288..b51721d653d 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecoratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecoratorTest.java
@@ -85,15 +85,10 @@ class EncryptSQLRewriteContextDecoratorTest {
decorator.decorate(rule, mock(ConfigurationProperties.class),
sqlRewriteContext, mock(RouteContext.class));
assertTrue(sqlRewriteContext.getSqlTokens().isEmpty());
}
- // CHECKSTYLE:OFF
+
@Test
void assertDecorateWithoutDroppedEncryptTable() {
- // CHECKSTYLE:ON
- EncryptColumnRuleConfiguration columnConfig = new
EncryptColumnRuleConfiguration("pwd", new
EncryptColumnItemRuleConfiguration("pwd_cipher", "standard_encryptor"));
- EncryptTableRuleConfiguration tableConfig = new
EncryptTableRuleConfiguration("t_encrypt", Collections.singleton(columnConfig));
- EncryptRuleConfiguration ruleConfig = new EncryptRuleConfiguration(new
LinkedList<>(Collections.singleton(tableConfig)),
- Collections.singletonMap("standard_encryptor", new
AlgorithmConfiguration("CORE.FIXTURE", new Properties())));
- new
EncryptTableChangedProcessor().dropRuleItemConfiguration("t_encrypt",
ruleConfig);
+ EncryptRuleConfiguration ruleConfig = getEncryptRuleConfiguration();
SQLRewriteContext sqlRewriteContext = mock(SQLRewriteContext.class);
InsertStatementContext insertStatementContext =
mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
when(insertStatementContext.getTablesContext().getSimpleTables()).thenReturn(Collections.singleton(
@@ -102,4 +97,13 @@ class EncryptSQLRewriteContextDecoratorTest {
decorator.decorate(new EncryptRule("foo_db", ruleConfig),
mock(ConfigurationProperties.class), sqlRewriteContext,
mock(RouteContext.class));
verify(sqlRewriteContext, never()).addSQLTokenGenerators(any());
}
+
+ private EncryptRuleConfiguration getEncryptRuleConfiguration() {
+ EncryptColumnRuleConfiguration columnConfig = new
EncryptColumnRuleConfiguration("pwd", new
EncryptColumnItemRuleConfiguration("pwd_cipher", "standard_encryptor"));
+ EncryptTableRuleConfiguration tableConfig = new
EncryptTableRuleConfiguration("t_encrypt", Collections.singleton(columnConfig));
+ EncryptRuleConfiguration result = new EncryptRuleConfiguration(new
LinkedList<>(Collections.singleton(tableConfig)),
+ Collections.singletonMap("standard_encryptor", new
AlgorithmConfiguration("CORE.FIXTURE", new Properties())));
+ new
EncryptTableChangedProcessor().dropRuleItemConfiguration("t_encrypt", result);
+ return result;
+ }
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
index ed23d8e8f31..c4a6face2eb 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
@@ -45,6 +45,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -95,7 +96,7 @@ class AlterEncryptRuleExecutorTest {
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
new
DistSQLUpdateExecuteEngine(createSQLStatementWithAssistQueryAndLikeColumns(),
"foo_db", contextManager, null).executeUpdate();
metaDataManagerPersistService.removeRuleConfigurationItem(any(),
ArgumentMatchers.argThat(this::assertToBeDroppedRuleConfiguration));
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration)));
}
@Test
@@ -107,7 +108,7 @@ class AlterEncryptRuleExecutorTest {
new
DistSQLUpdateExecuteEngine(createSQLStatementWithoutAssistQueryAndLikeColumns(),
"foo_db", contextManager, null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.removeRuleConfigurationItem(any(),
ArgumentMatchers.argThat(this::assertToBeDroppedRuleConfiguration));
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration)));
}
private ContextManager mockContextManager(final EncryptRule rule) {
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
index 0c579379693..8c76caf971d 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
@@ -44,6 +44,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
@@ -101,7 +102,7 @@ class CreateEncryptRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db", contextManager,
null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertIfNotExistsRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertIfNotExistsRuleConfiguration)));
}
private CreateEncryptRuleStatement createAESEncryptRuleSQLStatement() {
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
index e8796f7fdc9..34eb1156ad2 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
@@ -45,6 +45,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -71,7 +72,7 @@ class DropEncryptRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement("T_ENCRYPT"),
"foo_db", contextManager, null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration)));
}
@Test
@@ -101,7 +102,7 @@ class DropEncryptRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement("T_ENCRYPT"),
"foo_db", contextManager, null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors)));
}
private boolean assertRuleConfigurationWithoutEncryptors(final
EncryptRuleConfiguration actual) {
@@ -119,7 +120,7 @@ class DropEncryptRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(statement, "foo_db", contextManager,
null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors)));
}
private DropEncryptRuleStatement createSQLStatement(final String
tableName) {
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
index 252394da2a8..4392f4512f5 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
@@ -70,7 +70,7 @@ class MaskAlgorithmPropertiesCheckerTest {
@Test
void assertCheckPositiveIntegerSuccess() {
Properties props = PropertiesBuilder.build(new Property("key", "123"));
- MaskAlgorithmPropertiesChecker.checkPositiveInteger(props, "key",
mock(MaskAlgorithm.class));
+ assertDoesNotThrow(() ->
MaskAlgorithmPropertiesChecker.checkPositiveInteger(props, "key",
mock(MaskAlgorithm.class)));
}
@Test
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
index 855777cdb4a..26b44888921 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
@@ -41,6 +41,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -66,7 +67,7 @@ class CreateMaskRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db", contextManager,
null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration)));
}
@Test
@@ -78,7 +79,7 @@ class CreateMaskRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db", contextManager,
null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration)));
}
private CreateMaskRuleStatement createSQLStatement(final boolean
ifNotExists, final String algorithmType) {
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
index 1842e64058c..7f5643f1c9c 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
@@ -40,6 +40,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -64,7 +65,7 @@ class DropMaskRuleExecutorTest {
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement(false, "T_MASK"),
"foo_db", contextManager, null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutIfExists));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutIfExists)));
}
private boolean assertRuleConfigurationWithoutIfExists(final
MaskRuleConfiguration actual) {
@@ -83,7 +84,7 @@ class DropMaskRuleExecutorTest {
new DistSQLUpdateExecuteEngine(createSQLStatement(true, "T_USER"),
"foo_db", contextManager, null).executeUpdate();
MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutIfExists));
- metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithIfExists));
+ assertDoesNotThrow(() ->
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithIfExists)));
}
private DropMaskRuleStatement createSQLStatement(final boolean ifExists,
final String tableName) {
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
index cf42da6365e..893f778db0f 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
@@ -45,6 +45,7 @@ import java.util.Map;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -108,7 +109,7 @@ class ReadwriteSplittingRuleConfigurationCheckerTest {
DataSourceMapperRuleAttribute ruleAttribute =
mock(DataSourceMapperRuleAttribute.class, RETURNS_DEEP_STUBS);
when(ruleAttribute.getDataSourceMapper().containsKey("otherDatasourceName")).thenReturn(true);
when(rule.getAttributes()).thenReturn(new
RuleAttributes(ruleAttribute));
- checker.check("test", ruleConfig, mockDataSources(),
Collections.singleton(rule));
+ assertDoesNotThrow(() -> checker.check("test", ruleConfig,
mockDataSources(), Collections.singleton(rule)));
}
private ReadwriteSplittingRuleConfiguration
createContainsOtherRulesDatasourceConfiguration() {
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnShadowValueValidatorTest.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnShadowValueValidatorTest.java
index d11d21defc4..a8d398314e4 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnShadowValueValidatorTest.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/ColumnShadowValueValidatorTest.java
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test;
import java.util.Date;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
@@ -39,6 +40,6 @@ class ColumnShadowValueValidatorTest {
@Test
void assertValidateAcceptedType() {
- ColumnShadowValueValidator.validate("foo_tbl", "foo_col", "");
+ assertDoesNotThrow(() ->
ColumnShadowValueValidator.validate("foo_tbl", "foo_col", ""));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/config/ShardingRuleConfigurationCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/config/ShardingRuleConfigurationCheckerTest.java
index a60682ac690..70bdd29c636 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/config/ShardingRuleConfigurationCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/config/ShardingRuleConfigurationCheckerTest.java
@@ -45,6 +45,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
class ShardingRuleConfigurationCheckerTest {
@@ -66,7 +67,7 @@ class ShardingRuleConfigurationCheckerTest {
ruleConfig.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(shardingStrategyConfig,
shardingAuditStrategyConfig)));
ruleConfig.getKeyGenerateStrategies().put("foo_column_strategy",
createColumnKeyGenerateStrategyRuleConfiguration("foo_keygen"));
ruleConfig.getKeyGenerateStrategies().put("foo_sequence_strategy",
createSequenceKeyGenerateStrategyRuleConfiguration("foo_keygen"));
- checker.check("foo_db", ruleConfig, Collections.emptyMap(),
Collections.emptyList());
+ assertDoesNotThrow(() -> checker.check("foo_db", ruleConfig,
Collections.emptyMap(), Collections.emptyList()));
}
@Test
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
index 978596fba2c..9fb7b831ff7 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
@@ -172,9 +172,9 @@ class GroupByRowComparatorTest {
SelectStatementContext selectStatementContext = new
SelectStatementContext(
selectStatement, createShardingSphereMetaData(database),
"foo_db", Collections.emptyList());
GroupByRowComparator groupByRowComparator = new
GroupByRowComparator(selectStatementContext, Arrays.asList(false, false));
- MemoryQueryResultRow smaller = new
MemoryQueryResultRow(mockQueryResult((Object) new byte[]{1, 2}));
- MemoryQueryResultRow larger = new
MemoryQueryResultRow(mockQueryResult((Object) new byte[]{(byte) 0x80}));
- MemoryQueryResultRow equalToSmaller = new
MemoryQueryResultRow(mockQueryResult((Object) new byte[]{1, 2}));
+ MemoryQueryResultRow smaller = new
MemoryQueryResultRow(mockQueryResult(new byte[]{1, 2}));
+ MemoryQueryResultRow larger = new
MemoryQueryResultRow(mockQueryResult(new byte[]{(byte) 0x80}));
+ MemoryQueryResultRow equalToSmaller = new
MemoryQueryResultRow(mockQueryResult(new byte[]{1, 2}));
assertTrue(groupByRowComparator.compare(smaller, larger) < 0);
assertThat(groupByRowComparator.compare(smaller, equalToSmaller),
is(0));
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingKeyGenerateStrategyStatementConverter.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingKeyGenerateStrategyStatementConverter.java
index c83be273a9e..51b7f94fb54 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingKeyGenerateStrategyStatementConverter.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingKeyGenerateStrategyStatementConverter.java
@@ -58,11 +58,11 @@ public final class
ShardingKeyGenerateStrategyStatementConverter {
public static String getKeyGeneratorName(final String strategyName, final
AbstractKeyGenerateStrategyDefinitionSegment keyGenerateStrategySegment) {
if (keyGenerateStrategySegment.getKeyGeneratorName().isPresent()) {
return keyGenerateStrategySegment.getKeyGeneratorName().get();
- } else if
(keyGenerateStrategySegment.getAlgorithmSegment().isPresent()) {
- return
ShardingKeyGenerateStrategyStatementConverter.createKeyGeneratorName(strategyName,
keyGenerateStrategySegment.getAlgorithmSegment().get());
- } else {
- throw new IllegalArgumentException("Either key generator name or
algorithm segment must be provided.");
}
+ if (keyGenerateStrategySegment.getAlgorithmSegment().isPresent()) {
+ return createKeyGeneratorName(strategyName,
keyGenerateStrategySegment.getAlgorithmSegment().get());
+ }
+ throw new IllegalArgumentException("Either key generator name or
algorithm segment must be provided.");
}
private static String createKeyGeneratorName(final String strategyName,
final AlgorithmSegment algorithmSegment) {
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementCheckerTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementCheckerTest.java
index 67fade6f717..061b569d227 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementCheckerTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementCheckerTest.java
@@ -64,6 +64,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;
@@ -89,7 +90,7 @@ class ShardingTableRuleStatementCheckerTest {
Collection<AbstractTableRuleSegment> rules = new LinkedList<>();
rules.add(createCompleteAutoTableRule());
rules.add(createCompleteTableRule());
- ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkCreation(database, rules, false,
shardingRuleConfig));
}
@Test
@@ -99,7 +100,7 @@ class ShardingTableRuleStatementCheckerTest {
autoTableRuleSegment.setShardingColumn("order_id");
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("CORE.AUTO.FIXTURE", PropertiesBuilder.build(new
Property("sharding-count", "2"))));
rules.add(autoTableRuleSegment);
- ShardingTableRuleStatementChecker.checkAlteration(database, rules,
shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkAlteration(database, rules,
shardingRuleConfig));
}
@Test
@@ -115,7 +116,7 @@ class ShardingTableRuleStatementCheckerTest {
autoTable2.setShardingColumn("order_id");
autoTable2.setShardingAlgorithmSegment(new
AlgorithmSegment("CORE.AUTO.FIXTURE", PropertiesBuilder.build(new
Property("sharding-count", "2"))));
rules.add(autoTable2);
- ShardingTableRuleStatementChecker.checkAlteration(database, rules,
shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkAlteration(database, rules,
shardingRuleConfig));
}
@Test
@@ -158,7 +159,7 @@ class ShardingTableRuleStatementCheckerTest {
autoTableRuleSegment.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("product_id", "existing_snowflake"));
autoTableRuleSegment.setShardingColumn("product_id");
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("FOO.DISTSQL.FIXTURE", PropertiesBuilder.build(new
Property("", ""))));
- ShardingTableRuleStatementChecker.checkCreation(database,
Collections.singleton(autoTableRuleSegment), false, shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkCreation(database,
Collections.singleton(autoTableRuleSegment), false, shardingRuleConfig));
}
@Test
@@ -285,7 +286,7 @@ class ShardingTableRuleStatementCheckerTest {
AutoTableRuleSegment autoTableRuleSegment = new
AutoTableRuleSegment("t_product", Arrays.asList("ds_0", "ds_1"));
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("CORE.AUTO.FIXTURE", PropertiesBuilder.build(new
Property("sharding-count", "4"))));
Collection<AbstractTableRuleSegment> rules =
Collections.singleton(autoTableRuleSegment);
- ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkCreation(database, rules, false,
shardingRuleConfig));
}
@Test
@@ -293,7 +294,7 @@ class ShardingTableRuleStatementCheckerTest {
Collection<AbstractTableRuleSegment> rules = new LinkedList<>();
rules.add(createCompleteAutoTableRule());
rules.add(createCompleteTableRule());
- ShardingTableRuleStatementChecker.checkCreation(database, rules, true,
shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkCreation(database, rules, true,
shardingRuleConfig));
}
@Test
@@ -307,7 +308,7 @@ class ShardingTableRuleStatementCheckerTest {
void assertCheckTableRuleWithNoneStrategyTypeSuccess() {
Collection<AbstractTableRuleSegment> rules = new LinkedList<>();
rules.add(createCompleteTableRuleWithNoneTypeStrategy());
- ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
+ assertDoesNotThrow(() ->
ShardingTableRuleStatementChecker.checkCreation(database, rules, false,
shardingRuleConfig));
}
private static ShardingRuleConfiguration createShardingRuleConfiguration()
{
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutorTest.java
index 385ed40535f..ba4ea7bcfe9 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutorTest.java
@@ -58,6 +58,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -179,7 +180,7 @@ class AlterShardingTableRuleExecutorTest {
+ "TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='6')),"
+
"KEY_GENERATE_STRATEGY(COLUMN=order_id,GENERATOR=existing_snowflake))";
AlterShardingTableRuleStatement distSQLStatement =
(AlterShardingTableRuleStatement) getDistSQLStatement(sql);
- executor.checkBeforeUpdate(distSQLStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(distSQLStatement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutorTest.java
index e81730574f0..599414a4dc2 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutorTest.java
@@ -67,6 +67,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -132,7 +133,7 @@ class CreateShardingTableRuleExecutorTest {
+ "TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='6')),"
+
"KEY_GENERATE_STRATEGY(COLUMN=order_id,TYPE(NAME='snowflake')))";
CreateShardingTableRuleStatement distSQLStatement =
(CreateShardingTableRuleStatement) getDistSQLStatement(sql);
- executor.checkBeforeUpdate(distSQLStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(distSQLStatement));
}
@Test
@@ -148,7 +149,7 @@ class CreateShardingTableRuleExecutorTest {
+ "TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='6')),"
+
"KEY_GENERATE_STRATEGY(COLUMN=order_id,GENERATOR=existing_snowflake))";
CreateShardingTableRuleStatement distSQLStatement =
(CreateShardingTableRuleStatement) getDistSQLStatement(sql);
- executor.checkBeforeUpdate(distSQLStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(distSQLStatement));
}
@Test
@@ -186,7 +187,7 @@ class CreateShardingTableRuleExecutorTest {
+
"TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id
% 2}'))))"
+ ");";
CreateShardingTableRuleStatement distSQLStatement =
(CreateShardingTableRuleStatement) getDistSQLStatement(sql);
- executor.checkBeforeUpdate(distSQLStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(distSQLStatement));
}
@Test
@@ -208,7 +209,7 @@ class CreateShardingTableRuleExecutorTest {
+ "TABLE_STRATEGY(TYPE='NONE')"
+ ");";
CreateShardingTableRuleStatement distSQLStatement =
(CreateShardingTableRuleStatement) getDistSQLStatement(sql);
- executor.checkBeforeUpdate(distSQLStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(distSQLStatement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutorTest.java
index 3c9cb24bb58..bd7ddf9f28a 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutorTest.java
@@ -32,6 +32,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -64,7 +65,7 @@ class DropDefaultShardingStrategyExecutorTest {
executor.setRule(rule);
executor.checkBeforeUpdate(new
DropDefaultShardingStrategyStatement(true, "table"));
executor.setRule(null);
- executor.checkBeforeUpdate(new
DropDefaultShardingStrategyStatement(true, "table"));
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(new
DropDefaultShardingStrategyStatement(true, "table")));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutorTest.java
index 8f2552990f6..3c758f6c623 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutorTest.java
@@ -37,6 +37,7 @@ import java.util.Properties;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -66,7 +67,7 @@ class DropShardingAlgorithmExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(new
ShardingRuleConfiguration());
executor.setRule(rule);
- executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order"));
+ assertDoesNotThrow(() ->
executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order")));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutorTest.java
index cc63b47699f..a2eb54414a2 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutorTest.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -63,7 +64,7 @@ class DropShardingAuditorExecutorTest {
when(rule.getConfiguration()).thenReturn(new
ShardingRuleConfiguration());
executor.setRule(rule);
DropShardingAuditorStatement sqlStatement = new
DropShardingAuditorStatement(true,
Collections.singleton("sharding_key_required_auditor"));
- executor.checkBeforeUpdate(sqlStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(sqlStatement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutorTest.java
index 40d96305370..722b241aa23 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutorTest.java
@@ -33,6 +33,7 @@ import java.util.Collections;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -62,7 +63,7 @@ class DropShardingKeyGeneratorExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(new
ShardingRuleConfiguration());
executor.setRule(rule);
- executor.checkBeforeUpdate(sqlStatement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(sqlStatement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutorTest.java
index 1a563ce9206..da6cee321e3 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutorTest.java
@@ -33,6 +33,7 @@ import java.util.Collections;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -66,7 +67,7 @@ class DropShardingTableReferenceExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(shardingRuleConfig);
executor.setRule(rule);
- executor.checkBeforeUpdate(statement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(statement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutorTest.java
index 67ad39f9dd4..b8279a64230 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutorTest.java
@@ -45,6 +45,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -74,7 +75,7 @@ class DropShardingTableRuleExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(new
ShardingRuleConfiguration());
executor.setRule(rule);
- executor.checkBeforeUpdate(statement);
+ assertDoesNotThrow(() -> executor.checkBeforeUpdate(statement));
}
@Test
diff --git
a/features/sharding/distsql/parser/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitorTest.java
b/features/sharding/distsql/parser/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitorTest.java
index 61436e77b47..b5018f67306 100644
---
a/features/sharding/distsql/parser/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitorTest.java
+++
b/features/sharding/distsql/parser/src/test/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitorTest.java
@@ -43,6 +43,8 @@ import java.util.Arrays;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isA;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ShardingDistSQLStatementVisitorTest {
@@ -51,12 +53,12 @@ class ShardingDistSQLStatementVisitorTest {
void assertCreateColumnStrategyWithAlgorithm() {
CreateShardingKeyGenerateStrategyStatement actual =
(CreateShardingKeyGenerateStrategyStatement) parse(
"CREATE SHARDING KEY GENERATE STRATEGY order_id_strategy
(TABLE=t_order, COLUMN=order_id, TYPE(NAME='snowflake',
PROPERTIES('worker-id'=1)))");
- assertTrue(actual.getKeyGenerateStrategySegment() instanceof
ColumnKeyGenerateStrategyDefinitionSegment);
+ assertThat(actual.getKeyGenerateStrategySegment(),
isA(ColumnKeyGenerateStrategyDefinitionSegment.class));
ColumnKeyGenerateStrategyDefinitionSegment actualSegment =
(ColumnKeyGenerateStrategyDefinitionSegment)
actual.getKeyGenerateStrategySegment();
assertThat(actual.getName(), is("order_id_strategy"));
assertThat(actualSegment.getTableName(), is("t_order"));
assertThat(actualSegment.getColumnName(), is("order_id"));
- assertTrue(!actualSegment.getKeyGeneratorName().isPresent());
+ assertFalse(actualSegment.getKeyGeneratorName().isPresent());
assertThat(actualSegment.getAlgorithmSegment().get().getName(),
is("snowflake"));
assertThat(actualSegment.getAlgorithmSegment().get().getProps().getProperty("worker-id"),
is("1"));
}
@@ -74,26 +76,26 @@ class ShardingDistSQLStatementVisitorTest {
void assertCreateColumnStrategyWithGenerator() {
CreateShardingKeyGenerateStrategyStatement actual =
(CreateShardingKeyGenerateStrategyStatement) parse(
"CREATE SHARDING KEY GENERATE STRATEGY order_id_strategy
(TABLE=t_order, COLUMN=order_id, GENERATOR=snowflake_generator)");
- assertTrue(actual.getKeyGenerateStrategySegment() instanceof
ColumnKeyGenerateStrategyDefinitionSegment);
+ assertThat(actual.getKeyGenerateStrategySegment(),
isA(ColumnKeyGenerateStrategyDefinitionSegment.class));
ColumnKeyGenerateStrategyDefinitionSegment actualSegment =
(ColumnKeyGenerateStrategyDefinitionSegment)
actual.getKeyGenerateStrategySegment();
assertThat(actual.getName(), is("order_id_strategy"));
assertThat(actualSegment.getTableName(), is("t_order"));
assertThat(actualSegment.getColumnName(), is("order_id"));
assertThat(actualSegment.getKeyGeneratorName().get(),
is("snowflake_generator"));
- assertTrue(!actualSegment.getAlgorithmSegment().isPresent());
+ assertFalse(actualSegment.getAlgorithmSegment().isPresent());
}
@Test
void assertAlterColumnStrategyWithGenerator() {
AlterShardingKeyGenerateStrategyStatement actual =
(AlterShardingKeyGenerateStrategyStatement) parse(
"ALTER SHARDING KEY GENERATE STRATEGY order_id_strategy
(TABLE=t_order, COLUMN=order_id, GENERATOR=snowflake_generator)");
- assertTrue(actual.getKeyGenerateStrategySegment() instanceof
ColumnKeyGenerateStrategyDefinitionSegment);
+ assertThat(actual.getKeyGenerateStrategySegment(),
isA(ColumnKeyGenerateStrategyDefinitionSegment.class));
ColumnKeyGenerateStrategyDefinitionSegment actualSegment =
(ColumnKeyGenerateStrategyDefinitionSegment)
actual.getKeyGenerateStrategySegment();
assertThat(actual.getName(), is("order_id_strategy"));
assertThat(actualSegment.getTableName(), is("t_order"));
assertThat(actualSegment.getColumnName(), is("order_id"));
assertThat(actualSegment.getKeyGeneratorName().get(),
is("snowflake_generator"));
- assertTrue(!actualSegment.getAlgorithmSegment().isPresent());
+ assertFalse(actualSegment.getAlgorithmSegment().isPresent());
}
@Test
@@ -108,11 +110,11 @@ class ShardingDistSQLStatementVisitorTest {
void assertCreateSequenceStrategyWithAlgorithm() {
CreateShardingKeyGenerateStrategyStatement actual =
(CreateShardingKeyGenerateStrategyStatement) parse(
"CREATE SHARDING KEY GENERATE STRATEGY order_sequence_strategy
(SEQUENCE='order_seq', TYPE(NAME='redis_cluster_auto_increment',
PROPERTIES('increment'=1)))");
- assertTrue(actual.getKeyGenerateStrategySegment() instanceof
SequenceKeyGenerateStrategyDefinitionSegment);
+ assertThat(actual.getKeyGenerateStrategySegment(),
isA(SequenceKeyGenerateStrategyDefinitionSegment.class));
SequenceKeyGenerateStrategyDefinitionSegment actualSegment =
(SequenceKeyGenerateStrategyDefinitionSegment)
actual.getKeyGenerateStrategySegment();
assertThat(actual.getName(), is("order_sequence_strategy"));
assertThat(actualSegment.getSequenceName(), is("order_seq"));
- assertTrue(!actualSegment.getKeyGeneratorName().isPresent());
+ assertFalse(actualSegment.getKeyGeneratorName().isPresent());
assertThat(actualSegment.getAlgorithmSegment().get().getName(),
is("redis_cluster_auto_increment"));
assertThat(actualSegment.getAlgorithmSegment().get().getProps().getProperty("increment"),
is("1"));
}
@@ -121,14 +123,14 @@ class ShardingDistSQLStatementVisitorTest {
void assertShowStrategies() {
ShowShardingKeyGenerateStrategiesStatement actual =
(ShowShardingKeyGenerateStrategiesStatement) parse(
"SHOW SHARDING KEY GENERATE STRATEGIES FROM sharding_db");
- assertTrue(!actual.getName().isPresent());
+ assertFalse(actual.getName().isPresent());
assertThat(actual.getFromDatabase().getDatabase().getIdentifier().getValue(),
is("sharding_db"));
}
@Test
void assertShowKeyGenerators() {
ShowShardingKeyGeneratorsStatement actual =
(ShowShardingKeyGeneratorsStatement) parse("SHOW SHARDING KEY GENERATORS FROM
sharding_db");
- assertTrue(!actual.getName().isPresent());
+ assertFalse(actual.getName().isPresent());
assertThat(actual.getFromDatabase().getDatabase().getIdentifier().getValue(),
is("sharding_db"));
}
@@ -171,7 +173,7 @@ class ShardingDistSQLStatementVisitorTest {
TableRuleSegment actualSegment = (TableRuleSegment)
actual.getRules().iterator().next();
assertThat(actualSegment.getKeyGenerateStrategySegment().getKeyGenerateColumn(),
is("order_id"));
assertThat(actualSegment.getKeyGenerateStrategySegment().getKeyGeneratorName().get(),
is("snowflake_generator"));
-
assertTrue(!actualSegment.getKeyGenerateStrategySegment().getAlgorithmSegment().isPresent());
+
assertFalse(actualSegment.getKeyGenerateStrategySegment().getAlgorithmSegment().isPresent());
}
@Test
@@ -183,7 +185,7 @@ class ShardingDistSQLStatementVisitorTest {
AutoTableRuleSegment actualSegment = (AutoTableRuleSegment)
actual.getRules().iterator().next();
assertThat(actualSegment.getKeyGenerateStrategySegment().getKeyGenerateColumn(),
is("order_id"));
assertThat(actualSegment.getKeyGenerateStrategySegment().getKeyGeneratorName().get(),
is("snowflake_generator"));
-
assertTrue(!actualSegment.getKeyGenerateStrategySegment().getAlgorithmSegment().isPresent());
+
assertFalse(actualSegment.getKeyGenerateStrategySegment().getAlgorithmSegment().isPresent());
}
@SneakyThrows(ReflectiveOperationException.class)
