This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 b12e2ad6840 Remove SQLException from method signatures in various
classes (#37192)
b12e2ad6840 is described below
commit b12e2ad6840f03a185305b2113184c512bba8db2
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Nov 27 11:30:52 2025 +0800
Remove SQLException from method signatures in various classes (#37192)
---
.../token/ShardingTokenGenerateBuilderTest.java | 6 ++---
.../DialectDatabaseStatisticsCollector.java | 4 +--
.../opengauss/OpenGaussStatisticsCollector.java | 4 +--
.../postgresql/PostgreSQLStatisticsCollector.java | 4 +--
.../ShardingSphereStatisticsCollector.java | 5 ++--
.../DatabaseRuleDefinitionExecuteEngine.java | 5 +---
.../core/util/PipelineLazyInitializer.java | 3 +--
.../handler/distsql/rul/PreviewExecutor.java | 2 +-
.../command/FirebirdCommandExecuteEngineTest.java | 2 +-
src/resources/idea/inspections.xml | 30 ++++++++--------------
10 files changed, 24 insertions(+), 41 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
index 90ee744dcdb..adf58f80d1f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
@@ -54,7 +54,7 @@ class ShardingTokenGenerateBuilderTest {
}
@Test
- void assertGetSQLTokenGenerators() throws Exception {
+ void assertGetSQLTokenGenerators() throws ReflectiveOperationException {
when(routeContext.containsTableSharding()).thenReturn(true);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getProjectionsContext().getAggregationProjections().isEmpty()).thenReturn(false);
@@ -77,13 +77,13 @@ class ShardingTokenGenerateBuilderTest {
assertSqlTokenGenerator(shardingRemoveTokenGenerator);
}
- private void assertSqlTokenGenerator(final SQLTokenGenerator
sqlTokenGenerator) throws Exception {
+ private void assertSqlTokenGenerator(final SQLTokenGenerator
sqlTokenGenerator) throws ReflectiveOperationException {
if (sqlTokenGenerator instanceof RouteContextAware) {
assertField(sqlTokenGenerator, routeContext, "routeContext");
}
}
- private void assertField(final SQLTokenGenerator sqlTokenGenerator, final
Object filedInstance, final String fieldName) throws Exception {
+ private void assertField(final SQLTokenGenerator sqlTokenGenerator, final
Object filedInstance, final String fieldName) throws
ReflectiveOperationException {
assertThat(Plugins.getMemberAccessor().get(sqlTokenGenerator.getClass().getDeclaredField(fieldName),
sqlTokenGenerator), is(filedInstance));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/DialectDatabaseStatisticsCollector.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/DialectDatabaseStatisticsCollector.java
index d04263d577b..055e5867e35 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/DialectDatabaseStatisticsCollector.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/DialectDatabaseStatisticsCollector.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
@@ -40,9 +39,8 @@ public interface DialectDatabaseStatisticsCollector extends
DatabaseTypedSPI {
* @param tableName table name
* @param metaData shardingsphere meta data
* @return row column datas
- * @throws SQLException SQL exception
*/
- Optional<Collection<Map<String, Object>>> collectRowColumnValues(String
databaseName, String schemaName, String tableName, ShardingSphereMetaData
metaData) throws SQLException;
+ Optional<Collection<Map<String, Object>>> collectRowColumnValues(String
databaseName, String schemaName, String tableName, ShardingSphereMetaData
metaData);
/**
* Is statistics tables.
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/opengauss/OpenGaussStatisticsCollector.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/opengauss/OpenGaussStatisticsCollector.java
index ed6d5e4bf91..6dccd03fe8a 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/opengauss/OpenGaussStatisticsCollector.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/opengauss/OpenGaussStatisticsCollector.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.statistics.collector.DialectDatabaseStatisticsCollector;
import
org.apache.shardingsphere.infra.metadata.statistics.collector.postgresql.PostgreSQLStatisticsCollector;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
@@ -34,8 +33,7 @@ public final class OpenGaussStatisticsCollector implements
DialectDatabaseStatis
private final PostgreSQLStatisticsCollector delegate = new
PostgreSQLStatisticsCollector();
@Override
- public Optional<Collection<Map<String, Object>>>
collectRowColumnValues(final String databaseName, final String schemaName,
final String tableName,
-
final ShardingSphereMetaData metaData) throws SQLException {
+ public Optional<Collection<Map<String, Object>>>
collectRowColumnValues(final String databaseName, final String schemaName,
final String tableName, final ShardingSphereMetaData metaData) {
return delegate.collectRowColumnValues(databaseName, schemaName,
tableName, metaData);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollector.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollector.java
index 5ac01381891..954673d7fa6 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollector.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollector.java
@@ -46,8 +46,8 @@ public final class PostgreSQLStatisticsCollector implements
DialectDatabaseStati
@Override
public Optional<Collection<Map<String, Object>>>
collectRowColumnValues(final String databaseName, final String schemaName,
final String tableName, final ShardingSphereMetaData metaData) {
- Optional<PostgreSQLTableStatisticsCollector> tableStatisticsCollector
= TypedSPILoader.findService(PostgreSQLTableStatisticsCollector.class,
String.format("%s.%s", schemaName, tableName));
- return tableStatisticsCollector.map(postgreSQLTableStatisticsCollector
-> postgreSQLTableStatisticsCollector.collect(databaseName, schemaName,
tableName, metaData));
+ return
TypedSPILoader.findService(PostgreSQLTableStatisticsCollector.class,
String.format("%s.%s", schemaName, tableName))
+ .map(optional -> optional.collect(databaseName, schemaName,
tableName, metaData));
}
@Override
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollector.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollector.java
index 97b9d4eb589..d35186482f1 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollector.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollector.java
@@ -46,9 +46,8 @@ public final class ShardingSphereStatisticsCollector
implements DialectDatabaseS
@Override
public Optional<Collection<Map<String, Object>>>
collectRowColumnValues(final String databaseName, final String schemaName,
final String tableName, final ShardingSphereMetaData metaData) {
- Optional<ShardingSphereTableStatisticsCollector>
tableStatisticsCollector = TypedSPILoader.findService(
- ShardingSphereTableStatisticsCollector.class,
String.format("%s.%s", schemaName, tableName));
- return tableStatisticsCollector.map(optional ->
optional.collect(databaseName, schemaName, tableName, metaData));
+ return
TypedSPILoader.findService(ShardingSphereTableStatisticsCollector.class,
String.format("%s.%s", schemaName, tableName))
+ .map(optional -> optional.collect(databaseName, schemaName,
tableName, metaData));
}
@Override
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
index affbfc14e36..f2fc3ecae05 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import java.sql.SQLException;
import java.util.Optional;
/**
@@ -47,11 +46,9 @@ public final class DatabaseRuleDefinitionExecuteEngine {
/**
* Execute update.
- *
- * @throws SQLException SQL Exception
*/
@SuppressWarnings("unchecked")
- public void executeUpdate() throws SQLException {
+ public void executeUpdate() {
checkBeforeUpdate();
Optional<ShardingSphereRule> rule =
database.getRuleMetaData().findSingleRule(executor.getRuleClass());
if (getRefreshStatus(rule.isPresent())) {
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineLazyInitializer.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineLazyInitializer.java
index 8f5fcb58b6a..12621b90008 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineLazyInitializer.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineLazyInitializer.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.data.pipeline.core.util;
-import org.apache.commons.lang3.concurrent.ConcurrentException;
import org.apache.commons.lang3.concurrent.LazyInitializer;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -32,7 +31,7 @@ public abstract class PipelineLazyInitializer<T> extends
LazyInitializer<T> {
private final AtomicBoolean initialized = new AtomicBoolean();
@Override
- protected final T initialize() throws ConcurrentException {
+ protected final T initialize() {
T result = doInitialize();
initialized.set(true);
return result;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
index 9494b847af3..0ca8790ee7a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
@@ -85,7 +85,7 @@ public final class PreviewExecutor implements
DistSQLQueryExecutor<PreviewStatem
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final PreviewStatement
sqlStatement, final ContextManager contextManager) throws SQLException {
+ public Collection<LocalDataQueryResultRow> getRows(final PreviewStatement
sqlStatement, final ContextManager contextManager) {
ShardingSphereMetaData metaData =
contextManager.getMetaDataContexts().getMetaData();
String toBePreviewedSQL = sqlStatement.getSql();
SQLStatement toBePreviewedStatement =
metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class).getSQLParserEngine(database.getProtocolType()).parse(toBePreviewedSQL,
false);
diff --git
a/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngineTest.java
b/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngineTest.java
index bd491a51af5..245c2797a91 100644
---
a/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngineTest.java
+++
b/proxy/frontend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngineTest.java
@@ -141,7 +141,7 @@ class FirebirdCommandExecuteEngineTest {
}
@Test
- void assertGetCommandExecutor() throws SQLException {
+ void assertGetCommandExecutor() {
when(FirebirdCommandExecutorFactory.newInstance(FirebirdCommandPacketType.EXECUTE,
packet, connectionSession)).thenReturn(executor);
assertThat(engine.getCommandExecutor(FirebirdCommandPacketType.EXECUTE, packet,
connectionSession), is(executor));
}
diff --git a/src/resources/idea/inspections.xml
b/src/resources/idea/inspections.xml
index 8ee9aa53f68..ebd966b9a57 100644
--- a/src/resources/idea/inspections.xml
+++ b/src/resources/idea/inspections.xml
@@ -17,6 +17,16 @@
<profile version="1.0">
<option name="myName" value="ShardingSphere" />
+ <option name="scopesOrder">
+ <list>
+ <option value="All Changed Files" />
+ <option value="Open Files" />
+ <option value="Production" />
+ <option value="Project Files" />
+ <option value="Scratches and Consoles" />
+ <option value="Tests" />
+ </list>
+ </option>
<inspection_tool class="AbstractBeanReferencesInspection" enabled="false"
level="ERROR" enabled_by_default="false" />
<inspection_tool class="AbstractClassExtendsConcreteClass" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="AbstractClassNeverImplemented" enabled="true"
level="WARNING" enabled_by_default="true" />
@@ -35,7 +45,6 @@
<inspection_tool class="AmbiguousFieldAccess" enabled="true" level="WARNING"
enabled_by_default="true" />
<inspection_tool class="AmbiguousMethodCall" enabled="true" level="WARNING"
enabled_by_default="true" />
<inspection_tool class="AmbiguousNonLocalJump" enabled="false" level="WEAK
WARNING" enabled_by_default="false" />
- <inspection_tool class="AnonymousClassVariableHidesContainingMethodVariable"
enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ArrayEquality" enabled="true" level="WARNING"
enabled_by_default="true" />
<inspection_tool class="ArrayInDataClass" enabled="false" level="WEAK
WARNING" enabled_by_default="false" />
<inspection_tool class="AssertStatement" enabled="true" level="WARNING"
enabled_by_default="true" />
@@ -200,6 +209,7 @@
<inspection_tool class="DifferentMavenStdlibVersion" enabled="false"
level="WARNING" enabled_by_default="false" />
<inspection_tool class="DollarSignInName" enabled="true" level="WARNING"
enabled_by_default="true" />
<inspection_tool class="DoubleLiteralMayBeFloatLiteral" enabled="true"
level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="DuplicateExpressions" enabled="false" level="WEAK
WARNING" enabled_by_default="false" />
<inspection_tool class="DuplicatedBeanNamesInspection" enabled="false"
level="WARNING" enabled_by_default="false" />
<inspection_tool class="DynamicRegexReplaceableByCompiledPattern"
enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="EmptyClass" enabled="true" level="WARNING"
enabled_by_default="true">
@@ -448,7 +458,6 @@
<inspection_tool class="MemberVisibilityCanBePrivate" enabled="false"
level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="MethodMayBeSynchronized" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodNameSameAsParentName" enabled="true"
level="WARNING" enabled_by_default="true" />
- <inspection_tool class="MethodOverloadsParentMethod" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesInaccessibleMethodOfSuper"
enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesStaticMethod" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="MigrateAssertToMatcherAssert" enabled="true"
level="WARNING" enabled_by_default="true" />
@@ -482,11 +491,6 @@
<inspection_tool class="NewExceptionWithoutArguments" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="NewInstanceOfSingleton" enabled="false"
level="WARNING" enabled_by_default="false" />
<inspection_tool class="NewMethodNamingConvention" enabled="true"
level="WARNING" enabled_by_default="true" />
- <inspection_tool class="NonBooleanMethodNameMayNotStartWithQuestion"
enabled="true" level="WARNING" enabled_by_default="true">
- <option name="questionString"
value="are,can,check,contains,could,endsWith,equals,has,is,matches,must,shall,should,startsWith,was,were,will,would"
/>
- <option name="ignoreBooleanMethods" value="false" />
- <option name="onlyWarnOnBaseMethods" value="true" />
- </inspection_tool>
<inspection_tool class="NonExceptionNameEndsWithException" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="NonExternalClassifierExtendingStateOrProps"
enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="NonFinalClone" enabled="true" level="WARNING"
enabled_by_default="true" />
@@ -532,10 +536,6 @@
<inspection_tool class="OpenRewriteYamlRecipe" enabled="false" level="ERROR"
enabled_by_default="false" />
<inspection_tool class="OptionalContainsCollection" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="OptionalExpectation" enabled="false"
level="INFORMATION" enabled_by_default="false" />
- <inspection_tool class="OverloadedMethodsWithSameNumberOfParameters"
enabled="true" level="WARNING" enabled_by_default="true">
- <option name="ignoreInconvertibleTypes" value="true" />
- </inspection_tool>
- <inspection_tool class="OverloadedVarargsMethod" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="OverlyComplexArithmeticExpression" enabled="true"
level="WARNING" enabled_by_default="true">
<option name="m_limit" value="6" />
</inspection_tool>
@@ -551,10 +551,6 @@
<option name="ignoreEnums" value="false" />
<option name="ignoreInterfaces" value="false" />
</inspection_tool>
- <inspection_tool class="ParameterNameDiffersFromOverriddenParameter"
enabled="true" level="WARNING" enabled_by_default="true">
- <option name="m_ignoreSingleCharacterNames" value="false" />
- <option name="m_ignoreOverridesOfLibraryMethods" value="false" />
- </inspection_tool>
<inspection_tool class="ParameterTypePreventsOverriding" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="PatternVariableCanBeUsed" enabled="false"
level="WARNING" enabled_by_default="false" />
<inspection_tool class="PlatformExtensionReceiverOfInline" enabled="false"
level="WARNING" enabled_by_default="false" />
@@ -570,10 +566,6 @@
</inspection_tool>
<inspection_tool class="PublicConstructorInNonPublicClass" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="PublicFieldAccessedInSynchronizedContext"
enabled="true" level="WARNING" enabled_by_default="true" />
- <inspection_tool class="PublicInnerClass" enabled="true" level="WARNING"
enabled_by_default="true">
- <option name="ignoreEnums" value="false" />
- <option name="ignoreInterfaces" value="false" />
- </inspection_tool>
<inspection_tool class="PublicStaticArrayField" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="PublicStaticCollectionField" enabled="true"
level="WARNING" enabled_by_default="true" />
<inspection_tool class="QuestionableName" enabled="true" level="WARNING"
enabled_by_default="true">
