Was able to remove 2 exclusions from FindBugsExcludeFilter.xml

Author: leerho

src/main/java/org/apache/datasketches/kll/KllItemsSketch.java

@@ -242,8 +242,8 @@ public double[] getRanks(final T[] quantiles, final QuantileSearchCriteria searc
   @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 @@ MemoryRequestServer getMemoryRequestServer() {
   @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();

src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java

@@ -581,7 +581,8 @@ public void putMemory(final WritableMemory dstMem, final ArrayOfItemsSerDe<T> se
 
   @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 void update(final T item) {
 
   // 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;
   }
 
   /**

…pache/datasketches/req/ReqDebugImpl.java …e/datasketches/req/ReqDebugImplTest.javasrc/test/java/org/apache/datasketches/req/ReqDebugImpl.java renamed to src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java src/test/java/org/apache/datasketches/req/ReqDebugImpl.java renamed to src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java

@@ -33,7 +33,7 @@
  *
  * @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;
   }

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);

src/test/java/org/apache/datasketches/req/ReqSketchTest.java

@@ -80,7 +80,7 @@ public void bigTestImpl(final int k, final int min, final int max, final boolean
   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();

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"/>