This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b9d6abe044f Remove @Setter (#18503)
b9d6abe044f is described below
commit b9d6abe044f7581a75c951955fbd397590ba12c1
Author: lanchengx <[email protected]>
AuthorDate: Wed Jun 22 18:03:20 2022 +0800
Remove @Setter (#18503)
---
.../rdl/drop/DropDefaultSingleTableRuleStatement.java | 2 +-
.../parser/statement/rdl/drop/DropRuleStatement.java | 12 ++++++++----
.../DropDatabaseDiscoveryHeartbeatStatement.java | 2 +-
.../statement/DropDatabaseDiscoveryRuleStatement.java | 2 +-
.../statement/DropDatabaseDiscoveryTypeStatement.java | 2 +-
.../update/DropEncryptRuleStatementUpdaterTest.java | 15 +++++++++------
.../parser/statement/DropEncryptRuleStatement.java | 2 +-
.../statement/DropReadwriteSplittingRuleStatement.java | 2 +-
.../update/DropShadowAlgorithmStatementUpdaterTest.java | 10 ++++++----
.../update/DropShadowRuleStatementUpdaterTest.java | 10 ++++++----
.../statement/DropDefaultShadowAlgorithmStatement.java | 2 +-
.../parser/statement/DropShadowAlgorithmStatement.java | 2 +-
.../distsql/parser/statement/DropShadowRuleStatement.java | 2 +-
.../update/DropShardingAlgorithmStatementUpdaterTest.java | 7 ++-----
.../DropShardingKeyGeneratorStatementUpdaterTest.java | 3 +--
.../parser/core/ShardingDistSQLStatementVisitor.java | 8 ++++----
.../statement/DropShardingScalingRuleStatement.java | 2 +-
.../statement/DropDefaultShardingStrategyStatement.java | 2 +-
.../parser/statement/DropShardingAlgorithmStatement.java | 5 +++++
.../statement/DropShardingBindingTableRulesStatement.java | 2 +-
.../DropShardingBroadcastTableRulesStatement.java | 2 +-
.../statement/DropShardingKeyGeneratorStatement.java | 5 +++++
.../parser/statement/DropShardingTableRuleStatement.java | 2 +-
23 files changed, 60 insertions(+), 43 deletions(-)
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
index 452cbc4a39b..bfd382fd911 100644
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
+++
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
@@ -28,6 +28,6 @@ import lombok.NoArgsConstructor;
public final class DropDefaultSingleTableRuleStatement extends
DropRuleStatement {
public DropDefaultSingleTableRuleStatement(final boolean
containsExistClause) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
}
}
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
index 349cd8c8ab8..3a009a4f968 100644
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
+++
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
@@ -18,15 +18,19 @@
package org.apache.shardingsphere.distsql.parser.statement.rdl.drop;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement;
/**
* Drop rule statement.
*/
+@Getter
+@RequiredArgsConstructor
public abstract class DropRuleStatement extends RuleDefinitionStatement {
- @Getter
- @Setter
- private boolean containsExistClause;
+ private final boolean containsExistClause;
+
+ public DropRuleStatement() {
+ this.containsExistClause = false;
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabas
[...]
index 3a220d05bca..9a27af3a0f7 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java
@@ -33,7 +33,7 @@ public final class DropDatabaseDiscoveryHeartbeatStatement
extends DropRuleState
private final Collection<String> heartbeatNames;
public DropDatabaseDiscoveryHeartbeatStatement(final Collection<String>
heartbeatNames, final boolean containsExistClause) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.heartbeatNames = heartbeatNames;
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDisc
[...]
index 8b80f5c7dff..420b114e653 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java
@@ -33,7 +33,7 @@ public final class DropDatabaseDiscoveryRuleStatement extends
DropRuleStatement
private final Collection<String> ruleNames;
public DropDatabaseDiscoveryRuleStatement(final Collection<String>
ruleNames, final boolean containsExistClause) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.ruleNames = ruleNames;
}
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDisc
[...]
index fa77d3c46d3..da42c68b38d 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java
@@ -33,7 +33,7 @@ public final class DropDatabaseDiscoveryTypeStatement extends
DropRuleStatement
private final Collection<String> types;
public DropDatabaseDiscoveryTypeStatement(final Collection<String> types,
final boolean containsExistClause) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.types = types;
}
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
index b9e01ba324c..07f825525af 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
@@ -76,20 +76,23 @@ public final class DropEncryptRuleStatementUpdaterTest {
assertThat(ruleConfig.getEncryptors().size(), is(1));
}
- private DropEncryptRuleStatement createSQLStatement(final String
tableName) {
- return new DropEncryptRuleStatement(Collections.singleton(tableName));
- }
-
@Test
public void assertUpdateCurrentRuleConfigurationWithIfExists() throws
DistSQLException {
EncryptRuleConfiguration ruleConfig = createCurrentRuleConfiguration();
- DropEncryptRuleStatement statement = createSQLStatement("t_encrypt_1");
- statement.setContainsExistClause(true);
+ DropEncryptRuleStatement statement = createSQLStatement(true,
"t_encrypt_1");
updater.checkSQLStatement(database, statement,
mock(EncryptRuleConfiguration.class));
assertFalse(updater.updateCurrentRuleConfiguration(statement,
ruleConfig));
assertThat(ruleConfig.getEncryptors().size(), is(1));
}
+ private DropEncryptRuleStatement createSQLStatement(final String
tableName) {
+ return new DropEncryptRuleStatement(Collections.singleton(tableName));
+ }
+
+ private DropEncryptRuleStatement createSQLStatement(final boolean
containsExistClause, final String tableName) {
+ return new DropEncryptRuleStatement(containsExistClause,
Collections.singleton(tableName));
+ }
+
private EncryptRuleConfiguration createCurrentRuleConfiguration() {
EncryptColumnRuleConfiguration columnRuleConfig = new
EncryptColumnRuleConfiguration("user_id", "user_cipher", "", "user_plain",
"t_encrypt_user_id_MD5", null);
EncryptTableRuleConfiguration tableRuleConfig = new
EncryptTableRuleConfiguration("t_encrypt",
Collections.singleton(columnRuleConfig), null);
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
index 9f04756384a..237a5ae8152 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
@@ -33,7 +33,7 @@ public final class DropEncryptRuleStatement extends
DropRuleStatement {
private final Collection<String> tables;
public DropEncryptRuleStatement(final boolean containsExistClause, final
Collection<String> tables) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.tables = tables;
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/rea
[...]
index ea055375e8a..5b46bb629fc 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java
@@ -33,7 +33,7 @@ public final class DropReadwriteSplittingRuleStatement
extends DropRuleStatement
private final Collection<String> ruleNames;
public DropReadwriteSplittingRuleStatement(final boolean
containsExistClause, final Collection<String> ruleNames) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.ruleNames = ruleNames;
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
index bc6f2e7fd97..53caaaacb4f 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
@@ -52,15 +52,13 @@ public final class DropShadowAlgorithmStatementUpdaterTest {
@Test
public void assertExecuteWithIfExists() throws DistSQLException {
- DropShadowAlgorithmStatement sqlStatement =
createSQLStatement("ruleSegment");
- sqlStatement.setContainsExistClause(true);
+ DropShadowAlgorithmStatement sqlStatement = createSQLStatement(true,
"ruleSegment");
updater.checkSQLStatement(database, sqlStatement,
mock(ShadowRuleConfiguration.class));
}
@Test
public void assertUpdate() throws DistSQLException {
- DropShadowAlgorithmStatement sqlStatement = createSQLStatement("ds_0");
- sqlStatement.setContainsExistClause(true);
+ DropShadowAlgorithmStatement sqlStatement = createSQLStatement(true,
"ds_0");
ShadowRuleConfiguration ruleConfig = new ShadowRuleConfiguration();
ruleConfig.getTables().put("t_order", new ShadowTableConfiguration(new
ArrayList<>(Collections.singleton("ds_0")), Collections.emptyList()));
updater.checkSQLStatement(database, sqlStatement, ruleConfig);
@@ -71,4 +69,8 @@ public final class DropShadowAlgorithmStatementUpdaterTest {
private DropShadowAlgorithmStatement createSQLStatement(final String...
ruleName) {
return new DropShadowAlgorithmStatement(Arrays.asList(ruleName));
}
+
+ private DropShadowAlgorithmStatement createSQLStatement(final boolean
containsExistClause, final String... ruleName) {
+ return new DropShadowAlgorithmStatement(containsExistClause,
Arrays.asList(ruleName));
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
index ebd0e1a26fa..199fb271cb6 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
@@ -62,15 +62,13 @@ public final class DropShadowRuleStatementUpdaterTest {
@Test
public void assertExecuteWithIfExists() throws DistSQLException {
- DropShadowRuleStatement sqlStatement =
createSQLStatement("ruleSegment");
- sqlStatement.setContainsExistClause(true);
+ DropShadowRuleStatement sqlStatement = createSQLStatement(true,
"ruleSegment");
updater.checkSQLStatement(database, sqlStatement,
mock(ShadowRuleConfiguration.class));
}
@Test
public void assertUpdate() throws DistSQLException {
- DropShadowRuleStatement sqlStatement = createSQLStatement("ds_0");
- sqlStatement.setContainsExistClause(true);
+ DropShadowRuleStatement sqlStatement = createSQLStatement(true,
"ds_0");
ShadowRuleConfiguration ruleConfig = new ShadowRuleConfiguration();
ruleConfig.getTables().put("t_order", new ShadowTableConfiguration(new
ArrayList<>(Collections.singleton("ds_0")), Collections.emptyList()));
updater.checkSQLStatement(database, sqlStatement, ruleConfig);
@@ -86,4 +84,8 @@ public final class DropShadowRuleStatementUpdaterTest {
private DropShadowRuleStatement createSQLStatement(final String...
ruleName) {
return new DropShadowRuleStatement(Arrays.asList(ruleName));
}
+
+ private DropShadowRuleStatement createSQLStatement(final boolean
containsExistClause, final String... ruleName) {
+ return new DropShadowRuleStatement(containsExistClause,
Arrays.asList(ruleName));
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
index a05ed2b73e2..33767b46fc5 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
@@ -29,6 +29,6 @@ import
org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleState
public final class DropDefaultShadowAlgorithmStatement extends
DropRuleStatement {
public DropDefaultShadowAlgorithmStatement(final boolean
containsExistClause) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
index 6691ece1a67..6c939baeeb9 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
@@ -33,7 +33,7 @@ public final class DropShadowAlgorithmStatement extends
DropRuleStatement {
private final Collection<String> algorithmNames;
public DropShadowAlgorithmStatement(final boolean containsExistClause,
final Collection<String> algorithmNames) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.algorithmNames = algorithmNames;
}
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
index 643c1c859a4..dd36f3219cb 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
@@ -33,7 +33,7 @@ public final class DropShadowRuleStatement extends
DropRuleStatement {
private final Collection<String> ruleNames;
public DropShadowRuleStatement(final boolean containsExistClause, final
Collection<String> ruleNames) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.ruleNames = ruleNames;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
index 639b78e7fff..f3e883569ff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
@@ -56,8 +56,7 @@ public final class DropShardingAlgorithmStatementUpdaterTest {
@Test
public void assertCheckSQLStatementWithoutCurrentRuleWithIfExists() throws
RuleDefinitionViolationException {
- DropShardingAlgorithmStatement dropShardingAlgorithmStatement = new
DropShardingAlgorithmStatement(Collections.emptyList());
- dropShardingAlgorithmStatement.setContainsExistClause(true);
+ DropShardingAlgorithmStatement dropShardingAlgorithmStatement = new
DropShardingAlgorithmStatement(true, Collections.emptyList());
updater.checkSQLStatement(database, dropShardingAlgorithmStatement,
null);
}
@@ -110,9 +109,7 @@ public final class
DropShardingAlgorithmStatementUpdaterTest {
}
private DropShardingAlgorithmStatement
createSQLStatementWithIfExists(final String algorithmName) {
- DropShardingAlgorithmStatement result = new
DropShardingAlgorithmStatement(Collections.singleton(algorithmName));
- result.setContainsExistClause(true);
- return result;
+ return new DropShardingAlgorithmStatement(true,
Collections.singleton(algorithmName));
}
private ShardingRuleConfiguration createCurrentRuleConfiguration() {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
index 5de3884d67f..62cc49d7455 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
@@ -61,8 +61,7 @@ public final class
DropShardingKeyGeneratorStatementUpdaterTest {
@Test
public void assertExecuteWithNotExistWithIfExists() throws
DistSQLException {
- DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(Collections.singletonList("uuid_key_generator"));
- sqlStatement.setContainsExistClause(true);
+ DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(true,
Collections.singletonList("uuid_key_generator"));
updater.checkSQLStatement(database, sqlStatement, new
ShardingRuleConfiguration());
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index 4f44598035e..25311f35342 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -275,8 +275,8 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
@Override
public ASTNode visitDropShardingAlgorithm(final
DropShardingAlgorithmContext ctx) {
- DropShardingAlgorithmStatement result = new
DropShardingAlgorithmStatement(ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
- result.setContainsExistClause(null != ctx.existsClause());
+ DropShardingAlgorithmStatement result = new
DropShardingAlgorithmStatement(null != ctx.existsClause(),
+
ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
return result;
}
@@ -449,8 +449,8 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
@Override
public ASTNode visitDropShardingKeyGenerator(final
DropShardingKeyGeneratorContext ctx) {
- DropShardingKeyGeneratorStatement result = new
DropShardingKeyGeneratorStatement(ctx.keyGeneratorName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
- result.setContainsExistClause(null != ctx.existsClause());
+ DropShardingKeyGeneratorStatement result = new
DropShardingKeyGeneratorStatement(null != ctx.existsClause(),
+
ctx.keyGeneratorName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
return result;
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
index 5d551afcf75..63fadfb3152 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
@@ -31,7 +31,7 @@ public final class DropShardingScalingRuleStatement extends
DropRuleStatement {
private final String scalingName;
public DropShardingScalingRuleStatement(final boolean containsExistClause,
final String scalingName) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.scalingName = scalingName;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
index 1de82c146f4..37a834935f7 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
@@ -31,7 +31,7 @@ public final class DropDefaultShardingStrategyStatement
extends DropRuleStatemen
private final String defaultType;
public DropDefaultShardingStrategyStatement(final boolean
containsExistClause, final String defaultType) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.defaultType = defaultType;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
index db4d4ec2b1d..a0b1e1efaba 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
@@ -31,4 +31,9 @@ import java.util.Collection;
public final class DropShardingAlgorithmStatement extends DropRuleStatement {
private final Collection<String> algorithmNames;
+
+ public DropShardingAlgorithmStatement(final boolean containsExistClause,
final Collection<String> algorithmNames) {
+ super(containsExistClause);
+ this.algorithmNames = algorithmNames;
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
index 4d6a9a2cdb4..b0f8e4957de 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
@@ -35,7 +35,7 @@ public final class DropShardingBindingTableRulesStatement
extends DropRuleStatem
private final Collection<BindingTableRuleSegment> rules;
public DropShardingBindingTableRulesStatement(final boolean
containsExistClause, final Collection<BindingTableRuleSegment> rules) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.rules = rules;
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
index f5745724d36..60bc5a1904e 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
@@ -33,7 +33,7 @@ public final class DropShardingBroadcastTableRulesStatement
extends DropRuleStat
private final Collection<String> rules;
public DropShardingBroadcastTableRulesStatement(final boolean
containsExistClause, final Collection<String> rules) {
- setContainsExistClause(containsExistClause);
+ super(containsExistClause);
this.rules = rules;
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
index e33e83069b0..e66287a98f0 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
@@ -31,4 +31,9 @@ import java.util.Collection;
public final class DropShardingKeyGeneratorStatement extends DropRuleStatement
{
private final Collection<String> keyGeneratorNames;
+
+ public DropShardingKeyGeneratorStatement(final boolean
containsExistClause, final Collection<String> keyGeneratorNames) {
+ super(containsExistClause);
+ this.keyGeneratorNames = keyGeneratorNames;
+ }
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java
index d1a01f8eadb..81f1f039de1 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java
@@ -38,7 +38,7 @@ public final class DropShardingTableRuleStatement extends
DropRuleStatement {
private boolean dropUnusedAlgorithms;
public DropShardingTableRuleStatement(final boolean containsExistsClause,
final Collection<TableNameSegment> tableNames) {
- setContainsExistClause(containsExistsClause);
+ super(containsExistsClause);
this.tableNames = tableNames;
}
}
