Use Range.of to instead of Range.between

Author: terrymanu

kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIterator.java

@@ -46,7 +46,7 @@ public IntervalToRangeIterator(final long minimum, final long maximum, final lon
         }
         this.maximum = BigInteger.valueOf(maximum);
         this.interval = BigInteger.valueOf(interval);
-        this.current = BigInteger.valueOf(minimum);
+        current = BigInteger.valueOf(minimum);
     }
 
     @Override
@@ -60,12 +60,12 @@ public Range<Long> next() {
             throw new NoSuchElementException("");
         }
         BigInteger upperLimit = min(maximum, current.add(interval));
-        Range<Long> result = Range.between(current.longValue(), upperLimit.longValue());
+        Range<Long> result = Range.of(current.longValue(), upperLimit.longValue());
         current = upperLimit.add(BigInteger.ONE);
         return result;
     }
 
-    private BigInteger min(final BigInteger one, final BigInteger another) {
-        return one.compareTo(another) < 0 ? one : another;
+    private BigInteger min(final BigInteger integer1, final BigInteger integer2) {
+        return integer1.compareTo(integer2) < 0 ? integer1 : integer2;
     }
 }

kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/calculator/InventoryPositionCalculatorTest.java

@@ -32,7 +32,7 @@ class InventoryPositionCalculatorTest {
 
     @Test
     void assertGetPositionByIntegerUniqueKeyRange() {
-        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(200L, Range.between(1L, 600L), 100L);
+        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(200L, Range.of(1L, 600L), 100L);
         assertThat(actualPositions.size(), is(2));
         for (IngestPosition each : actualPositions) {
             assertThat(each, isA(IntegerPrimaryKeyIngestPosition.class));
@@ -48,15 +48,15 @@ private void assertPosition(final IntegerPrimaryKeyIngestPosition expected, fina
 
     @Test
     void assertGetPositionByIntegerUniqueKeyRangeWithZeroTotalRecordsCount() {
-        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(0L, Range.between(0L, 0L), 1L);
+        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(0L, Range.of(0L, 0L), 1L);
         assertThat(actualPositions.size(), is(1));
         assertThat(actualPositions.get(0), isA(IntegerPrimaryKeyIngestPosition.class));
         assertPosition(new IntegerPrimaryKeyIngestPosition(0L, 0L), (IntegerPrimaryKeyIngestPosition) actualPositions.get(0));
     }
 
     @Test
     void assertGetPositionByIntegerUniqueKeyRangeWithTheSameMinMax() {
-        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(200L, Range.between(5L, 5L), 100L);
+        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(200L, Range.of(5L, 5L), 100L);
         assertThat(actualPositions.size(), is(1));
         assertThat(actualPositions.get(0), isA(IntegerPrimaryKeyIngestPosition.class));
         assertPosition(new IntegerPrimaryKeyIngestPosition(5L, 5L), (IntegerPrimaryKeyIngestPosition) actualPositions.get(0));
@@ -68,8 +68,7 @@ void assertGetPositionByIntegerUniqueKeyRangeOverflow() {
         long shardingSize = tableRecordsCount / 2L;
         long minimum = Long.MIN_VALUE + 1L;
         long maximum = Long.MAX_VALUE;
-        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(
-                tableRecordsCount, Range.between(minimum, maximum), shardingSize);
+        List<IngestPosition> actualPositions = (List<IngestPosition>) InventoryPositionCalculator.getPositionByIntegerUniqueKeyRange(tableRecordsCount, Range.of(minimum, maximum), shardingSize);
         assertThat(actualPositions.size(), is(2));
         for (IngestPosition each : actualPositions) {
             assertThat(each, isA(IntegerPrimaryKeyIngestPosition.class));