Skip to content

Fixes code inspections on feature module #38762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terrymanu merged 2 commits into from
May 30, 2026
Merged

Fixes code inspections on feature module #38762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faf8570
Fixes code inspections on feature module
terrymanu May 30, 2026
961deb7
Fixes code inspections on feature module
terrymanu May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

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 {
Expand All @@ -53,7 +54,7 @@ void setUp() {
@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() {
Expand Down
18 changes: 11 additions & 7 deletions .../apache/shardingsphere/encrypt/rewrite/context/EncryptSQLRewriteContextDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,10 @@ void assertDecorateWithoutEncryptTable() {
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(
Expand All @@ -102,4 +97,13 @@ void assertDecorateWithoutDroppedEncryptTable() {
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;
}
}
5 changes: 3 additions & 2 deletions ...rg/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

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;
Expand Down Expand Up @@ -95,7 +96,7 @@ void assertExecuteUpdateWithAssistQueryAndLikeColumns() throws SQLException {
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
Expand All @@ -107,7 +108,7 @@ void assertExecuteUpdateWithoutAssistQueryAndLikeColumns() throws SQLException {
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) {
Expand Down
3 changes: 2 additions & 1 deletion ...g/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
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;
Expand Down Expand Up @@ -101,7 +102,7 @@ void assertExecuteUpdateWithIfNotExists() throws SQLException {
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() {
Expand Down
7 changes: 4 additions & 3 deletions ...org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

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;
Expand All @@ -71,7 +72,7 @@ void assertExecuteUpdate() throws SQLException {
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
Expand Down Expand Up @@ -101,7 +102,7 @@ void assertExecuteUpdateWithInUsedEncryptor() throws SQLException {
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) {
Expand All @@ -119,7 +120,7 @@ void assertExecuteUpdateWithIfExists() throws SQLException {
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) {
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void assertCheckAtLeastOneCharFailedWithEmptyChar() {
@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
Expand Down
5 changes: 3 additions & 2 deletions ...ava/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

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;
Expand All @@ -66,7 +67,7 @@ void assertExecuteUpdateWithoutIfNotExists() throws SQLException {
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
Expand All @@ -78,7 +79,7 @@ void assertExecuteUpdateWithIfNotExists() throws SQLException {
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) {
Expand Down
5 changes: 3 additions & 2 deletions .../java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

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;
Expand All @@ -64,7 +65,7 @@ void assertExecuteUpdateWithoutIfExists() throws SQLException {
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) {
Expand All @@ -83,7 +84,7 @@ void assertExecuteUpdateWithIfExists() throws SQLException {
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) {
Expand Down
3 changes: 2 additions & 1 deletion ...dingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

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;
Expand Down Expand Up @@ -108,7 +109,7 @@ void assertCheckWhenConfigOtherRulesDatasource() {
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() {
Expand Down
3 changes: 2 additions & 1 deletion .../apache/shardingsphere/shadow/algorithm/shadow/column/ColumnShadowValueValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

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;

Expand All @@ -39,6 +40,6 @@ void assertValidateEnumType() {

@Test
void assertValidateAcceptedType() {
ColumnShadowValueValidator.validate("foo_tbl", "foo_col", "");
assertDoesNotThrow(() -> ColumnShadowValueValidator.validate("foo_tbl", "foo_col", ""));
}
}
3 changes: 2 additions & 1 deletion ...g/apache/shardingsphere/sharding/checker/config/ShardingRuleConfigurationCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

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 {
Expand All @@ -66,7 +67,7 @@ void assertCheckSuccess() {
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
Expand Down
6 changes: 3 additions & 3 deletions ...t/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ void assertCompareToForVarBinaryWithGroupByItems() throws SQLException {
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));
}
Expand Down
8 changes: 4 additions & 4 deletions ...ere/sharding/distsql/handler/converter/ShardingKeyGenerateStrategyStatementConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ public static KeyGenerateStrategiesConfiguration createKeyGenerateStrategiesConf
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) {
Expand Down
Loading
Loading