This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch fix_spot_bugs_issues2
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/fix_spot_bugs_issues2 by this
push:
new 8484dade Was able to remove 2 exclusions from FindBugsExcludeFilter.xml
8484dade is described below
commit 8484dade6ce77779c61e31cd43e62de18714c815
Author: Lee Rhodes <[email protected]>
AuthorDate: Thu Aug 31 12:36:05 2023 -0700
Was able to remove 2 exclusions from FindBugsExcludeFilter.xml
---
src/main/java/org/apache/datasketches/kll/KllItemsSketch.java | 11 +++++++----
.../java/org/apache/datasketches/quantiles/ItemsSketch.java | 10 +++++++---
.../req/{ReqDebugImpl.java => ReqDebugImplTest.java} | 4 ++--
.../org/apache/datasketches/req/ReqSketchBuilderTest.java | 2 +-
src/test/java/org/apache/datasketches/req/ReqSketchTest.java | 2 +-
tools/FindBugsExcludeFilter.xml | 11 -----------
6 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
b/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
index 4c0bb388..97bbc519 100644
--- a/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllItemsSketch.java
@@ -242,8 +242,8 @@ public abstract class KllItemsSketch<T> extends KllSketch
implements QuantilesGe
@Override
public final KllItemsSketchSortedView<T> getSortedView() {
if (isEmpty()) { throw new SketchesArgumentException(EMPTY_MSG); }
- refreshSortedView();
- return kllItemsSV; //SpotBugs EI_EXPOSE_REP, Suppressed by
FindBugsExcludeFilter
+ return refreshSortedView();
+ //return kllItemsSV; //SpotBugs EI_EXPOSE_REP, Suppressed by
FindBugsExcludeFilter
}
@Override
@@ -301,8 +301,11 @@ public abstract class KllItemsSketch<T> extends KllSketch
implements QuantilesGe
@Override
abstract int getMinMaxSizeBytes();
- private final void refreshSortedView() {
- kllItemsSV = (kllItemsSV == null) ? new KllItemsSketchSortedView<T>(this)
: kllItemsSV;
+ private final KllItemsSketchSortedView<T> refreshSortedView() {
+ final KllItemsSketchSortedView<T> sv = (kllItemsSV == null)
+ ? kllItemsSV = new KllItemsSketchSortedView<T>(this)
+ : kllItemsSV;
+ return sv;
}
abstract T[] getRetainedItemsArray();
diff --git a/src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java
b/src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java
index aa9aea72..caa73c6e 100644
--- a/src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java
+++ b/src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java
@@ -581,7 +581,8 @@ public final class ItemsSketch<T> implements
QuantilesGenericAPI<T> {
@Override
public GenericSortedView<T> getSortedView() {
- return new ItemsSketchSortedView<T>(this);
+ if (isEmpty()) { throw new SketchesArgumentException(EMPTY_MSG); }
+ return refreshSortedView();
}
@Override
@@ -605,8 +606,11 @@ public final class ItemsSketch<T> implements
QuantilesGenericAPI<T> {
// Restricted
- private final void refreshSortedView() {
- classicQisSV = (classicQisSV == null) ? new ItemsSketchSortedView<T>(this)
: classicQisSV;
+ private final ItemsSketchSortedView<T> refreshSortedView() {
+ final ItemsSketchSortedView<T> sv = (classicQisSV == null)
+ ? classicQisSV = new ItemsSketchSortedView<T>(this)
+ : classicQisSV;
+ return sv;
}
/**
diff --git a/src/test/java/org/apache/datasketches/req/ReqDebugImpl.java
b/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/req/ReqDebugImpl.java
rename to src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
index 1c9a28b0..5e757ce0 100644
--- a/src/test/java/org/apache/datasketches/req/ReqDebugImpl.java
+++ b/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
@@ -33,7 +33,7 @@ import java.util.List;
*
* @author Lee Rhodes
*/
-public class ReqDebugImpl implements ReqDebug {
+public class ReqDebugImplTest implements ReqDebug {
private static final String LS = System.getProperty("line.separator");
private static final String TAB = "\t";
private ReqSketch sk;
@@ -45,7 +45,7 @@ public class ReqDebugImpl implements ReqDebug {
* @param debugLevel sets the debug level of detail
* @param fmt string format to use when printing values
*/
- public ReqDebugImpl(final int debugLevel, final String fmt) {
+ public ReqDebugImplTest(final int debugLevel, final String fmt) {
this.debugLevel = debugLevel;
this.fmt = fmt;
}
diff --git
a/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
b/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
index ca0893cb..8e33b03e 100644
--- a/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
@@ -32,7 +32,7 @@ public class ReqSketchBuilderTest {
@Test
public void checkBldr() {
final ReqSketchBuilder bldr = new ReqSketchBuilder();
- final ReqDebugImpl rdi = new ReqDebugImpl(2, "%4.0f");
+ final ReqDebugImplTest rdi = new ReqDebugImplTest(2, "%4.0f");
bldr.setK(50).setHighRankAccuracy(true).setReqDebug(rdi);
assertEquals(bldr.getK(), 50);
assertEquals(bldr.getHighRankAccuracy(), true);
diff --git a/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
b/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
index e76bf207..4db9112a 100644
--- a/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
@@ -80,7 +80,7 @@ public class ReqSketchTest {
public ReqSketch loadSketch(final int k, final int min, final int max, final
boolean up,
final boolean hra, final int skDebug) {
final ReqSketchBuilder bldr = ReqSketch.builder();
- bldr.setReqDebug(new ReqDebugImpl(skDebug, "%5.0f"));
+ bldr.setReqDebug(new ReqDebugImplTest(skDebug, "%5.0f"));
bldr.setK(k);
bldr.setHighRankAccuracy(hra);
final ReqSketch sk = bldr.build();
diff --git a/tools/FindBugsExcludeFilter.xml b/tools/FindBugsExcludeFilter.xml
index 2a318b8f..6ce8f010 100644
--- a/tools/FindBugsExcludeFilter.xml
+++ b/tools/FindBugsExcludeFilter.xml
@@ -44,17 +44,6 @@ under the License.
<Bug pattern="DLS_DEAD_LOCAL_STORE" />
</Match>
- <!-- Used in test only. -->
- <Match>
- <Bug pattern="EI_EXPOSE_REP2"/>
- <Class name="org.apache.datasketches.req.ReqDebugImpl"/>
- </Match>
-
- <Match>
- <Bug pattern="EI_EXPOSE_REP"/>
- <Class name="org.apache.datasketches.kll.KllItemsSketch"/>
- </Match>
-
<Match>
<Bug pattern="EI_EXPOSE_REP2"/>
<Class
name="org.apache.datasketches.quantilescommon.GenericSortedViewIterator"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
