From a8ec6e0514b6a28ede6f2713e9afe50f34d06293 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Thu, 21 Apr 2022 13:52:51 -0700 Subject: [PATCH 1/2] Updated TestNG to 7.5. Removed unnecessary SuppressWarnings. NO CODE CHANGES --- pom.xml | 4 ++-- src/main/java/org/apache/datasketches/fdt/FdtSketch.java | 1 - src/main/java/org/apache/datasketches/kll/KllHelper.java | 2 -- .../apache/datasketches/kll/KllDirectDoublesSketchTest.java | 1 - .../apache/datasketches/kll/KllDirectFloatsSketchTest.java | 1 - .../org/apache/datasketches/kll/KllDoublesSketchTest.java | 3 --- .../org/apache/datasketches/kll/KllDoublesValidationTest.java | 2 +- .../java/org/apache/datasketches/kll/KllFloatsSketchTest.java | 3 --- .../org/apache/datasketches/kll/KllFloatsValidationTest.java | 2 +- .../java/org/apache/datasketches/kll/MiscDoublesTest.java | 1 - src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java | 1 - 11 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 6871667df..706d364e5 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ under the License. - 7.4.0 + 7.5 3.5.0 @@ -103,7 +103,7 @@ under the License. - 2.8.5 + 2.11.1 2.8.1 diff --git a/src/main/java/org/apache/datasketches/fdt/FdtSketch.java b/src/main/java/org/apache/datasketches/fdt/FdtSketch.java index 4b4617e84..79e51a976 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 @@ public FdtSketch(final FdtSketch sketch) { /** * @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 dfbcdf7a5..5655296a6 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 @@ static byte[] fastSingleItemCompactByteArray(final KllSketch mine) { 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 @@ static int ubOnNumLevels(final long n) { * 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 d43751e01..edc701099 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 @@ public void checkReverseMergeKllDoubleSketch() { } @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 a159dc545..40d88dde0 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 @@ public void checkReverseMergeKllFloatsSketch() { } @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 5684084ac..b2e3eda18 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 @@ public void mergeMinAndMaxFromOther() { 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 bcc92cc1e..bd0cfb0df 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 a30e77f8c..09bda87dd 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 @@ public void mergeMinAndMaxFromOther() { 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 278d760c6..cdb0f0ac3 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 e86488aab..656343ccb 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 57cc244a0..0b100e482 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(); From 198e144587b8ca2964b0b542e3d3b13d8baddae3 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Thu, 21 Apr 2022 14:27:48 -0700 Subject: [PATCH 2/2] This is Jar Hell. Turns out upgrading javac-errorprone to 2.11 requires JDK 11. Had to back off to 2.8.5. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 706d364e5..9eeab1dda 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ under the License. - 2.11.1 + 2.8.5 2.8.1