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 83de1b40853 Refactor ServerVersion (#32479)
83de1b40853 is described below
commit 83de1b408535184b3404962f1574ea3c6dc58739
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 13 04:24:52 2024 +0800
Refactor ServerVersion (#32479)
* Refactor ServerVersion
* Revise javadoc
* Revise javadoc
* Revise javadoc
---
.../data/pipeline/spi/JdbcQueryPropertiesExtension.java | 2 +-
.../mysql/datasource/MySQLJdbcQueryPropertiesExtension.java | 2 +-
.../data/pipeline/mysql/ingest/client/ServerVersion.java | 2 --
.../mysql/ingest/client/netty/MySQLNegotiateHandlerTest.java | 8 +++-----
.../datasource/OpenGaussJdbcQueryPropertiesExtension.java | 2 +-
.../datasource/PostgreSQLJdbcQueryPropertiesExtension.java | 2 +-
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java
index 748506e7df5..3b5fe2d3283 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java
@@ -31,7 +31,7 @@ public interface JdbcQueryPropertiesExtension extends
DatabaseTypedSPI {
/**
* Extend query properties.
*
- * @param props props
+ * @param props query properties
*/
void extendQueryProperties(Properties props);
}
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
index 9c68e17c888..0ef86701771 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.Properties;
/**
- * MySQL JDBC query properties extension.
+ * JDBC query properties extension of MySQL.
*/
@Slf4j
public final class MySQLJdbcQueryPropertiesExtension implements
JdbcQueryPropertiesExtension {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/ServerVersion.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/ServerVersion.java
index 0c0486c785e..cc606bd34bd 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/ServerVersion.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/ServerVersion.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.client;
-import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import java.util.regex.Matcher;
@@ -26,7 +25,6 @@ import java.util.regex.Pattern;
/**
* Server version.
*/
-@Getter
@Slf4j
public final class ServerVersion {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandlerTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandlerTest.java
index 08da85668ea..38f02885923 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandlerTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandlerTest.java
@@ -44,7 +44,6 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -85,10 +84,9 @@ class MySQLNegotiateHandlerTest {
mysqlNegotiateHandler.channelRead(channelHandlerContext,
handshakePacket);
verify(channel).writeAndFlush(ArgumentMatchers.any(MySQLHandshakeResponse41Packet.class));
ServerInfo serverInfo = (ServerInfo)
Plugins.getMemberAccessor().get(MySQLNegotiateHandler.class.getDeclaredField("serverInfo"),
mysqlNegotiateHandler);
- assertNotNull(serverInfo);
- assertThat(serverInfo.getServerVersion().getMajor(), is(5));
- assertThat(serverInfo.getServerVersion().getMinor(), is(7));
- assertThat(serverInfo.getServerVersion().getSeries(), is(22));
+
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("major"),
serverInfo.getServerVersion()), is(5));
+
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("minor"),
serverInfo.getServerVersion()), is(7));
+
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("series"),
serverInfo.getServerVersion()), is(22));
}
@Test
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java
index b28b2e3db0d..8eba2d350d2 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java
@@ -30,7 +30,7 @@ public final class OpenGaussJdbcQueryPropertiesExtension
implements JdbcQueryPro
public OpenGaussJdbcQueryPropertiesExtension() {
queryProps.setProperty("stringtype", "unspecified");
- queryProps.setProperty("bitToString", "true");
+ queryProps.setProperty("bitToString", Boolean.TRUE.toString());
}
@Override
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java
index 1f6c2d794ce..d0a79d4882e 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
import java.util.Properties;
/**
- * PostgreSQL JDBC query properties extension.
+ * JDBC query properties extension of PostgreSQL.
*/
public final class PostgreSQLJdbcQueryPropertiesExtension implements
JdbcQueryPropertiesExtension {
