Repository: commons-collections Updated Branches: refs/heads/master 56706c820 -> 274c9c1d3
Use final. Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/274c9c1d Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/274c9c1d Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/274c9c1d Branch: refs/heads/master Commit: 274c9c1d37a47ae9bc1cdec1b0b0e4189dd44845 Parents: 56706c8 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Tue Jun 12 15:33:17 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Tue Jun 12 15:33:17 2018 -0600 ---------------------------------------------------------------------- .../commons/collections4/IteratorUtilsTest.java | 2 +- .../commons/collections4/MultiSetUtilsTest.java | 26 ++++++++++---------- .../commons/collections4/map/Flat3MapTest.java | 24 +++++++++--------- .../collections4/map/ReferenceMapTest.java | 7 +++--- 4 files changed, 30 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/274c9c1d/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java index 989092a..110004b 100644 --- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java @@ -761,7 +761,7 @@ public class IteratorUtilsTest { @Test public void testFirstFromIterator() throws Exception { // Iterator, entry exists - Iterator<Integer> iterator = iterableA.iterator(); + final Iterator<Integer> iterator = iterableA.iterator(); assertEquals(1, (int) IteratorUtils.first(iterator)); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/274c9c1d/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java b/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java index fb66cde..24c1759 100644 --- a/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java @@ -47,12 +47,12 @@ public class MultiSetUtilsTest { */ @Test public void testEmptyMultiSet() { - MultiSet<Integer> empty = MultiSetUtils.emptyMultiSet(); + final MultiSet<Integer> empty = MultiSetUtils.emptyMultiSet(); assertEquals(0, empty.size()); try { empty.add(55); fail("Empty multi set must be read-only"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { } } @@ -61,19 +61,19 @@ public class MultiSetUtilsTest { */ @Test public void testUnmodifiableMultiSet() { - MultiSet<String> unmodifiable = MultiSetUtils.unmodifiableMultiSet(multiSet); + final MultiSet<String> unmodifiable = MultiSetUtils.unmodifiableMultiSet(multiSet); assertEquals(multiSet, unmodifiable); try { unmodifiable.add("a"); fail("Empty multi set must be read-only"); - } catch (UnsupportedOperationException e) { + } catch (final UnsupportedOperationException e) { } try { MultiSetUtils.unmodifiableMultiSet(null); fail("Expecting NPE"); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { } } @@ -82,7 +82,7 @@ public class MultiSetUtilsTest { */ @Test public void testSynchronizedMultiSet() { - MultiSet<String> synced = MultiSetUtils.synchronizedMultiSet(multiSet); + final MultiSet<String> synced = MultiSetUtils.synchronizedMultiSet(multiSet); assertEquals(multiSet, synced); synced.add("a"); // ensure adding works } @@ -92,38 +92,38 @@ public class MultiSetUtilsTest { */ @Test public void testPredicatedMultiSet() { - Predicate<String> predicate = new Predicate<String>() { + final Predicate<String> predicate = new Predicate<String>() { @Override - public boolean evaluate(String object) { + public boolean evaluate(final String object) { return object.length() == 1; }; }; - MultiSet<String> predicated = MultiSetUtils.predicatedMultiSet(multiSet, predicate); + final MultiSet<String> predicated = MultiSetUtils.predicatedMultiSet(multiSet, predicate); assertEquals(multiSet.size(), predicated.size()); assertEquals(multiSet.getCount("a"), predicated.getCount("a")); try { MultiSetUtils.predicatedMultiSet(null, predicate); fail("Expecting NPE"); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { } try { MultiSetUtils.predicatedMultiSet(multiSet, null); fail("Expecting NPE"); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { } try { MultiSetUtils.predicatedMultiSet(multiSet, new Predicate<String>() { @Override - public boolean evaluate(String object) { + public boolean evaluate(final String object) { return object.equals("a"); }; }); fail("Predicate is violated for all elements not being 'a'"); } - catch (IllegalArgumentException iae) { + catch (final IllegalArgumentException iae) { } } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/274c9c1d/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java index 369766b..c234349 100644 --- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java @@ -698,7 +698,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, TWO); m.put(null, THREE); - boolean contains = m.containsKey(null); + final boolean contains = m.containsKey(null); assertEquals(true, contains); } @@ -707,7 +707,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(null, TWO); - boolean contains = m.containsKey(null); + final boolean contains = m.containsKey(null); assertEquals(true, contains); } @@ -715,7 +715,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { final Flat3Map<Integer, Integer> m = new Flat3Map<>(); m.put(null, ONE); - boolean contains = m.containsKey(null); + final boolean contains = m.containsKey(null); assertEquals(true, contains); } @@ -725,7 +725,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, TWO); m.put(THREE, null); - boolean contains = m.containsValue(null); + final boolean contains = m.containsValue(null); assertEquals(true, contains); } @@ -734,7 +734,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, null); - boolean contains = m.containsValue(null); + final boolean contains = m.containsValue(null); assertEquals(true, contains); } @@ -742,7 +742,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { final Flat3Map<Integer, Integer> m = new Flat3Map<>(); m.put(ONE, null); - boolean contains = m.containsValue(null); + final boolean contains = m.containsValue(null); assertEquals(true, contains); } @@ -752,7 +752,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, TWO); m.put(null, THREE); - Object old = m.put(null, ONE); + final Object old = m.put(null, ONE); assertEquals(THREE, old); assertEquals(ONE, m.get(null)); } @@ -762,7 +762,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(null, THREE); - Object old = m.put(null, ONE); + final Object old = m.put(null, ONE); assertEquals(THREE, old); assertEquals(ONE, m.get(null)); } @@ -771,7 +771,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { final Flat3Map<Integer, Integer> m = new Flat3Map<>(); m.put(null, THREE); - Object old = m.put(null, ONE); + final Object old = m.put(null, ONE); assertEquals(THREE, old); assertEquals(null, m.get(ONE)); } @@ -782,7 +782,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, TWO); m.put(THREE, THREE); - Object old = m.put(THREE, ONE); + final Object old = m.put(THREE, ONE); assertEquals(THREE, old); assertEquals(ONE, m.get(THREE)); } @@ -792,7 +792,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { m.put(ONE, ONE); m.put(TWO, THREE); - Object old = m.put(TWO, ONE); + final Object old = m.put(TWO, ONE); assertEquals(THREE, old); assertEquals(ONE, m.get(TWO)); } @@ -801,7 +801,7 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> { final Flat3Map<Integer, Integer> m = new Flat3Map<>(); m.put(ONE, THREE); - Object old = m.put(ONE, ONE); + final Object old = m.put(ONE, ONE); assertEquals(THREE, old); assertEquals(ONE, m.get(ONE)); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/274c9c1d/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java index 92118d7..72b108a 100644 --- a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java @@ -262,17 +262,18 @@ public class ReferenceMapTest<K, V> extends AbstractIterableMapTest<K, V> { */ public void testDataSizeAfterSerialization() throws IOException, ClassNotFoundException { - ReferenceMap<String,String> serialiseMap = new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK, true); + final ReferenceMap<String,String> serialiseMap = new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK, true); serialiseMap.put("KEY", "VALUE"); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); try (ObjectOutputStream out = new ObjectOutputStream(baos)) { out.writeObject(serialiseMap); } - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); try (ObjectInputStream in = new ObjectInputStream(bais)) { @SuppressWarnings("unchecked") + final ReferenceMap<String,String> deserialisedMap = (ReferenceMap<String,String>) in.readObject(); assertEquals(1, deserialisedMap.size()); assertEquals(serialiseMap.data.length, deserialisedMap.data.length);
