You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/06/10 15:07:58 UTC
[shardingsphere] branch master updated: Adjust code format (#26204)
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 25e95cee6b2 Adjust code format (#26204)
25e95cee6b2 is described below
commit 25e95cee6b259091e41e8d4689d789fe88fe1faf
Author: yx9o <ya...@163.com>
AuthorDate: Sat Jun 10 23:07:51 2023 +0800
Adjust code format (#26204)
* Adjust code format
---
.../statement/rdl/alter/AlterStorageUnitStatementAssert.java | 4 ++--
.../rdl/alter/impl/AlterEncryptRuleStatementAssert.java | 6 +++---
.../alter/impl/AlterReadwriteSplittingRuleStatementAssert.java | 5 ++---
.../rdl/alter/impl/AlterShadowRuleStatementAssert.java | 5 ++---
.../impl/AlterShardingTableReferenceRulesStatementAssert.java | 5 ++---
.../rdl/alter/impl/AlterShardingTableRuleStatementAssert.java | 10 ++++------
.../rdl/create/RegisterStorageUnitStatementAssert.java | 4 ++--
.../rdl/create/impl/CreateEncryptRuleStatementAssert.java | 6 +++---
.../impl/CreateReadwriteSplittingRuleStatementAssert.java | 5 ++---
.../rdl/create/impl/CreateShadowRuleStatementAssert.java | 5 ++---
.../impl/CreateShardingTableReferenceRuleStatementAssert.java | 5 ++---
.../create/impl/CreateShardingTableRuleStatementAssert.java | 10 ++++------
12 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java
index 01cad5f6e7c..3e37568c468 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java
@@ -63,8 +63,8 @@ public final class AlterStorageUnitStatementAssert {
assertNotNull(actual, assertContext.getText("Actual storage unit should exist."));
assertThat(assertContext.getText(String.format("Actual storage unit size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (DataSourceSegment actualDataSource : actual) {
- DataSourceAssert.assertIs(assertContext, actualDataSource, expected.get(count));
+ for (DataSourceSegment each : actual) {
+ DataSourceAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
index e7600160573..753cf23e6c7 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java
@@ -61,10 +61,10 @@ public final class AlterEncryptRuleStatementAssert {
assertNotNull(actual, assertContext.getText("Actual encrypt rule should exist."));
assertThat(assertContext.getText(String.format("Actual encrypt rule size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (EncryptRuleSegment encryptRuleSegment : actual) {
+ for (EncryptRuleSegment each : actual) {
ExpectedEncryptRule expectedEncryptRule = expected.get(count);
- assertThat(assertContext.getText("encrypt rule table name assertion error: "), encryptRuleSegment.getTableName(), is(expectedEncryptRule.getName()));
- EncryptRuleAssert.assertIs(assertContext, encryptRuleSegment, expectedEncryptRule);
+ assertThat(assertContext.getText("encrypt rule table name assertion error: "), each.getTableName(), is(expectedEncryptRule.getName()));
+ EncryptRuleAssert.assertIs(assertContext, each, expectedEncryptRule);
}
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
index a10ed951285..ebe27021e9f 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java
@@ -62,9 +62,8 @@ public final class AlterReadwriteSplittingRuleStatementAssert {
assertNotNull(actual, assertContext.getText("Actual readwrite-splitting rule should exist."));
assertThat(assertContext.getText(String.format("Actual readwrite-splitting rule size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (ReadwriteSplittingRuleSegment readwriteSplittingRuleSegment : actual) {
- ExceptedReadwriteSplittingRule exceptedReadwriteSplittingRule = expected.get(count);
- ReadwriteSplittingRuleAssert.assertIs(assertContext, readwriteSplittingRuleSegment, exceptedReadwriteSplittingRule);
+ for (ReadwriteSplittingRuleSegment each : actual) {
+ ReadwriteSplittingRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java
index b2e4a644ff6..2c139c9d002 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java
@@ -58,9 +58,8 @@ public final class AlterShadowRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual shadow rule should exist."));
int count = 0;
- for (ShadowRuleSegment tableRuleSegment : actual) {
- ExpectedShadowRule expectedTableRule = expected.get(count);
- ShadowRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (ShadowRuleSegment each : actual) {
+ ShadowRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java
index bb39d64d5fb..bad63f96e38 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java
@@ -63,9 +63,8 @@ public final class AlterShardingTableReferenceRulesStatementAssert {
assertThat(assertContext.getText(String.format("Actual sharding table reference rule size should be %s , but it was %s", expected.size(), actual.size())),
actual.size(), is(expected.size()));
int count = 0;
- for (TableReferenceRuleSegment shardingTableReferenceRuleSegment : actual) {
- ExpectedShardingTableReferenceRule expectedShardingTableReferenceRule = expected.get(count);
- ShardingTableReferenceRuleAssert.assertIs(assertContext, shardingTableReferenceRuleSegment, expectedShardingTableReferenceRule);
+ for (TableReferenceRuleSegment each : actual) {
+ ShardingTableReferenceRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
index 73ca4ca45f7..f8f5720e013 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java
@@ -72,9 +72,8 @@ public final class AlterShardingTableRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual sharding auto table rule should exist."));
int count = 0;
- for (AutoTableRuleSegment tableRuleSegment : actual) {
- ExpectedAutoTableRule expectedTableRule = expected.get(count);
- AutoTableRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (AutoTableRuleSegment each : actual) {
+ AutoTableRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
@@ -86,9 +85,8 @@ public final class AlterShardingTableRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual sharding table rule should exist."));
int count = 0;
- for (TableRuleSegment tableRuleSegment : actual) {
- ExpectedTableRule expectedTableRule = expected.get(count);
- TableRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (TableRuleSegment each : actual) {
+ TableRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java
index fff93be41a7..0bee5e15891 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java
@@ -64,8 +64,8 @@ public final class RegisterStorageUnitStatementAssert {
assertNotNull(actual, assertContext.getText("Actual storage unit should exist."));
assertThat(assertContext.getText(String.format("Actual storage unit size should be %s , but it was %s", expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (DataSourceSegment actualDataSource : actual) {
- DataSourceAssert.assertIs(assertContext, actualDataSource, expected.get(count));
+ for (DataSourceSegment each : actual) {
+ DataSourceAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java
index 7922f0fa68f..6e7f7576586 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java
@@ -63,10 +63,10 @@ public final class CreateEncryptRuleStatementAssert {
assertThat(assertContext.getText(String.format("Actual encrypt rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (EncryptRuleSegment encryptRuleSegment : actual) {
+ for (EncryptRuleSegment each : actual) {
ExpectedEncryptRule expectedEncryptRule = expected.get(count);
- assertThat(assertContext.getText("encrypt rule assertion error: "), encryptRuleSegment.getTableName(), is(expectedEncryptRule.getName()));
- EncryptRuleAssert.assertIs(assertContext, encryptRuleSegment, expectedEncryptRule);
+ assertThat(assertContext.getText("encrypt rule assertion error: "), each.getTableName(), is(expectedEncryptRule.getName()));
+ EncryptRuleAssert.assertIs(assertContext, each, expectedEncryptRule);
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
index a73bb8d5b3b..57dbf45f86b 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java
@@ -64,9 +64,8 @@ public final class CreateReadwriteSplittingRuleStatementAssert {
assertThat(assertContext.getText(String.format("Actual readwrite-splitting rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (ReadwriteSplittingRuleSegment readwriteSplittingRuleSegment : actual) {
- ExceptedReadwriteSplittingRule exceptedReadwriteSplittingRule = expected.get(count);
- ReadwriteSplittingRuleAssert.assertIs(assertContext, readwriteSplittingRuleSegment, exceptedReadwriteSplittingRule);
+ for (ReadwriteSplittingRuleSegment each : actual) {
+ ReadwriteSplittingRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java
index 73f4fe4b7ce..5a8f88f8403 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java
@@ -61,9 +61,8 @@ public final class CreateShadowRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual shadow rule should exist."));
int count = 0;
- for (ShadowRuleSegment tableRuleSegment : actual) {
- ExpectedShadowRule expectedTableRule = expected.get(count);
- ShadowRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (ShadowRuleSegment each : actual) {
+ ShadowRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java
index 433c97800cb..02d600e0ec3 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java
@@ -64,9 +64,8 @@ public final class CreateShardingTableReferenceRuleStatementAssert {
assertThat(assertContext.getText(String.format("Actual sharding table reference rule size should be %s , but it was %s",
expected.size(), actual.size())), actual.size(), is(expected.size()));
int count = 0;
- for (TableReferenceRuleSegment shardingTableReferenceRuleSegment : actual) {
- ExpectedShardingTableReferenceRule expectedShardingTableReferenceRule = expected.get(count);
- ShardingTableReferenceRuleAssert.assertIs(assertContext, shardingTableReferenceRuleSegment, expectedShardingTableReferenceRule);
+ for (TableReferenceRuleSegment each : actual) {
+ ShardingTableReferenceRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
index 0a8a403e4a3..e37e91e2f3e 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java
@@ -76,9 +76,8 @@ public final class CreateShardingTableRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual sharding auto table rule should exist."));
int count = 0;
- for (AutoTableRuleSegment tableRuleSegment : actual) {
- ExpectedAutoTableRule expectedTableRule = expected.get(count);
- AutoTableRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (AutoTableRuleSegment each : actual) {
+ AutoTableRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}
@@ -90,9 +89,8 @@ public final class CreateShardingTableRuleStatementAssert {
} else {
assertNotNull(actual, assertContext.getText("Actual sharding table rule should exist."));
int count = 0;
- for (TableRuleSegment tableRuleSegment : actual) {
- ExpectedTableRule expectedTableRule = expected.get(count);
- TableRuleAssert.assertIs(assertContext, tableRuleSegment, expectedTableRule);
+ for (TableRuleSegment each : actual) {
+ TableRuleAssert.assertIs(assertContext, each, expected.get(count));
count++;
}
}