This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 c20da72e9ec Upgrade version of spotless (#24980)
c20da72e9ec is described below
commit c20da72e9ecbe8302b7fcc0eb1a60dead97e4854
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Apr 3 16:49:48 2023 +0800
Upgrade version of spotless (#24980)
---
.../loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java | 9 +++------
pom.xml | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
index ebf5d8c5af2..92c3f24d25d 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
@@ -55,8 +55,7 @@ class H2SchemaMetaDataLoaderTest {
ResultSet indexResultSet = mockIndexMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(
"SELECT TABLE_CATALOG, TABLE_NAME, INDEX_NAME FROM
INFORMATION_SCHEMA.INDEXES WHERE TABLE_CATALOG=? AND TABLE_SCHEMA=? AND
UPPER(TABLE_NAME) IN ('TBL')")
- .executeQuery())
- .thenReturn(indexResultSet);
+ .executeQuery()).thenReturn(indexResultSet);
ResultSet primaryKeys = mockPrimaryKeysMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(
"SELECT TABLE_NAME, INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES
WHERE TABLE_CATALOG=? AND TABLE_SCHEMA=? AND INDEX_TYPE_NAME = 'PRIMARY
KEY'").executeQuery()).thenReturn(primaryKeys);
@@ -83,14 +82,12 @@ class H2SchemaMetaDataLoaderTest {
ResultSet primaryKeys = mockPrimaryKeysMetaDataResultSet();
when(dataSource.getConnection().prepareStatement(
"SELECT TABLE_NAME, INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES
WHERE TABLE_CATALOG=? AND TABLE_SCHEMA=? AND INDEX_TYPE_NAME = 'PRIMARY KEY'
AND UPPER(TABLE_NAME) IN ('TBL')")
- .executeQuery())
- .thenReturn(primaryKeys);
+ .executeQuery()).thenReturn(primaryKeys);
ResultSet generatedInfo = mockGeneratedInfoResultSet();
when(dataSource.getConnection().prepareStatement(
"SELECT C.TABLE_NAME TABLE_NAME, C.COLUMN_NAME COLUMN_NAME,
COALESCE(I.IS_GENERATED, FALSE) IS_GENERATED FROM INFORMATION_SCHEMA.COLUMNS C"
+ " RIGHT JOIN INFORMATION_SCHEMA.INDEXES I ON
C.TABLE_NAME=I.TABLE_NAME WHERE C.TABLE_CATALOG=? AND C.TABLE_SCHEMA=? AND
C.TABLE_NAME IN ('tbl')")
- .executeQuery())
- .thenReturn(generatedInfo);
+ .executeQuery()).thenReturn(generatedInfo);
assertTableMetaDataMap(getDialectTableMetaDataLoader().load(dataSource,
Collections.singletonList("tbl"), "sharding_db"));
}
diff --git a/pom.xml b/pom.xml
index 7cbeec98caa..b6228d3a8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <spotless-maven-plugin.version>2.22.1</spotless-maven-plugin.version>
+ <spotless-maven-plugin.version>2.35.0</spotless-maven-plugin.version>
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
</properties>
