Merge pull request #395 from apache/Final_cleanup_prior_to_release
Updated TestNG to 7.5. Removed unnecessary SuppressWarnings. NO CODE
diff --git a/pom.xml b/pom.xml
index 6871667..9eeab1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>7.4.0</testng.version>
+ <testng.version>7.5</testng.version>
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
diff --git a/src/main/java/org/apache/datasketches/fdt/FdtSketch.java b/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
index 4b4617e..79e51a9 100644
--- a/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
+++ b/src/main/java/org/apache/datasketches/fdt/FdtSketch.java
@@ -93,7 +93,6 @@
/**
* @return a deep copy of this sketch
*/
- @SuppressWarnings("unchecked")
@Override
public FdtSketch copy() {
return new FdtSketch(this);
diff --git a/src/main/java/org/apache/datasketches/kll/KllHelper.java b/src/main/java/org/apache/datasketches/kll/KllHelper.java
index dfbcdf7..5655296 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHelper.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHelper.java
@@ -622,7 +622,6 @@
return byteArr;
}
- @SuppressWarnings("null")
static String toStringImpl(final KllSketch mine, final boolean withLevels, final boolean withData) {
final boolean doubleType = (mine.sketchType == DOUBLES_SKETCH);
final int k = mine.getK();
@@ -760,7 +759,6 @@
* at the bottom. Only numLevels, the levels array and the items array are affected.
* @param mine the current sketch
*/
- @SuppressWarnings("null")
private static void addEmptyTopLevelToCompletelyFullSketch(final KllSketch mine) {
final int[] myCurLevelsArr = mine.getLevelsArray();
final int myCurNumLevels = mine.getNumLevels();
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
index d43751e..edc7010 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
@@ -614,7 +614,6 @@
}
@Test
- @SuppressWarnings("unused")
public void checkWritableWrapOfCompactForm() {
KllDoublesSketch sk = KllDoublesSketch.newHeapInstance(20);
for (int i = 1; i <= 21; i++ ) { sk.update(i); }
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
index a159dc5..40d88dd 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
@@ -614,7 +614,6 @@
}
@Test
- @SuppressWarnings("unused")
public void checkWritableWrapOfCompactForm() {
KllFloatsSketch sk = KllFloatsSketch.newHeapInstance(20);
for (int i = 1; i <= 21; i++ ) { sk.update(i); }
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
index 5684084..b2e3eda 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
@@ -32,7 +32,6 @@
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
-@SuppressWarnings("javadoc")
public class KllDoublesSketchTest {
private static final double PMF_EPS_FOR_K_8 = 0.35; // PMF rank error (epsilon) for k=8
private static final double PMF_EPS_FOR_K_128 = 0.025; // PMF rank error (epsilon) for k=128
@@ -277,13 +276,11 @@
assertEquals(sketch2.getMaxValue(), 1_000_000);
}
- @SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void kTooSmall() {
KllDoublesSketch.newHeapInstance(KllSketch.DEFAULT_M - 1);
}
- @SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void kTooLarge() {
KllDoublesSketch.newHeapInstance(KllSketch.MAX_K + 1);
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesValidationTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesValidationTest.java
index bcc92cc..bd0cfb0 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesValidationTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesValidationTest.java
@@ -37,7 +37,7 @@
//These results are for the version that delays the roll up until the next value comes in.
//The @Test annotations have to be enabled to use this class and a section in KllDoublesHelper also
//needs to be enabled.
-@SuppressWarnings({ "javadoc", "unused" })
+@SuppressWarnings("unused")
public class KllDoublesValidationTest {
//Used only with manual running of checkTestResults(..)
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
index a30e77f..09bda87 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
@@ -33,7 +33,6 @@
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
-@SuppressWarnings("javadoc")
public class KllFloatsSketchTest {
private static final double PMF_EPS_FOR_K_8 = 0.35; // PMF rank error (epsilon) for k=8
private static final double PMF_EPS_FOR_K_128 = 0.025; // PMF rank error (epsilon) for k=128
@@ -278,13 +277,11 @@
assertEquals(sketch2.getMaxValue(), 1_000_000F);
}
- @SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void kTooSmall() {
KllFloatsSketch.newHeapInstance(KllSketch.DEFAULT_M - 1);
}
- @SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void kTooLarge() {
KllFloatsSketch.newHeapInstance(KllSketch.MAX_K + 1);
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsValidationTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsValidationTest.java
index 278d760..cdb0f0a 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsValidationTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsValidationTest.java
@@ -37,7 +37,7 @@
// These results are for the version that delays the roll up until the next value comes in.
// The @Test annotations have to be enabled to use this class and a section in KllFloatsHelper also
// needs to be enabled.
-@SuppressWarnings({ "javadoc", "unused" })
+@SuppressWarnings("unused")
public class KllFloatsValidationTest {
//Used only with manual running of checkTestResults(..)
diff --git a/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java b/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java
index e86488a..656343c 100644
--- a/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java
+++ b/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java
@@ -35,7 +35,6 @@
/**
* @author Lee Rhodes
*/
-@SuppressWarnings("javadoc")
public class MiscDoublesTest {
static final String LS = System.getProperty("line.separator");
private final MemoryRequestServer memReqSvr = new DefaultMemoryRequestServer();
diff --git a/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java b/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java
index 57cc244..0b100e4 100644
--- a/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java
@@ -35,7 +35,6 @@
/**
* @author Lee Rhodes
*/
-@SuppressWarnings("javadoc")
public class MiscFloatsTest {
static final String LS = System.getProperty("line.separator");
private final MemoryRequestServer memReqSvr = new DefaultMemoryRequestServer();
