[shardingsphere] branch master updated: Fix sonar issues in pipeline (#26161)

[azexin]

This is an automated email from the ASF dual-hosted git repository.

azexin 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 0fb97dc386c Fix sonar issues in pipeline (#26161)
0fb97dc386c is described below

commit 0fb97dc386cbd6e93546a83dd923857405fd9e7a
Author: Hongsheng Zhong <zhonghongsh...@apache.org>
AuthorDate: Thu Jun 8 15:13:56 2023 +0800

    Fix sonar issues in pipeline (#26161)
    
    * Throw NoSuchElementException in IntervalToRangeIterator.next
    
    * Add private constructor for InventoryRecordsCountCalculator
---
 .../core/prepare/InventoryRecordsCountCalculator.java        |  3 +++
 .../data/pipeline/core/util/IntervalToRangeIterator.java     |  4 ++++
 .../data/pipeline/core/util/IntervalToRangeIteratorTest.java | 12 +++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryRecordsCountCalculator.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryRecordsCountCalculator.java
index facdda8e9af..f1e3496d203 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryRecordsCountCalculator.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryRecordsCountCalculator.java
@@ -17,6 +17,8 @@
 
 package org.apache.shardingsphere.data.pipeline.core.prepare;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import 
org.apache.shardingsphere.data.pipeline.api.config.ingest.InventoryDumperConfiguration;
 import 
org.apache.shardingsphere.data.pipeline.api.datasource.PipelineDataSourceWrapper;
@@ -38,6 +40,7 @@ import java.util.Optional;
 /**
  * Inventory records count calculator.
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Slf4j
 public final class InventoryRecordsCountCalculator {
     
diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIterator.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIterator.java
index 81ce2ff6878..2ac010aaaa7 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIterator.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIterator.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.data.pipeline.core.util;
 import org.apache.commons.lang3.Range;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 /**
  * Interval to range iterator.
@@ -54,6 +55,9 @@ public final class IntervalToRangeIterator implements 
Iterator<Range<Long>> {
     
     @Override
     public Range<Long> next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
         long upperLimit = Math.min(maximum, current + interval);
         Range<Long> result = Range.between(current, upperLimit);
         current = upperLimit + 1;
diff --git 
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIteratorTest.java
 
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIteratorTest.java
index bfd036aaa8e..ab8fe008bde 100644
--- 
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIteratorTest.java
+++ 
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/IntervalToRangeIteratorTest.java
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -39,9 +40,18 @@ class IntervalToRangeIteratorTest {
         assertThrows(IllegalArgumentException.class, () -> new 
IntervalToRangeIterator(100L, 200L, -10L));
     }
     
+    @Test
+    void assertInvalidNext() {
+        IntervalToRangeIterator iterator = new IntervalToRangeIterator(200L, 
200L, 0L);
+        if (iterator.hasNext()) {
+            iterator.next();
+        }
+        assertThrows(NoSuchElementException.class, iterator::next);
+    }
+    
     @Test
     void assertSmallRangeCorrect() {
-        IntervalToRangeIterator iterator = new IntervalToRangeIterator(200L, 
200L, 100L);
+        IntervalToRangeIterator iterator = new IntervalToRangeIterator(200L, 
200L, 0L);
         List<Range<Long>> actual = new LinkedList<>();
         while (iterator.hasNext()) {
             actual.add(iterator.next());