This is an automated email from the ASF dual-hosted git repository.
panjuan 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 1ff4dd5 Remove useless isDefault for RequiredSPI impl (#16220)
1ff4dd5 is described below
commit 1ff4dd5a13a2f012f64e55eaabaf12584bd3f62b
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 20 19:53:02 2022 +0800
Remove useless isDefault for RequiredSPI impl (#16220)
---
.../datetime/database/DatabaseDatetimeServiceDelegate.java | 5 -----
.../datetime/database/TimeServiceConfiguration.java | 4 ----
.../datetime/database/impl/DatabaseDatetimeService.java | 5 -----
.../database/spi/{ => dialect}/MySQLDatabaseSQLEntry.java | 4 +++-
.../database/spi/{ => dialect}/OracleDatabaseSQLEntry.java | 4 +++-
.../database/spi/{ => dialect}/PostgreSQLDatabaseSQLEntry.java | 4 +++-
.../database/spi/{ => dialect}/SQLServerDatabaseSQLEntry.java | 4 +++-
...g.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry | 8 ++++----
.../data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java | 5 -----
.../spi/fixture/required/RequiredSPIFixtureDefaultFalseImpl.java | 6 ------
.../shardingsphere/spi/fixture/required/RequiredSPIImpl.java | 5 -----
.../spi/fixture/required/RequiredSingletonSPIFixtureImpl.java | 5 -----
12 files changed, 16 insertions(+), 43 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceDelegate.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceDelegate.java
index 8d12f44..ede581a 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceDelegate.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/DatabaseDatetimeServiceDelegate.java
@@ -33,9 +33,4 @@ public final class DatabaseDatetimeServiceDelegate implements
DatetimeService {
public Date getDatetime() {
return INSTANCE.getDatetime();
}
-
- @Override
- public boolean isDefault() {
- return false;
- }
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/TimeServiceConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/TimeServiceConfiguration.java
index 470a13d..a5be4c4 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/TimeServiceConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/TimeServiceConfiguration.java
@@ -31,10 +31,6 @@ import java.util.Properties;
/**
* Time service configuration.
- *
- * <p>
- * Need to create a time-service.properties under the classpath.
- * </p>
*/
@Getter
public final class TimeServiceConfiguration {
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeService.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeService.java
index 6a434a5..2f419a5 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeService.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeService.java
@@ -49,9 +49,4 @@ public final class DatabaseDatetimeService implements
DatetimeService {
}
return new Date();
}
-
- @Override
- public boolean isDefault() {
- return false;
- }
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/MySQLDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/MySQLDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
index e89ddf5..6fd8e49 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/MySQLDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/MySQLDatabaseSQLEntry.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.spi.dialect;
+
+import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
/**
* MySQL entry.
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/OracleDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/OracleDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
index 7beeda4..02a6edb 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/OracleDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/OracleDatabaseSQLEntry.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.spi.dialect;
+
+import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
/**
* Oracle entry.
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/PostgreSQLDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/PostgreSQLDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
index 599941e..55ba476 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/PostgreSQLDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/PostgreSQLDatabaseSQLEntry.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.spi.dialect;
+
+import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
/**
* PostgreSQL entry.
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/SQLServerDatabaseSQLEntry.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/SQLServerDatabaseSQLEntry.java
rename to
shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
index d101421..9d77807 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/SQLServerDatabaseSQLEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/main/java/org/apache/shardingsphere/datetime/database/spi/dialect/SQLServerDatabaseSQLEntry.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.datetime.database.spi;
+package org.apache.shardingsphere.datetime.database.spi.dialect;
+
+import org.apache.shardingsphere.datetime.database.spi.DatabaseSQLEntry;
/**
* SQLServer entry.
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.spi.DatabaseSQLEntry
index 2e11df0..dc8b16e 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.spi.DatabaseSQLEntry
@@ -15,7 +15,7 @@
# limitations under the License.
#
-org.apache.shardingsphere.datetime.database.spi.MySQLDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.PostgreSQLDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.OracleDatabaseSQLEntry
-org.apache.shardingsphere.datetime.database.spi.SQLServerDatabaseSQLEntry
+org.apache.shardingsphere.datetime.database.spi.dialect.MySQLDatabaseSQLEntry
+org.apache.shardingsphere.datetime.database.spi.dialect.PostgreSQLDatabaseSQLEntry
+org.apache.shardingsphere.datetime.database.spi.dialect.OracleDatabaseSQLEntry
+org.apache.shardingsphere.datetime.database.spi.dialect.SQLServerDatabaseSQLEntry
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
index 155f568..27a151a 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
@@ -79,11 +79,6 @@ public final class RuleAlteredJobAPIImpl extends
AbstractPipelineJobAPIImpl impl
SingletonSPIRegistry.getTypedSingletonInstancesMap(DataConsistencyCheckAlgorithm.class));
@Override
- public boolean isDefault() {
- return false;
- }
-
- @Override
public List<JobInfo> list() {
checkModeConfig();
return getJobBriefInfos().map(each ->
getJobInfo(each.getJobName())).collect(Collectors.toList());
diff --git
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIFixtureDefaultFalseImpl.java
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIFixtureDefaultFalseImpl.java
index d7b7ced..335fa5b 100644
---
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIFixtureDefaultFalseImpl.java
+++
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIFixtureDefaultFalseImpl.java
@@ -18,10 +18,4 @@
package org.apache.shardingsphere.spi.fixture.required;
public final class RequiredSPIFixtureDefaultFalseImpl implements
RequiredSPIFixture {
-
- @Override
- public boolean isDefault() {
- return false;
- }
}
-
diff --git
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIImpl.java
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIImpl.java
index 905fcc6..16378a6 100644
---
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIImpl.java
+++
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSPIImpl.java
@@ -20,9 +20,4 @@ package org.apache.shardingsphere.spi.fixture.required;
import org.apache.shardingsphere.spi.required.RequiredSPI;
public final class RequiredSPIImpl implements RequiredSPI {
-
- @Override
- public boolean isDefault() {
- return false;
- }
}
diff --git
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSingletonSPIFixtureImpl.java
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSingletonSPIFixtureImpl.java
index dd79171..d296e27 100644
---
a/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSingletonSPIFixtureImpl.java
+++
b/shardingsphere-spi/src/test/java/org/apache/shardingsphere/spi/fixture/required/RequiredSingletonSPIFixtureImpl.java
@@ -18,9 +18,4 @@
package org.apache.shardingsphere.spi.fixture.required;
public final class RequiredSingletonSPIFixtureImpl implements
RequiredSingletonSPIFixture {
-
- @Override
- public boolean isDefault() {
- return false;
- }
}
