This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 3c23b26 Add Generics for Position (#8370)
3c23b26 is described below
commit 3c23b269041155480f80f2c742969a48117e82ba
Author: 邱鹿 Lucas <[email protected]>
AuthorDate: Fri Nov 27 12:52:14 2020 +0800
Add Generics for Position (#8370)
Co-authored-by: qiulu3 <Lucas209910>
---
.../scaling/core/execute/executor/dumper/DumperFactory.java | 4 ++--
.../scaling/core/execute/executor/record/DataRecord.java | 2 +-
.../scaling/core/execute/executor/record/FinishedRecord.java | 2 +-
.../scaling/core/execute/executor/record/PlaceholderRecord.java | 2 +-
.../shardingsphere/scaling/core/execute/executor/record/Record.java | 2 +-
.../core/job/task/incremental/IncrementalDataSyncTaskProgress.java | 2 +-
.../shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
index db85b93..eae09af 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
@@ -65,7 +65,7 @@ public final class DumperFactory {
* @param position position
* @return log dumper
*/
- public static LogDumper newInstanceLogDumper(final DumperConfiguration
dumperConfig, final Position position) {
+ public static LogDumper newInstanceLogDumper(final DumperConfiguration
dumperConfig, final Position<?> position) {
return
newInstanceLogDumper(dumperConfig.getDataSourceConfig().getDatabaseType().getName(),
dumperConfig, position);
}
@@ -78,7 +78,7 @@ public final class DumperFactory {
* @return log dumper
*/
@SneakyThrows(ReflectiveOperationException.class)
- public static LogDumper newInstanceLogDumper(final String databaseType,
final DumperConfiguration dumperConfig, final Position position) {
+ public static LogDumper newInstanceLogDumper(final String databaseType,
final DumperConfiguration dumperConfig, final Position<?> position) {
ScalingEntry scalingEntry =
ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
return
scalingEntry.getLogDumperClass().getConstructor(DumperConfiguration.class,
Position.class).newInstance(dumperConfig, position);
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/DataRecord.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/DataRecord.java
index c92ffcc..78749aa 100755
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/DataRecord.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/DataRecord.java
@@ -48,7 +48,7 @@ public final class DataRecord extends Record {
private String tableName;
- public DataRecord(final Position position, final int columnCount) {
+ public DataRecord(final Position<?> position, final int columnCount) {
super(position);
columns = new ArrayList<>(columnCount);
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/FinishedRecord.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/FinishedRecord.java
index 9d92680..e902e3e 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/FinishedRecord.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/FinishedRecord.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.scaling.core.job.position.Position;
*/
public final class FinishedRecord extends Record {
- public FinishedRecord(final Position position) {
+ public FinishedRecord(final Position<?> position) {
super(position);
}
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/PlaceholderRecord.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/PlaceholderRecord.java
index 86d4e26..f6221ff 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/PlaceholderRecord.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/PlaceholderRecord.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.scaling.core.job.position.Position;
*/
public final class PlaceholderRecord extends Record {
- public PlaceholderRecord(final Position position) {
+ public PlaceholderRecord(final Position<?> position) {
super(position);
}
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/Record.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/Record.java
index 1bd6723..9286bfe 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/Record.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/record/Record.java
@@ -30,7 +30,7 @@ import lombok.Setter;
@Setter
public abstract class Record {
- private final Position position;
+ private final Position<?> position;
private long commitTime;
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataSyncTaskProgress.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataSyncTaskProgress.java
index 7ba67b1..a878d0a 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataSyncTaskProgress.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataSyncTaskProgress.java
@@ -34,5 +34,5 @@ public final class IncrementalDataSyncTaskProgress implements
SyncProgress {
private final long delayMillisecond;
- private final Position position;
+ private final Position<?> position;
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
index 09abf10..38f122b 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.scaling.core.job.position.Position;
public final class FixtureH2LogDumper implements LogDumper {
- public FixtureH2LogDumper(final DumperConfiguration dumperConfig, final
Position position) {
+ public FixtureH2LogDumper(final DumperConfiguration dumperConfig, final
Position<?> position) {
}
@Override
