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 f19621587e8 Rename
MissingRequiredReadwriteSplittingActualDataSourceException (#30885)
f19621587e8 is described below
commit f19621587e89842e2ca06fe2e87a94cd25dddcb0
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Apr 15 00:01:46 2024 +0800
Rename MissingRequiredReadwriteSplittingActualDataSourceException (#30885)
---
docs/document/content/user-manual/error-code/sql-error-code.cn.md | 2 +-
docs/document/content/user-manual/error-code/sql-error-code.en.md | 2 +-
.../checker/ReadwriteSplittingRuleConfigurationChecker.java | 6 +++---
...ssingRequiredReadwriteSplittingActualDataSourceException.java} | 8 ++++----
.../checker/ReadwriteSplittingRuleConfigurationCheckerTest.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/document/content/user-manual/error-code/sql-error-code.cn.md
b/docs/document/content/user-manual/error-code/sql-error-code.cn.md
index bfc7b29cd88..25a88c804f6 100644
--- a/docs/document/content/user-manual/error-code/sql-error-code.cn.md
+++ b/docs/document/content/user-manual/error-code/sql-error-code.cn.md
@@ -195,7 +195,7 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
| Vendor Code | SQL State | 错误信息
|
|-------------|-----------|-----------------------------------------------------------------------------|
| 20200 | 42S02 | Readwrite-splitting data source rule name is
required in database '%s'. |
-| 20201 | 42S02 | Readwrite-splitting [READ/WRITE] data source name
is required in %s. |
+| 20201 | 42S02 | Readwrite-splitting [READ/WRITE] data source is
required in %s. |
| 20202 | 42S02 | Can not find readwrite-splitting [READ/WRITE] data
source '%s' in %s. |
| 20203 | 42S01 | Readwrite-splitting [READ/WRITE] data source '%s'
is duplicated in %s. |
| 20204 | 44000 | Readwrite-splitting [READ/WRITE] data source
inline expression error in %s. |
diff --git a/docs/document/content/user-manual/error-code/sql-error-code.en.md
b/docs/document/content/user-manual/error-code/sql-error-code.en.md
index 497cd2ff6d5..b5c054c49d2 100644
--- a/docs/document/content/user-manual/error-code/sql-error-code.en.md
+++ b/docs/document/content/user-manual/error-code/sql-error-code.en.md
@@ -196,7 +196,7 @@ SQL error codes provide by standard `SQL State`, `Vendor
Code` and `Reason`, whi
| Vendor Code | SQL State | Reason
|
|-------------|-----------|-----------------------------------------------------------------------------|
| 20200 | 42S02 | Readwrite-splitting data source rule name is
required in database '%s'. |
-| 20201 | 42S02 | Readwrite-splitting [READ/WRITE] data source name
is required in %s. |
+| 20201 | 42S02 | Readwrite-splitting [READ/WRITE] data source is
required in %s. |
| 20202 | 42S02 | Can not find readwrite-splitting [READ/WRITE] data
source '%s' in %s. |
| 20203 | 42S01 | Readwrite-splitting [READ/WRITE] data source '%s'
is duplicated in %s. |
| 20204 | 44000 | Readwrite-splitting [READ/WRITE] data source
inline expression error in %s. |
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
index c1b6913184c..4788da9a55b 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.readwritesplitting.constant.ReadwriteSplittingO
import
org.apache.shardingsphere.readwritesplitting.exception.ReadwriteSplittingRuleExceptionIdentifier;
import
org.apache.shardingsphere.readwritesplitting.exception.actual.ReadwriteSplittingActualDataSourceNotFoundException;
import
org.apache.shardingsphere.readwritesplitting.exception.actual.DuplicateReadwriteSplittingActualDataSourceException;
-import
org.apache.shardingsphere.readwritesplitting.exception.actual.MissingRequiredReadwriteSplittingActualDataSourceNameException;
+import
org.apache.shardingsphere.readwritesplitting.exception.actual.MissingRequiredReadwriteSplittingActualDataSourceException;
import
org.apache.shardingsphere.readwritesplitting.exception.logic.MissingRequiredReadwriteSplittingDataSourceRuleNameException;
import javax.sql.DataSource;
@@ -68,9 +68,9 @@ public final class ReadwriteSplittingRuleConfigurationChecker
implements RuleCon
private void checkDataSources(final String databaseName, final Map<String,
DataSource> dataSourceMap, final ReadwriteSplittingDataSourceRuleConfiguration
config,
final Collection<String>
writeDataSourceNames, final Collection<String> readDataSourceNames, final
Collection<ShardingSphereRule> builtRules) {
-
ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(config.getWriteDataSourceName()),
() -> new MissingRequiredReadwriteSplittingActualDataSourceNameException(
+
ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(config.getWriteDataSourceName()),
() -> new MissingRequiredReadwriteSplittingActualDataSourceException(
ReadwriteSplittingDataSourceType.WRITE, new
ReadwriteSplittingRuleExceptionIdentifier(databaseName, config.getName())));
-
ShardingSpherePreconditions.checkState(!config.getReadDataSourceNames().isEmpty(),
() -> new MissingRequiredReadwriteSplittingActualDataSourceNameException(
+
ShardingSpherePreconditions.checkState(!config.getReadDataSourceNames().isEmpty(),
() -> new MissingRequiredReadwriteSplittingActualDataSourceException(
ReadwriteSplittingDataSourceType.READ, new
ReadwriteSplittingRuleExceptionIdentifier(databaseName, config.getName())));
checkWriteDataSourceNames(databaseName, dataSourceMap,
writeDataSourceNames, config, builtRules);
for (String each : config.getReadDataSourceNames()) {
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceNameException.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceException.java
similarity index 78%
rename from
features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceNameException.java
rename to
features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceException.java
index ae3372d6975..9fe7545e9a3 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceNameException.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/exception/actual/MissingRequiredReadwriteSplittingActualDataSourceException.java
@@ -23,13 +23,13 @@ import
org.apache.shardingsphere.readwritesplitting.exception.ReadwriteSplitting
import
org.apache.shardingsphere.readwritesplitting.exception.ReadwriteSplittingSQLException;
/**
- * Missing readwrite-splitting required actual data source name exception.
+ * Missing readwrite-splitting required actual data source exception.
*/
-public final class
MissingRequiredReadwriteSplittingActualDataSourceNameException extends
ReadwriteSplittingSQLException {
+public final class MissingRequiredReadwriteSplittingActualDataSourceException
extends ReadwriteSplittingSQLException {
private static final long serialVersionUID = 3795576963060485964L;
- public
MissingRequiredReadwriteSplittingActualDataSourceNameException(final
ReadwriteSplittingDataSourceType dataSourceType, final
ReadwriteSplittingRuleExceptionIdentifier exceptionIdentifier) {
- super(XOpenSQLState.NOT_FOUND, 1, "Readwrite-splitting %s data source
name is required in %s.", dataSourceType, exceptionIdentifier);
+ public MissingRequiredReadwriteSplittingActualDataSourceException(final
ReadwriteSplittingDataSourceType dataSourceType, final
ReadwriteSplittingRuleExceptionIdentifier exceptionIdentifier) {
+ super(XOpenSQLState.NOT_FOUND, 1, "Readwrite-splitting %s data source
is required in %s.", dataSourceType, exceptionIdentifier);
}
}
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 5e24dd98699..9ff2b3eef20 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
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleCo
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.exception.actual.ReadwriteSplittingActualDataSourceNotFoundException;
import
org.apache.shardingsphere.readwritesplitting.exception.actual.DuplicateReadwriteSplittingActualDataSourceException;
-import
org.apache.shardingsphere.readwritesplitting.exception.actual.MissingRequiredReadwriteSplittingActualDataSourceNameException;
+import
org.apache.shardingsphere.readwritesplitting.exception.actual.MissingRequiredReadwriteSplittingActualDataSourceException;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
@@ -54,7 +54,7 @@ class ReadwriteSplittingRuleConfigurationCheckerTest {
void assertInvalidCheck() {
ReadwriteSplittingRuleConfiguration config =
createInvalidConfiguration();
RuleConfigurationChecker checker =
OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class,
Collections.singleton(config.getClass())).get(config.getClass());
-
assertThrows(MissingRequiredReadwriteSplittingActualDataSourceNameException.class,
() -> checker.check("test", config, Collections.emptyMap(),
Collections.emptyList()));
+
assertThrows(MissingRequiredReadwriteSplittingActualDataSourceException.class,
() -> checker.check("test", config, Collections.emptyMap(),
Collections.emptyList()));
}
private ReadwriteSplittingRuleConfiguration createInvalidConfiguration() {
