This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 88fe106 Rename DatetimeLoadingSQLProvider (#16226)
88fe106 is described below
commit 88fe10607215e23e8d027efcca5b88c465981c98
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 21 00:49:52 2022 +0800
Rename DatetimeLoadingSQLProvider (#16226)
* Revise java doc
* Rename DatabaseDatetimeServiceConfiguration
* Rename datetime-database-config.yaml
* Rename DatabaseSQLEntry.getDatetimeLoadingSQL
* Refactor DatabaseDatetimeService
* Refactor DatabaseDatetimeService
* Rename DatetimeLoadingSQLProvider
* Rename provider package
---
.../datetime/database/DatabaseDatetimeService.java | 14 +++++++-------
...on.java => DatabaseDatetimeServiceConfiguration.java} | 12 ++++++------
.../DatetimeLoadingSQLProvider.java} | 12 ++++++------
.../DatetimeLoadingSQLProviderFactory.java} | 16 ++++++++--------
.../dialect/MySQLDatetimeLoadingSQLProvider.java} | 10 +++++-----
.../dialect/OracleDatetimeLoadingSQLProvider.java} | 10 +++++-----
.../dialect/PostgreSQLDatetimeLoadingSQLProvider.java} | 10 +++++-----
.../dialect/SQLServerDatetimeLoadingSQLProvider.java} | 10 +++++-----
...atetime.database.provider.DatetimeLoadingSQLProvider} | 8 ++++----
.../datetime/database/DatabaseDatetimeServiceTest.java | 2 +-
...ava => DatabaseDatetimeServiceConfigurationTest.java} | 6 +++---
.../{time-service.yaml => datetime-database-config.yaml} | 0
.../datetime/system/SystemDatetimeService.java | 2 +-
13 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeService.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeService.java
index 0f82cca..6b4154f 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeService.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeService.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.datetime.database;
-import
org.apache.shardingsphere.datetime.database.config.TimeServiceConfiguration;
-import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntryFactory;
+import
org.apache.shardingsphere.datetime.database.config.DatabaseDatetimeServiceConfiguration;
+import
org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProviderFactory;
import org.apache.shardingsphere.infra.datetime.DatetimeService;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
@@ -34,20 +34,20 @@ import java.util.Date;
*/
public final class DatabaseDatetimeService implements DatetimeService {
- private final TimeServiceConfiguration timeServiceConfig =
TimeServiceConfiguration.getInstance();
+ private final DatabaseDatetimeServiceConfiguration timeServiceConfig =
DatabaseDatetimeServiceConfiguration.getInstance();
@Override
public Date getDatetime() {
try {
- return loadDatetime(timeServiceConfig.getDataSource(),
DatabaseSQLEntryFactory.newInstance(timeServiceConfig.getDatabaseType()).getSQL());
+ return loadDatetime(timeServiceConfig.getDataSource(),
DatetimeLoadingSQLProviderFactory.newInstance(timeServiceConfig.getDatabaseType()).getDatetimeLoadingSQL());
} catch (final SQLException ex) {
- throw new ShardingSphereException("Load timestamp from database
error!", ex);
+ throw new ShardingSphereException("Load datetime from database
error!", ex);
}
}
- private Date loadDatetime(final DataSource dataSource, final String sql)
throws SQLException {
+ private Date loadDatetime(final DataSource dataSource, final String
datetimeLoadingSQL) throws SQLException {
try (Connection connection = dataSource.getConnection();
- PreparedStatement preparedStatement =
connection.prepareStatement(sql)) {
+ PreparedStatement preparedStatement =
connection.prepareStatement(datetimeLoadingSQL)) {
try (ResultSet resultSet = preparedStatement.executeQuery()) {
resultSet.next();
return (Date) resultSet.getObject(1);
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfiguration.java
similarity index 85%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfiguration.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfiguration.java
index 971dbb2..66cdfc1 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfiguration.java
@@ -32,20 +32,20 @@ import java.util.Collections;
import java.util.Map;
/**
- * Time service configuration.
+ * Database datetime service configuration.
*/
@Getter
-public final class TimeServiceConfiguration {
+public final class DatabaseDatetimeServiceConfiguration {
- private static final TimeServiceConfiguration INSTANCE = new
TimeServiceConfiguration();
+ private static final DatabaseDatetimeServiceConfiguration INSTANCE = new
DatabaseDatetimeServiceConfiguration();
- private static final String CONFIG_FILE = "time-service.yaml";
+ private static final String CONFIG_FILE = "datetime-database-config.yaml";
private final DataSource dataSource;
private final DatabaseType databaseType;
- private TimeServiceConfiguration() {
+ private DatabaseDatetimeServiceConfiguration() {
dataSource = DataSourcePoolCreator.create(new
YamlDataSourceConfigurationSwapper().swapToDataSourceProperties(loadDataSourceConfiguration()));
databaseType =
DatabaseTypeRecognizer.getDatabaseType(Collections.singleton(dataSource));
}
@@ -64,7 +64,7 @@ public final class TimeServiceConfiguration {
*
* @return time service configuration
*/
- public static TimeServiceConfiguration getInstance() {
+ public static DatabaseDatetimeServiceConfiguration getInstance() {
return INSTANCE;
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProvider.java
similarity index 76%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProvider.java
index 2956470..269272a 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProvider.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.provider;
import org.apache.shardingsphere.spi.typed.TypedSPI;
/**
- * Database SQL entry.
+ * Datetime loading SQL provider.
*/
-public interface DatabaseSQLEntry extends TypedSPI {
+public interface DatetimeLoadingSQLProvider extends TypedSPI {
/**
- * Get SQL for getting time.
+ * Get SQL for datetime loading.
*
- * @return SQL
+ * @return SQL for datetime loading
*/
- String getSQL();
+ String getDatetimeLoadingSQL();
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntryFactory.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProviderFactory.java
similarity index 68%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntryFactory.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProviderFactory.java
index de9fcf1..9ad077c 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/DatabaseSQLEntryFactory.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/DatetimeLoadingSQLProviderFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.provider;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -27,22 +27,22 @@ import org.apache.shardingsphere.spi.typed.TypedSPIRegistry;
import java.util.Properties;
/**
- * Database SQL entry factory.
+ * Datetime loading SQL provider factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseSQLEntryFactory {
+public final class DatetimeLoadingSQLProviderFactory {
static {
- ShardingSphereServiceLoader.register(DatabaseSQLEntry.class);
+ ShardingSphereServiceLoader.register(DatetimeLoadingSQLProvider.class);
}
/**
- * Create new instance of database SQL entry.
+ * Create new instance of datetime loading SQL provider.
*
* @param databaseType database type
- * @return new instance of database SQL entry
+ * @return new instance of datetime loading SQL provider
*/
- public static DatabaseSQLEntry newInstance(final DatabaseType
databaseType) {
- return TypedSPIRegistry.getRegisteredService(DatabaseSQLEntry.class,
DatabaseTypeRegistry.getTrunkDatabaseTypeName(databaseType), new Properties());
+ public static DatetimeLoadingSQLProvider newInstance(final DatabaseType
databaseType) {
+ return
TypedSPIRegistry.getRegisteredService(DatetimeLoadingSQLProvider.class,
DatabaseTypeRegistry.getTrunkDatabaseTypeName(databaseType), new Properties());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
similarity index 73%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
index f93fdd5..69a4fb2 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/MySQLDatetimeLoadingSQLProvider.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi.dialect;
+package org.apache.shardingsphere.datetime.database.provider.dialect;
-import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
+import
org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider;
/**
- * MySQL entry.
+ * Datetime loading SQL provider for MySQL.
*/
-public final class MySQLDatabaseSQLEntry implements DatabaseSQLEntry {
+public final class MySQLDatetimeLoadingSQLProvider implements
DatetimeLoadingSQLProvider {
@Override
- public String getSQL() {
+ public String getDatetimeLoadingSQL() {
return "SELECT NOW()";
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
similarity index 73%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
index fe85529..8a3404b 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/OracleDatetimeLoadingSQLProvider.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi.dialect;
+package org.apache.shardingsphere.datetime.database.provider.dialect;
-import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
+import
org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider;
/**
- * Oracle entry.
+ * Datetime loading SQL provider for Oracle.
*/
-public final class OracleDatabaseSQLEntry implements DatabaseSQLEntry {
+public final class OracleDatetimeLoadingSQLProvider implements
DatetimeLoadingSQLProvider {
@Override
- public String getSQL() {
+ public String getDatetimeLoadingSQL() {
return "SELECT sysdate FROM DUAL";
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
similarity index 73%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
index 125cc4a..78975d5 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/PostgreSQLDatetimeLoadingSQLProvider.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi.dialect;
+package org.apache.shardingsphere.datetime.database.provider.dialect;
-import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
+import
org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider;
/**
- * PostgreSQL entry.
+ * Datetime loading SQL provider for PostgreSQL.
*/
-public final class PostgreSQLDatabaseSQLEntry implements DatabaseSQLEntry {
+public final class PostgreSQLDatetimeLoadingSQLProvider implements
DatetimeLoadingSQLProvider {
@Override
- public String getSQL() {
+ public String getDatetimeLoadingSQL() {
return "SELECT NOW()";
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
similarity index 73%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
index 3f5910b..c86df34 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/provider/dialect/SQLServerDatetimeLoadingSQLProvider.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi.dialect;
+package org.apache.shardingsphere.datetime.database.provider.dialect;
-import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
+import
org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider;
/**
- * SQLServer entry.
+ * Datetime loading SQL provider for SQLServer.
*/
-public final class SQLServerDatabaseSQLEntry implements DatabaseSQLEntry {
+public final class SQLServerDatetimeLoadingSQLProvider implements
DatetimeLoadingSQLProvider {
@Override
- public String getSQL() {
+ public String getDatetimeLoadingSQL() {
return "SELECT GETDATE()";
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider
similarity index 67%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider
index 1a9ffba..0c35e1d 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/resources/META-INF/services/org.apache.shardingsphere.datetime.database.provider.DatetimeLoadingSQLProvider
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.datetime.database.spi.dialect.PostgreSQLDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.dialect.MySQLDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.dialect.SQLServerDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.dialect.OracleDatabaseSQLEntry
+org.apache.shardingsphere.datetime.database.provider.dialect.PostgreSQLDatetimeLoadingSQLProvider
+org.apache.shardingsphere.datetime.database.provider.dialect.MySQLDatetimeLoadingSQLProvider
+org.apache.shardingsphere.datetime.database.provider.dialect.SQLServerDatetimeLoadingSQLProvider
+org.apache.shardingsphere.datetime.database.provider.dialect.OracleDatetimeLoadingSQLProvider
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceTest.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceTest.java
index 85a7577..2c60f5a 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
public final class DatabaseDatetimeServiceTest {
@Test
- public void assertGetDateTime() {
+ public void assertGetDatetime() {
Date currentDate = new Date();
DatetimeService datetimeService = new DatabaseDatetimeService();
assertTrue(datetimeService.getDatetime().getTime() >=
currentDate.getTime());
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfigurationTest.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfigurationTest.java
similarity index 79%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfigurationTest.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfigurationTest.java
index 5c0c9ee..6c5aa8b 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/TimeServiceConfigurationTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/config/DatabaseDatetimeServiceConfigurationTest.java
@@ -24,11 +24,11 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class TimeServiceConfigurationTest {
+public final class DatabaseDatetimeServiceConfigurationTest {
@Test
public void assertGetInstance() {
-
assertThat(TimeServiceConfiguration.getInstance().getDatabaseType().getName(),
is("H2"));
- assertThat(TimeServiceConfiguration.getInstance().getDataSource(),
instanceOf(HikariDataSource.class));
+
assertThat(DatabaseDatetimeServiceConfiguration.getInstance().getDatabaseType().getName(),
is("H2"));
+
assertThat(DatabaseDatetimeServiceConfiguration.getInstance().getDataSource(),
instanceOf(HikariDataSource.class));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/resources/time-service.yaml
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/resources/datetime-database-config.yaml
similarity index 100%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/resources/time-service.yaml
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/resources/datetime-database-config.yaml
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-system-datetime/src/main/java/org/apache/shardingsphere/datetime/system/SystemDatetimeService.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-system-datetime/src/main/java/org/apache/shardingsphere/datetime/system/SystemDatetimeService.java
index 8f628ea..751bc10 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-system-datetime/src/main/java/org/apache/shardingsphere/datetime/system/SystemDatetimeService.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-system-datetime/src/main/java/org/apache/shardingsphere/datetime/system/SystemDatetimeService.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.datetime.DatetimeService;
import java.util.Date;
/**
- * Default datetime service.
+ * System datetime service.
*/
public final class SystemDatetimeService implements DatetimeService {
