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 a2c896337fc Refactor shardingsphere-database-time-service module
(#23732)
a2c896337fc is described below
commit a2c896337fce5cc6eac4a882f7d668df419cdb0c
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 26 22:48:14 2023 +0800
Refactor shardingsphere-database-time-service module (#23732)
---
.../database/DatabaseTimeService.java} | 12 ++++++------
.../config/DatabaseDatetimeServiceConfiguration.java | 4 ++--
.../DatetimeConfigurationFileNotFoundException.java | 2 +-
.../database/exception/DatetimeLoadingException.java | 2 +-
.../database/provider/DatetimeLoadingSQLProvider.java | 2 +-
.../provider/dialect/MySQLDatetimeLoadingSQLProvider.java | 4 ++--
.../provider/dialect/OracleDatetimeLoadingSQLProvider.java | 4 ++--
.../dialect/PostgreSQLDatetimeLoadingSQLProvider.java | 4 ++--
.../dialect/SQLServerDatetimeLoadingSQLProvider.java | 4 ++--
....shardingsphere.timeservice.spi.ShardingSphereTimeService | 2 +-
...ervice.type.database.provider.DatetimeLoadingSQLProvider} | 8 ++++----
.../database/DatabaseTimeServiceTest.java} | 6 +++---
.../config/DatabaseTimeServiceConfigurationTest.java} | 4 ++--
13 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeService.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeService.java
similarity index 83%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeService.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeService.java
index b70aa44f6a9..fde5461903f 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeService.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeService.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database;
+package org.apache.shardingsphere.timeservice.type.database;
-import
org.apache.shardingsphere.timeservice.database.config.DatabaseDatetimeServiceConfiguration;
-import
org.apache.shardingsphere.timeservice.database.exception.DatetimeLoadingException;
-import
org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider;
+import
org.apache.shardingsphere.timeservice.type.database.config.DatabaseDatetimeServiceConfiguration;
+import
org.apache.shardingsphere.timeservice.type.database.exception.DatetimeLoadingException;
+import
org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPIRegistry;
@@ -32,9 +32,9 @@ import java.sql.SQLException;
import java.util.Date;
/**
- * Database datetime service.
+ * Database time service.
*/
-public final class DatabaseDatetimeService implements
ShardingSphereTimeService {
+public final class DatabaseTimeService implements ShardingSphereTimeService {
private final DatabaseDatetimeServiceConfiguration timeServiceConfig =
DatabaseDatetimeServiceConfiguration.getInstance();
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfiguration.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseDatetimeServiceConfiguration.java
similarity index 93%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfiguration.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseDatetimeServiceConfiguration.java
index e0292a71c26..ddf0fa3fbd8 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfiguration.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseDatetimeServiceConfiguration.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.config;
+package org.apache.shardingsphere.timeservice.type.database.config;
import lombok.Getter;
-import
org.apache.shardingsphere.timeservice.database.exception.DatetimeConfigurationFileNotFoundException;
+import
org.apache.shardingsphere.timeservice.type.database.exception.DatetimeConfigurationFileNotFoundException;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import
org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeConfigurationFileNotFoundException.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeConfigurationFileNotFoundException.java
similarity index 95%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeConfigurationFileNotFoundException.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeConfigurationFileNotFoundException.java
index b638754d8e7..c3fbc92e874 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeConfigurationFileNotFoundException.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeConfigurationFileNotFoundException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.exception;
+package org.apache.shardingsphere.timeservice.type.database.exception;
import org.apache.shardingsphere.infra.exception.DataSQLException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeLoadingException.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeLoadingException.java
similarity index 95%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeLoadingException.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeLoadingException.java
index b26c1bc8ee7..51d1919f888 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/exception/DatetimeLoadingException.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/exception/DatetimeLoadingException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.exception;
+package org.apache.shardingsphere.timeservice.type.database.exception;
import org.apache.shardingsphere.infra.exception.ConnectionSQLException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/DatetimeLoadingSQLProvider.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/DatetimeLoadingSQLProvider.java
similarity index 94%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/DatetimeLoadingSQLProvider.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/DatetimeLoadingSQLProvider.java
index 7991e503a52..288c7e0174b 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/DatetimeLoadingSQLProvider.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/DatetimeLoadingSQLProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.provider;
+package org.apache.shardingsphere.timeservice.type.database.provider;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
similarity index 86%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
index 195b6a2987a..bbe2f6455d4 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.provider.dialect;
+package org.apache.shardingsphere.timeservice.type.database.provider.dialect;
-import
org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider;
+import
org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider;
/**
* Datetime loading SQL provider for MySQL.
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
similarity index 86%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
index 32ac223d852..a49452e5951 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.provider.dialect;
+package org.apache.shardingsphere.timeservice.type.database.provider.dialect;
-import
org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider;
+import
org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider;
/**
* Datetime loading SQL provider for Oracle.
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
similarity index 86%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
index 9ff06f3cd7b..dc3bf8da6f4 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.provider.dialect;
+package org.apache.shardingsphere.timeservice.type.database.provider.dialect;
-import
org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider;
+import
org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider;
/**
* Datetime loading SQL provider for PostgreSQL.
diff --git
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
similarity index 86%
rename from
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
rename to
kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
index 1bc44a546bb..37f0db086b5 100644
---
a/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
+++
b/kernel/time-service/type/database/src/main/java/org/apache/shardingsphere/timeservice/type/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.provider.dialect;
+package org.apache.shardingsphere.timeservice.type.database.provider.dialect;
-import
org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider;
+import
org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider;
/**
* Datetime loading SQL provider for SQLServer.
diff --git
a/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService
b/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService
index 495677ce47d..78543bb9fd0 100644
---
a/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService
+++
b/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.timeservice.database.DatabaseDatetimeService
+org.apache.shardingsphere.timeservice.type.database.DatabaseTimeService
diff --git
a/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider
b/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider
similarity index 65%
rename from
kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider
rename to
kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider
index c4d7a73f1da..96cc201142d 100644
---
a/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.database.provider.DatetimeLoadingSQLProvider
+++
b/kernel/time-service/type/database/src/main/resources/META-INF/services/org.apache.shardingsphere.timeservice.type.database.provider.DatetimeLoadingSQLProvider
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.timeservice.database.provider.dialect.PostgreSQLDatetimeLoadingSQLProvider
-org.apache.shardingsphere.timeservice.database.provider.dialect.MySQLDatetimeLoadingSQLProvider
-org.apache.shardingsphere.timeservice.database.provider.dialect.SQLServerDatetimeLoadingSQLProvider
-org.apache.shardingsphere.timeservice.database.provider.dialect.OracleDatetimeLoadingSQLProvider
+org.apache.shardingsphere.timeservice.type.database.provider.dialect.PostgreSQLDatetimeLoadingSQLProvider
+org.apache.shardingsphere.timeservice.type.database.provider.dialect.MySQLDatetimeLoadingSQLProvider
+org.apache.shardingsphere.timeservice.type.database.provider.dialect.SQLServerDatetimeLoadingSQLProvider
+org.apache.shardingsphere.timeservice.type.database.provider.dialect.OracleDatetimeLoadingSQLProvider
diff --git
a/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeServiceTest.java
b/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeServiceTest.java
similarity index 90%
rename from
kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeServiceTest.java
rename to
kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeServiceTest.java
index dd97d9e6d0c..b7ba68ee423 100644
---
a/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/DatabaseDatetimeServiceTest.java
+++
b/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/DatabaseTimeServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database;
+package org.apache.shardingsphere.timeservice.type.database;
import org.apache.shardingsphere.timeservice.spi.ShardingSphereTimeService;
import org.junit.Test;
@@ -24,12 +24,12 @@ import java.util.Date;
import static org.junit.Assert.assertTrue;
-public final class DatabaseDatetimeServiceTest {
+public final class DatabaseTimeServiceTest {
@Test
public void assertGetDatetime() {
Date currentDate = new Date();
- ShardingSphereTimeService datetimeService = new
DatabaseDatetimeService();
+ ShardingSphereTimeService datetimeService = new DatabaseTimeService();
assertTrue(datetimeService.getDatetime().getTime() >=
currentDate.getTime());
}
}
diff --git
a/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfigurationTest.java
b/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseTimeServiceConfigurationTest.java
similarity index 91%
rename from
kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfigurationTest.java
rename to
kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseTimeServiceConfigurationTest.java
index bd0838ac427..55147b2911d 100644
---
a/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/database/config/DatabaseDatetimeServiceConfigurationTest.java
+++
b/kernel/time-service/type/database/src/test/java/org/apache/shardingsphere/timeservice/type/database/config/DatabaseTimeServiceConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.timeservice.database.config;
+package org.apache.shardingsphere.timeservice.type.database.config;
import com.zaxxer.hikari.HikariDataSource;
import org.junit.Test;
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class DatabaseDatetimeServiceConfigurationTest {
+public final class DatabaseTimeServiceConfigurationTest {
@Test
public void assertGetInstance() {
