From e525a21d91879bc2026f5932e894c428b146d36c Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Tue, 14 Apr 2020 16:43:40 -0400 Subject: Cleanup some warnings and stuff --- src/main/java/bjc/esodata/Multimap.java | 2 ++ src/main/java/bjc/esodata/Stack.java | 10 +++++----- src/main/java/bjc/esodata/ThresholdSet.java | 10 +++++++--- src/test/java/bjc/TestUtils.java | 1 + src/test/java/bjc/esodata/StackTest.java | 2 ++ src/test/java/bjc/esodata/ThresholdSetTest.java | 1 + 6 files changed, 18 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/java/bjc/esodata/Multimap.java b/src/main/java/bjc/esodata/Multimap.java index f0876db..a79f1b0 100644 --- a/src/main/java/bjc/esodata/Multimap.java +++ b/src/main/java/bjc/esodata/Multimap.java @@ -11,6 +11,8 @@ import java.util.*; * have to remove that pair as many times as you added it. * * @author Ben Culkin + * @param The type of keys in the map. + * @param The type of values in the map. */ public class Multimap { private Map> backing; diff --git a/src/main/java/bjc/esodata/Stack.java b/src/main/java/bjc/esodata/Stack.java index f2e00e3..5ee5ef2 100644 --- a/src/main/java/bjc/esodata/Stack.java +++ b/src/main/java/bjc/esodata/Stack.java @@ -95,7 +95,7 @@ public abstract class Stack { * @param elms * The elements to insert. */ - public void pushAll(T... elms) { + public void pushAll(@SuppressWarnings("unchecked") T... elms) { for (T elm : elms) { push(elm); } @@ -436,7 +436,7 @@ public abstract class Stack { * @param actions * The actions to execute. */ - public void multicleave(final int n, final Consumer>... actions) { + public void multicleave(final int n, @SuppressWarnings("unchecked") final Consumer>... actions) { List elms = multipoprev(n); for (final Consumer> action : actions) { @@ -462,7 +462,7 @@ public abstract class Stack { * @param actions * The actions to execute. */ - public void cleave(final Consumer>... actions) { + public void cleave(@SuppressWarnings("unchecked") final Consumer>... actions) { multicleave(1, actions); } @@ -501,7 +501,7 @@ public abstract class Stack { * @param actions * The actions to execute. */ - public void multispread(final int n, final Consumer>... actions) { + public void multispread(final int n, @SuppressWarnings("unchecked") final Consumer>... actions) { List> nelms = new LinkedList<>(); for (int i = 0; i < actions.length; i++) { @@ -536,7 +536,7 @@ public abstract class Stack { * @param conses * The actions to execute. */ - public void spread(final Consumer>... conses) { + public void spread(@SuppressWarnings("unchecked") final Consumer>... conses) { multispread(1, conses); } diff --git a/src/main/java/bjc/esodata/ThresholdSet.java b/src/main/java/bjc/esodata/ThresholdSet.java index 50d95d0..ae277e1 100644 --- a/src/main/java/bjc/esodata/ThresholdSet.java +++ b/src/main/java/bjc/esodata/ThresholdSet.java @@ -46,6 +46,7 @@ public class ThresholdSet { @Override public boolean remove(Object o) { // Will throw a ClassCastException if you give us something bad. + @SuppressWarnings("unchecked") KeyType k = (KeyType) o; int ret = ThresholdSet.this.remove(k); @@ -60,6 +61,7 @@ public class ThresholdSet { @Override public boolean contains(Object o) { // Will throw a ClassCastException if you give us something bad. + @SuppressWarnings("unchecked") KeyType k = (KeyType) o; int ret = ThresholdSet.this.contains(k); @@ -107,7 +109,7 @@ public class ThresholdSet { * * @return An array containing the results of adding the keys. */ - public int[] addKeys(KeyType... keys) { + public int[] addKeys(@SuppressWarnings("unchecked") KeyType... keys) { int[] ret = new int[keys.length]; for (int i = 0; i < keys.length; i++) { @@ -157,7 +159,7 @@ public class ThresholdSet { * * @return The results from removing the keys. */ - public int[] removeKeys(KeyType... keys) { + public int[] removeKeys(@SuppressWarnings("unchecked") KeyType... keys) { int[] ret = new int[keys.length]; for (int i = 0; i < keys.length; i++) { @@ -212,7 +214,7 @@ public class ThresholdSet { * * @return The containment counts for each key. */ - public int[] containsKeys(KeyType... keys) { + public int[] containsKeys(@SuppressWarnings("unchecked") KeyType... keys) { int[] ret = new int[keys.length]; for (int i = 0; i < keys.length; i++) { @@ -264,9 +266,11 @@ public class ThresholdSet { /** * Static threshold set constructor. + * @param The type of keys for the threshold set. * * @param keys * The initial keys to add to the threshold set. + * @return A threshold set with the given keys. */ @SafeVarargs public static ThresholdSet TS(KType... keys) { diff --git a/src/test/java/bjc/TestUtils.java b/src/test/java/bjc/TestUtils.java index 17d6b7a..29e59e1 100644 --- a/src/test/java/bjc/TestUtils.java +++ b/src/test/java/bjc/TestUtils.java @@ -142,6 +142,7 @@ public class TestUtils { * @param exps * The values that are expected. */ + @SafeVarargs public static void assertStackEquals(bjc.esodata.Stack src, T... exps) { assertArrayEquals(exps, src.toArray()); } diff --git a/src/test/java/bjc/esodata/StackTest.java b/src/test/java/bjc/esodata/StackTest.java index c6e8e21..b4b98cc 100644 --- a/src/test/java/bjc/esodata/StackTest.java +++ b/src/test/java/bjc/esodata/StackTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.*; * * @author Ben Culkin */ +@SuppressWarnings("javadoc") public class StackTest { @Test public void testBasic() { @@ -165,6 +166,7 @@ public class StackTest { assertStackEquals(st, "a", "a", "c", "b", "a"); } + @SuppressWarnings("unchecked") @Test public void testDataComb() { Stack stk = new SimpleStack<>(); diff --git a/src/test/java/bjc/esodata/ThresholdSetTest.java b/src/test/java/bjc/esodata/ThresholdSetTest.java index 8f1b995..c9403da 100644 --- a/src/test/java/bjc/esodata/ThresholdSetTest.java +++ b/src/test/java/bjc/esodata/ThresholdSetTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.*; * * @author Ben Culkin. */ +@SuppressWarnings("javadoc") public class ThresholdSetTest { @Test public void testAdd() { -- cgit v1.2.3