This is an automated email from the ASF dual-hosted git repository.
dongzonglei 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 6711c71 Minor changes for code format (#8690)
6711c71 is described below
commit 6711c71bc6bede55285db9101f0def14fcaf13fb
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Dec 19 18:02:05 2020 +0800
Minor changes for code format (#8690)
* Update for code format
* Change shardingsphere-ha order of shardingsphere-features
* Update for code format
* Update javadoc
---
pom.xml | 8 ++++----
shardingsphere-features/pom.xml | 2 +-
.../main/java/org/apache/shardingsphere/ha/spi/HAType.java | 12 ++++++------
.../shardingsphere-ha-spring-boot-starter/pom.xml | 4 +++-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c51806..56fdf0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,11 +103,11 @@
<mssql.version>6.1.7.jre8-preview</mssql.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
<bytebuddy.version>1.10.16</bytebuddy.version>
-
+
<elasticjob.version>3.0.0-beta</elasticjob.version>
-
+
<calcite.version>1.26.0</calcite.version>
-
+
<!-- Plugin versions -->
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
@@ -332,7 +332,7 @@
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
diff --git a/shardingsphere-features/pom.xml b/shardingsphere-features/pom.xml
index 1c0d2ce..aefd7e2 100644
--- a/shardingsphere-features/pom.xml
+++ b/shardingsphere-features/pom.xml
@@ -32,8 +32,8 @@
<modules>
<module>shardingsphere-sharding</module>
<module>shardingsphere-replica-query</module>
+ <module>shardingsphere-ha</module>
<module>shardingsphere-encrypt</module>
<module>shardingsphere-shadow</module>
- <module>shardingsphere-ha</module>
</modules>
</project>
diff --git
a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-api/src/main/java/org/apache/shardingsphere/ha/spi/HAType.java
b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-api/src/main/java/org/apache/shardingsphere/ha/spi/HAType.java
index b56dfca..fa37873 100644
---
a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-api/src/main/java/org/apache/shardingsphere/ha/spi/HAType.java
+++
b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-api/src/main/java/org/apache/shardingsphere/ha/spi/HAType.java
@@ -31,8 +31,8 @@ public interface HAType extends ShardingSphereAlgorithm {
/**
* Check HA config.
*
- * @param dataSourceMap Data source map
- * @param schemaName Schema name
+ * @param dataSourceMap data source map
+ * @param schemaName schema name
* @throws SQLException SQL Exception
*/
void checkHAConfig(Map<String, DataSource> dataSourceMap, String
schemaName) throws SQLException;
@@ -40,16 +40,16 @@ public interface HAType extends ShardingSphereAlgorithm {
/**
* Update primary data source.
*
- * @param dataSourceMap Data source map
- * @param schemaName Schema name
+ * @param dataSourceMap data source map
+ * @param schemaName schema name
*/
void updatePrimaryDataSource(Map<String, DataSource> dataSourceMap, String
schemaName);
/**
* Periodical monitor.
*
- * @param dataSourceMap Data source map
- * @param schemaName Schema name
+ * @param dataSourceMap data source map
+ * @param schemaName schema name
*/
void periodicalMonitor(Map<String, DataSource> dataSourceMap, String
schemaName);
}
diff --git
a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/pom.xml
b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/pom.xml
index 03bf5ae..888c46a 100644
---
a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/pom.xml
+++
b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-spring/shardingsphere-ha-spring-boot-starter/pom.xml
@@ -27,13 +27,14 @@
</parent>
<artifactId>shardingsphere-ha-spring-boot-starter</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-ha-common</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -51,6 +52,7 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
