diff options
5 files changed, 35 insertions, 20 deletions
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java index 8e2a98d..ecb5c4b 100644 --- a/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java +++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Scanner; /** - * Test for {@link SequenceDelimiter} as well as {@link SimpleTokenSplitter} + * Test for {@link SequenceDelimiter} as well as {@link ConfigurableTokenSplitter} * * @author EVE * diff --git a/BJC-Utils2/src/main/java/bjc/utils/functypes/ID.java b/BJC-Utils2/src/main/java/bjc/utils/functypes/ID.java index af72d1a..edaaee5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/functypes/ID.java +++ b/BJC-Utils2/src/main/java/bjc/utils/functypes/ID.java @@ -2,7 +2,17 @@ package bjc.utils.functypes; import java.util.function.UnaryOperator;
+/**
+ * Identity function.
+ * @author bjculkin
+ *
+ */
public class ID {
+ /**
+ * Create an identity function.
+ *
+ * @return A identity function.
+ */
public static <A> UnaryOperator<A> id() {
return (x) -> x;
}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/LambdaLock.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/LambdaLock.java index 2183594..23745d8 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/LambdaLock.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/LambdaLock.java @@ -76,7 +76,6 @@ public class LambdaLock { * @param action * The action to call. * - * @return The result of the action. */ public void read(Runnable action) { readLock.lock(); diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java index 531e8b8..f00f245 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java @@ -38,19 +38,19 @@ public class SimpleProperties implements Map<String, String> { * Whether or not duplicate keys should be allowed. */ public void loadFrom(InputStream is, boolean allowDuplicates) { - try(Scanner scn = new Scanner(is)) { - while(scn.hasNextLine()) { + try (Scanner scn = new Scanner(is)) { + while (scn.hasNextLine()) { String ln = scn.nextLine().trim(); /* * Skip blank lines/comments */ - if(ln.equals("")) continue; - if(ln.startsWith("#")) continue; + if (ln.equals("")) continue; + if (ln.startsWith("#")) continue; int sepIdx = ln.indexOf(' '); - if(sepIdx == -1) { + if (sepIdx == -1) { String fmt = "Properties must be a name, a space, then the body.\n\tOffending line is '%s'"; String msg = String.format(fmt, ln); @@ -60,7 +60,7 @@ public class SimpleProperties implements Map<String, String> { String name = ln.substring(0, sepIdx).trim(); String body = ln.substring(sepIdx).trim(); - if(!allowDuplicates && containsKey(name)) { + if (!allowDuplicates && containsKey(name)) { String msg = String.format("Duplicate key '%s'", name); throw new IllegalStateException(msg); @@ -77,7 +77,7 @@ public class SimpleProperties implements Map<String, String> { public void outputProperties() { System.out.println("Read properties:"); - for(Entry<String, String> entry : entrySet()) { + for (Entry<String, String> entry : entrySet()) { System.out.printf("\t'%s'\t'%s'\n", entry.getKey(), entry.getValue()); } @@ -94,16 +94,19 @@ public class SimpleProperties implements Map<String, String> { return props.isEmpty(); } + @SuppressWarnings("unlikely-arg-type") @Override public boolean containsKey(Object key) { return props.containsKey(key); } + @SuppressWarnings("unlikely-arg-type") @Override public boolean containsValue(Object value) { return props.containsValue(value); } + @SuppressWarnings("unlikely-arg-type") @Override public String get(Object key) { return props.get(key); @@ -114,6 +117,7 @@ public class SimpleProperties implements Map<String, String> { return props.put(key, value); } + @SuppressWarnings("unlikely-arg-type") @Override public String remove(Object key) { return props.remove(key); @@ -153,4 +157,4 @@ public class SimpleProperties implements Map<String, String> { public int hashCode() { return props.hashCode(); } -} +}
\ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitterv2/ExcludingTokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitterv2/ExcludingTokenSplitter.java index a0f7189..25bddf5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitterv2/ExcludingTokenSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/splitterv2/ExcludingTokenSplitter.java @@ -35,10 +35,10 @@ public class ExcludingTokenSplitter implements TokenSplitter { } /** - * Exclude a literal string from splitting. + * Exclude literal strings from splitting. * - * @param exclusion - * The string to exclude from splitting. + * @param exclusions + * The strings to exclude from splitting. */ public final void addLiteralExclusions(String... exclusions) { for (String exclusion : exclusions) { @@ -47,10 +47,11 @@ public class ExcludingTokenSplitter implements TokenSplitter { } /** - * Exclude all of the strings matching a predicate from splitting. + * Exclude all of the strings matching any of the predicates from + * splitting. * - * @param exclusion - * The predicate to use for exclusions. + * @param exclusions + * The predicates to use for exclusions. */ @SafeVarargs public final void addPredicateExclusion(Predicate<String>... exclusions) { @@ -61,11 +62,12 @@ public class ExcludingTokenSplitter implements TokenSplitter { @Override public IList<String> split(String input) { - if (literalExclusions.contains(input)) + if (literalExclusions.contains(input)) { return new FunctionalList<>(input); - else if (predExclusions.anyMatch(pred -> pred.test(input))) + } else if (predExclusions.anyMatch(pred -> pred.test(input))) { return new FunctionalList<>(input); - - return spliter.split(input); + } else { + return spliter.split(input); + } } } |