This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 eacfdab979b Unify @Getter and @Setter for jaxb entities (#25615)
eacfdab979b is described below
commit eacfdab979b3be83464f269ae16dbc5e182f97ac
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 12 19:00:22 2023 +0800
Unify @Getter and @Setter for jaxb entities (#25615)
* Unify @Getter and @Setter for jaxb entities
* Unify @Getter and @Setter for jaxb entities
---
.../mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java | 2 +-
.../test/e2e/agent/metrics/cases/IntegrationTestCases.java | 2 +-
.../test/e2e/agent/jaeger/cases/IntegrationTestCases.java | 2 +-
.../test/e2e/agent/zipkin/cases/IntegrationTestCases.java | 2 +-
.../test/e2e/env/runtime/scenario/database/DatabaseNameEnvironment.java | 2 +-
.../shardingsphere/test/e2e/data/pipeline/command/ExtraSQLCommand.java | 2 +-
.../test/e2e/data/pipeline/command/MigrationDistSQLCommand.java | 2 +-
.../org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java | 2 +-
.../java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
index 67421471f69..8936e0c3864 100644
---
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
+++
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
@@ -68,7 +68,7 @@ public final class JDBCRepositorySQLLoader {
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
Files.walkFileTree(Paths.get(url.toURI()), new
SimpleFileVisitor<Path>() {
-
+
@SneakyThrows(JAXBException.class)
@Override
public FileVisitResult visitFile(final Path file, final
BasicFileAttributes attributes) throws IOException {
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCases.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCases.java
index 7a45d890af7..1d7f958ab7a 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCases.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/IntegrationTestCases.java
@@ -27,8 +27,8 @@ import java.util.LinkedList;
/**
* Integration test cases.
*/
-@Getter
@XmlRootElement(name = "integration-test-cases")
+@Getter
public final class IntegrationTestCases {
@XmlElement(name = "test-case")
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCases.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCases.java
index 3b9cf9ff587..2d08981dace 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCases.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/IntegrationTestCases.java
@@ -27,8 +27,8 @@ import java.util.LinkedList;
/**
* Integration test cases.
*/
-@Getter
@XmlRootElement(name = "integration-test-cases")
+@Getter
public final class IntegrationTestCases {
@XmlElement(name = "test-case")
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCases.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCases.java
index 6fb5a340874..eb3ef28703f 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCases.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/IntegrationTestCases.java
@@ -27,8 +27,8 @@ import java.util.LinkedList;
/**
* Integration test cases.
*/
-@Getter
@XmlRootElement(name = "integration-test-cases")
+@Getter
public final class IntegrationTestCases {
@XmlElement(name = "test-case")
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/scenario/database/DatabaseNameEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/scenario/database/DatabaseNameEnvironment.java
index b8ad394d2ca..187412226b1 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/scenario/database/DatabaseNameEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/scenario/database/DatabaseNameEnvironment.java
@@ -27,8 +27,8 @@ import java.util.LinkedList;
/**
* XML definition of database name environment.
*/
-@Getter
@XmlRootElement(name = "databases")
+@Getter
public final class DatabaseNameEnvironment {
@XmlElement(name = "database")
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/ExtraSQLCommand.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/ExtraSQLCommand.java
index a1779462245..1b8e7bca566 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/ExtraSQLCommand.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/ExtraSQLCommand.java
@@ -25,9 +25,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-@Setter
@XmlRootElement(name = "command")
@XmlAccessorType(XmlAccessType.FIELD)
+@Setter
public final class ExtraSQLCommand {
@XmlElement(name = "create-table-order")
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/MigrationDistSQLCommand.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/MigrationDistSQLCommand.java
index 6bf0966fbba..9cec28223a6 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/MigrationDistSQLCommand.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/command/MigrationDistSQLCommand.java
@@ -25,9 +25,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-@Setter
@XmlRootElement(name = "command")
@XmlAccessorType(XmlAccessType.FIELD)
+@Setter
public final class MigrationDistSQLCommand {
@XmlElement(name = "alter-migration-rule")
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
index e3b807be3c6..1a896170043 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/IntegrationTestCases.java
@@ -28,8 +28,8 @@ import java.util.LinkedList;
/**
* JAXB definition of integration test cases.
*/
-@Getter
@XmlRootElement(name = "integration-test-cases")
+@Getter
public final class IntegrationTestCases {
@XmlElement(name = "test-case")
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
index 032c7a8aa7c..c973887c289 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSet.java
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
/**
* Data sets root xml entry.
*/
-@Getter
@XmlRootElement(name = "dataset")
+@Getter
public final class DataSet {
@XmlAttribute(name = "update-count")
