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 e59671dbb70 Rename LocalDateTimeConvertor to
CosIdLocalDateTimeConvertor (#24551)
e59671dbb70 is described below
commit e59671dbb7087d57f78b78009186432a833adadb
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 11 17:46:43 2023 +0800
Rename LocalDateTimeConvertor to CosIdLocalDateTimeConvertor (#24551)
---
.../sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java | 6 +++---
.../sharding/interval/CosIdIntervalShardingAlgorithm.java | 8 ++++----
.../interval/CosIdSnowflakeIntervalShardingAlgorithm.java | 8 ++++----
...calDateTimeConvertor.java => CosIdLocalDateTimeConvertor.java} | 4 ++--
...meConvertor.java => SnowflakeCosIdLocalDateTimeConvertor.java} | 6 +++---
...imeConvertor.java => StandardCosIdLocalDateTimeConvertor.java} | 6 +++---
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
index 8f2ef582671..3b165da0f9e 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingV
import
org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import
org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import
org.apache.shardingsphere.sharding.cosid.algorithm.CosIdAlgorithmConstants;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.LocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.CosIdLocalDateTimeConvertor;
import org.apache.shardingsphere.sharding.exception.ShardingPluginException;
import java.time.LocalDateTime;
@@ -56,7 +56,7 @@ public abstract class
AbstractCosIdIntervalShardingAlgorithm<T extends Comparabl
private IntervalTimeline intervalTimeline;
- private LocalDateTimeConvertor localDateTimeConvertor;
+ private CosIdLocalDateTimeConvertor localDateTimeConvertor;
@Override
public void init(final Properties props) {
@@ -79,7 +79,7 @@ public abstract class
AbstractCosIdIntervalShardingAlgorithm<T extends Comparabl
return props.getProperty(key);
}
- protected abstract LocalDateTimeConvertor
createLocalDateTimeConvertor(Properties props);
+ protected abstract CosIdLocalDateTimeConvertor
createLocalDateTimeConvertor(Properties props);
@Override
public String doSharding(final Collection<String> availableTargetNames,
final PreciseShardingValue<T> shardingValue) {
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
index ca25eb4f752..0ae4ab33df6 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdIntervalShardingAlgorithm.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval;
import
org.apache.shardingsphere.sharding.cosid.algorithm.CosIdAlgorithmConstants;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.impl.CosIDLocalDateTimeConvertor;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.LocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.impl.StandardCosIdLocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.CosIdLocalDateTimeConvertor;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
@@ -39,11 +39,11 @@ public final class CosIdIntervalShardingAlgorithm extends
AbstractCosIdIntervalS
private static final String TIMESTAMP_UNIT_KEY = "ts-unit";
@Override
- protected LocalDateTimeConvertor createLocalDateTimeConvertor(final
Properties props) {
+ protected CosIdLocalDateTimeConvertor createLocalDateTimeConvertor(final
Properties props) {
ZoneId zoneId = props.containsKey(ZONE_ID_KEY) ?
ZoneId.of(props.getProperty(ZONE_ID_KEY)) : ZoneId.systemDefault();
boolean isSecondTs = props.containsKey(TIMESTAMP_UNIT_KEY) &&
TIMESTAMP_SECOND_UNIT.equalsIgnoreCase(props.getProperty(TIMESTAMP_UNIT_KEY));
DateTimeFormatter dateTimeFormatter =
DateTimeFormatter.ofPattern(props.getProperty(DATE_TIME_PATTERN_KEY,
DEFAULT_DATE_TIME_PATTERN));
- return new CosIDLocalDateTimeConvertor(zoneId, isSecondTs,
dateTimeFormatter);
+ return new StandardCosIdLocalDateTimeConvertor(zoneId, isSecondTs,
dateTimeFormatter);
}
@Override
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
index 03924328a76..001c31b3da0 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/CosIdSnowflakeIntervalShardingAlgorithm.java
@@ -22,8 +22,8 @@ import
me.ahoo.cosid.snowflake.MillisecondSnowflakeIdStateParser;
import me.ahoo.cosid.snowflake.SnowflakeIdStateParser;
import
org.apache.shardingsphere.sharding.cosid.algorithm.CosIdAlgorithmConstants;
import
org.apache.shardingsphere.sharding.cosid.algorithm.keygen.CosIdSnowflakeKeyGenerateAlgorithm;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.LocalDateTimeConvertor;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.impl.SnowflakeLocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.CosIdLocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.impl.SnowflakeCosIdLocalDateTimeConvertor;
import java.time.ZoneId;
import java.util.Properties;
@@ -38,8 +38,8 @@ public final class CosIdSnowflakeIntervalShardingAlgorithm
extends AbstractCosId
private static final String ZONE_ID_KEY = "zone-id";
@Override
- protected LocalDateTimeConvertor createLocalDateTimeConvertor(final
Properties props) {
- return new
SnowflakeLocalDateTimeConvertor(createSnowflakeIdStateParser(props));
+ protected CosIdLocalDateTimeConvertor createLocalDateTimeConvertor(final
Properties props) {
+ return new
SnowflakeCosIdLocalDateTimeConvertor(createSnowflakeIdStateParser(props));
}
private SnowflakeIdStateParser createSnowflakeIdStateParser(final
Properties props) {
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/LocalDateTimeConvertor.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/CosIdLocalDateTimeConvertor.java
similarity index 92%
rename from
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/LocalDateTimeConvertor.java
rename to
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/CosIdLocalDateTimeConvertor.java
index 41921d9ce90..81f6b455eb1 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/LocalDateTimeConvertor.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/CosIdLocalDateTimeConvertor.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.con
import java.time.LocalDateTime;
/**
- * Local date time convertor.
+ * Local date time convertor for CosId.
*/
-public interface LocalDateTimeConvertor {
+public interface CosIdLocalDateTimeConvertor {
/**
* To local date time.
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeLocalDateTimeConvertor.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeCosIdLocalDateTimeConvertor.java
similarity index 90%
rename from
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeLocalDateTimeConvertor.java
rename to
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeCosIdLocalDateTimeConvertor.java
index 68e970268f3..6e5837cb1d1 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeLocalDateTimeConvertor.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/SnowflakeCosIdLocalDateTimeConvertor.java
@@ -20,16 +20,16 @@ package
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.con
import lombok.RequiredArgsConstructor;
import me.ahoo.cosid.converter.Radix62IdConverter;
import me.ahoo.cosid.snowflake.SnowflakeIdStateParser;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.LocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.CosIdLocalDateTimeConvertor;
import org.apache.shardingsphere.sharding.exception.ShardingPluginException;
import java.time.LocalDateTime;
/**
- * Local date time convertor for Snowflake.
+ * Snowflake local date time convertor for Snowflake.
*/
@RequiredArgsConstructor
-public final class SnowflakeLocalDateTimeConvertor implements
LocalDateTimeConvertor {
+public final class SnowflakeCosIdLocalDateTimeConvertor implements
CosIdLocalDateTimeConvertor {
private final SnowflakeIdStateParser snowflakeIdStateParser;
diff --git
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/CosIDLocalDateTimeConvertor.java
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/StandardCosIdLocalDateTimeConvertor.java
similarity index 94%
rename from
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/CosIDLocalDateTimeConvertor.java
rename to
features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/StandardCosIdLocalDateTimeConvertor.java
index a6154152e29..16b1577f1ed 100644
---
a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/CosIDLocalDateTimeConvertor.java
+++
b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/convertor/impl/StandardCosIdLocalDateTimeConvertor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.con
import lombok.RequiredArgsConstructor;
import me.ahoo.cosid.util.LocalDateTimeConvert;
-import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.LocalDateTimeConvertor;
+import
org.apache.shardingsphere.sharding.cosid.algorithm.sharding.interval.convertor.CosIdLocalDateTimeConvertor;
import org.apache.shardingsphere.sharding.exception.ShardingPluginException;
import java.time.Instant;
@@ -35,10 +35,10 @@ import java.time.format.DateTimeFormatter;
import java.util.Date;
/**
- * Local date time convertor for CosId.
+ * Standard local date time convertor for CosId.
*/
@RequiredArgsConstructor
-public final class CosIDLocalDateTimeConvertor implements
LocalDateTimeConvertor {
+public final class StandardCosIdLocalDateTimeConvertor implements
CosIdLocalDateTimeConvertor {
private final ZoneId zoneId;
