Repository: commons-text Updated Branches: refs/heads/master 6313d401d -> 50c38d6c0
- remove unnecessary (un)boxing (closes #75) - replace `for: add` with bulk add `Collections.addAll` - replace iterator with `for each` where possible Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/50c38d6c Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/50c38d6c Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/50c38d6c Branch: refs/heads/master Commit: 50c38d6c0eedc8f8a6530a7f19b3ca940bd25927 Parents: 6313d40 Author: abrasha <aabra...@gmail.com> Authored: Sat Nov 4 13:49:09 2017 +0200 Committer: Pascal Schumacher <pascalschumac...@gmx.net> Committed: Sat Nov 4 13:06:22 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/commons/text/FormattableUtils.java | 2 +- .../org/apache/commons/text/RandomStringGenerator.java | 7 +++---- src/main/java/org/apache/commons/text/StrTokenizer.java | 5 ++--- .../org/apache/commons/text/translate/EntityArrays.java | 5 +---- .../apache/commons/text/translate/LookupTranslator.java | 5 +---- .../org/apache/commons/text/AlphabetConverterTest.java | 10 +++++----- .../apache/commons/text/ExtendedMessageFormatTest.java | 6 +++--- .../java/org/apache/commons/text/StrLookupTest.java | 2 +- .../org/apache/commons/text/StringEscapeUtilsTest.java | 8 ++++---- .../commons/text/similarity/CosineSimilarityTest.java | 2 +- .../commons/text/similarity/LevenshteinResultsTest.java | 12 ++++++------ 11 files changed, 28 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/main/java/org/apache/commons/text/FormattableUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/FormattableUtils.java b/src/main/java/org/apache/commons/text/FormattableUtils.java index 043cbf1..69eed1d 100644 --- a/src/main/java/org/apache/commons/text/FormattableUtils.java +++ b/src/main/java/org/apache/commons/text/FormattableUtils.java @@ -133,7 +133,7 @@ public class FormattableUtils { throw new IllegalArgumentException( String.format("Specified ellipsis '%1$s' exceeds precision of %2$s", ellipsis, - Integer.valueOf(precision))); + precision)); } final StringBuilder buf = new StringBuilder(seq); if (precision >= 0 && precision < seq.length()) { http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/main/java/org/apache/commons/text/RandomStringGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/RandomStringGenerator.java b/src/main/java/org/apache/commons/text/RandomStringGenerator.java index dd50f96..66a6ec6 100644 --- a/src/main/java/org/apache/commons/text/RandomStringGenerator.java +++ b/src/main/java/org/apache/commons/text/RandomStringGenerator.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.Collections; import java.util.concurrent.ThreadLocalRandom; /** @@ -341,7 +342,7 @@ public final class RandomStringGenerator { * @return {@code this}, to allow method chaining. */ public Builder withinRange(final char[] ... pairs) { - characterList = new ArrayList<Character>(); + characterList = new ArrayList<>(); for (final char[] pair : pairs) { Validate.isTrue(pair.length == 2, "Each pair must contain minimum and maximum code point"); @@ -386,9 +387,7 @@ public final class RandomStringGenerator { inclusivePredicates.clear(); } - for (final CharacterPredicate predicate : predicates) { - inclusivePredicates.add(predicate); - } + Collections.addAll(inclusivePredicates, predicates); return this; } http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/main/java/org/apache/commons/text/StrTokenizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/StrTokenizer.java b/src/main/java/org/apache/commons/text/StrTokenizer.java index d4a2c6c..b6a026d 100644 --- a/src/main/java/org/apache/commons/text/StrTokenizer.java +++ b/src/main/java/org/apache/commons/text/StrTokenizer.java @@ -444,9 +444,8 @@ public class StrTokenizer implements ListIterator<String>, Cloneable { public List<String> getTokenList() { checkTokenized(); final List<String> list = new ArrayList<>(tokens.length); - for (final String element : tokens) { - list.add(element); - } + Collections.addAll(list, tokens); + return list; } http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/main/java/org/apache/commons/text/translate/EntityArrays.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/text/translate/EntityArrays.java index e6cee30..41fa0ed 100644 --- a/src/main/java/org/apache/commons/text/translate/EntityArrays.java +++ b/src/main/java/org/apache/commons/text/translate/EntityArrays.java @@ -18,7 +18,6 @@ package org.apache.commons.text.translate; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; /** @@ -434,9 +433,7 @@ public class EntityArrays { */ public static Map<CharSequence, CharSequence> invert(final Map<CharSequence, CharSequence> map) { final Map<CharSequence, CharSequence> newMap = new HashMap<>(); - final Iterator<Map.Entry<CharSequence, CharSequence>> it = map.entrySet().iterator(); - while (it.hasNext()) { - final Map.Entry<CharSequence, CharSequence> pair = it.next(); + for (Map.Entry<CharSequence, CharSequence> pair : map.entrySet()) { newMap.put(pair.getValue(), pair.getKey()); } return newMap; http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/main/java/org/apache/commons/text/translate/LookupTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java index 80eee30..7a96dcc 100644 --- a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java +++ b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java @@ -21,7 +21,6 @@ import java.io.Writer; import java.security.InvalidParameterException; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; /** @@ -59,10 +58,8 @@ public class LookupTranslator extends CharSequenceTranslator { this.prefixSet = new HashSet<>(); int currentShortest = Integer.MAX_VALUE; int currentLongest = 0; - final Iterator<Map.Entry<CharSequence, CharSequence>> it = lookupMap.entrySet().iterator(); - while (it.hasNext()) { - final Map.Entry<CharSequence, CharSequence> pair = it.next(); + for (Map.Entry<CharSequence, CharSequence> pair : lookupMap.entrySet()) { this.lookupMap.put(pair.getKey().toString(), pair.getValue().toString()); this.prefixSet.add(pair.getKey().charAt(0)); final int sz = pair.getKey().length(); http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/AlphabetConverterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java index 7a59c6e..7eb8887 100644 --- a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java +++ b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java @@ -232,7 +232,7 @@ public class AlphabetConverterTest { @Test(expected = IllegalArgumentException.class) public void testCreateConverterFromCharsWithNullAndNull() { final Character[] characterArray = new Character[2]; - characterArray[0] = Character.valueOf('$'); + characterArray[0] = '$'; characterArray[1] = characterArray[0]; AlphabetConverter.createConverterFromChars(characterArray, null, null); @@ -241,7 +241,7 @@ public class AlphabetConverterTest { @Test public void testCreateConverterFromCharsOne() { final Character[] characterArray = new Character[2]; - characterArray[0] = new Character('5'); + characterArray[0] = '5'; characterArray[1] = characterArray[0]; final AlphabetConverter alphabetConverter = AlphabetConverter.createConverterFromChars(characterArray, characterArray, characterArray); @@ -263,7 +263,7 @@ public class AlphabetConverterTest { @Test public void testEquals() { final Character[] characterArray = new Character[2]; - final Character character = new Character('R'); + final Character character = 'R'; characterArray[0] = character; characterArray[1] = character; final AlphabetConverter alphabetConverter = AlphabetConverter.createConverterFromChars(characterArray, @@ -278,7 +278,7 @@ public class AlphabetConverterTest { @Test public void testEqualsWithSameObject() { final Character[] characterArray = new Character[2]; - final Character character = new Character('R'); + final Character character = 'R'; characterArray[0] = character; characterArray[1] = character; final AlphabetConverter alphabetConverter = AlphabetConverter.createConverterFromChars(characterArray, @@ -300,7 +300,7 @@ public class AlphabetConverterTest { public void testCreateConverterFromCharsAndEquals() { final Character[] characterArray = new Character[2]; final char charOne = '+'; - final Character character = new Character('+'); + final Character character = '+'; characterArray[0] = character; characterArray[1] = characterArray[0]; final AlphabetConverter alphabetConverter = AlphabetConverter.createConverterFromChars(characterArray, http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java index 640b5b0..4bd691a 100644 --- a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java +++ b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java @@ -107,7 +107,7 @@ public class ExtendedMessageFormatTest { @Test public void testExtendedAndBuiltInFormats() { final Calendar cal = Calendar.getInstance(); - cal.set(2007, Calendar.JANUARY, 23, 18, 33, 05); + cal.set(2007, Calendar.JANUARY, 23, 18, 33, 5); final Object[] args = new Object[] {"John Doe", cal.getTime(), Double.valueOf("12345.67")}; final String builtinsPattern = "DOB: {1,date,short} Salary: {2,number,currency}"; final String extendedPattern = "Name: {0,upper} "; @@ -205,7 +205,7 @@ public class ExtendedMessageFormatTest { */ @Test public void testBuiltInChoiceFormat() { - final Object[] values = new Number[] {Integer.valueOf(1), Double.valueOf("2.2"), Double.valueOf("1234.5")}; + final Object[] values = new Number[] {1, Double.valueOf("2.2"), Double.valueOf("1234.5")}; String choicePattern = null; final Locale[] availableLocales = NumberFormat.getAvailableLocales(); @@ -226,7 +226,7 @@ public class ExtendedMessageFormatTest { @Test public void testBuiltInDateTimeFormat() { final Calendar cal = Calendar.getInstance(); - cal.set(2007, Calendar.JANUARY, 23, 18, 33, 05); + cal.set(2007, Calendar.JANUARY, 23, 18, 33, 5); final Object[] args = new Object[] {cal.getTime()}; final Locale[] availableLocales = DateFormat.getAvailableLocales(); http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/StrLookupTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/StrLookupTest.java b/src/test/java/org/apache/commons/text/StrLookupTest.java index f9be403..fce36d2 100644 --- a/src/test/java/org/apache/commons/text/StrLookupTest.java +++ b/src/test/java/org/apache/commons/text/StrLookupTest.java @@ -98,7 +98,7 @@ public class StrLookupTest { public void testMapLookup() { final Map<String, Object> map = new HashMap<>(); map.put("key", "value"); - map.put("number", Integer.valueOf(2)); + map.put("number", 2); assertEquals("value", StrLookup.mapLookup(map).lookup("key")); assertEquals("2", StrLookup.mapLookup(map).lookup("number")); assertNull(StrLookup.mapLookup(map).lookup(null)); http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java index cb566c2..dcc9e91 100644 --- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java +++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java @@ -320,11 +320,11 @@ public class StringEscapeUtilsTest { assertEquals("hex number unescape", "\u0080\u009F", StringEscapeUtils.unescapeHtml4("€Ÿ")); // Test all Character values: for (char i = Character.MIN_VALUE; i < Character.MAX_VALUE; i++) { - final Character c1 = new Character(i); - final Character c2 = new Character((char) (i + 1)); + final Character c1 = i; + final Character c2 = (char) (i + 1); final String expected = c1.toString() + c2.toString(); - final String escapedC1 = "&#x" + Integer.toHexString(c1.charValue()) + ";"; - final String escapedC2 = "&#x" + Integer.toHexString(c2.charValue()) + ";"; + final String escapedC1 = "&#x" + Integer.toHexString(c1) + ";"; + final String escapedC2 = "&#x" + Integer.toHexString(c2) + ";"; assertEquals("hex number unescape index " + i, expected, StringEscapeUtils.unescapeHtml4(escapedC1 + escapedC2)); } http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java b/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java index 73d9b48..235d2e3 100644 --- a/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java +++ b/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java @@ -31,7 +31,7 @@ public class CosineSimilarityTest { public void testCosineSimilarityWithNonEmptyMap() { final CosineSimilarity cosineSimilarity = new CosineSimilarity(); final Map<CharSequence, Integer> hashMap = new HashMap<>(); - final Integer integer = new Integer((-397)); + final Integer integer = -397; hashMap.put("3J/$3.L", integer); final Map<CharSequence, Integer> hashMapTwo = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/commons-text/blob/50c38d6c/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java index 6f306cc..8417b6f 100644 --- a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java @@ -24,8 +24,8 @@ public class LevenshteinResultsTest { @Test public void testEqualsReturningFalse() { - final Integer integerOne = new Integer(1662); - final Integer integerTwo = new Integer(1164); + final Integer integerOne = 1662; + final Integer integerTwo = 1164; final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); final LevenshteinResults levenshteinResultsTwo = @@ -36,7 +36,7 @@ public class LevenshteinResultsTest { @Test public void testEqualsWithNonNull() { - final Integer integer = new Integer(1); + final Integer integer = 1; final LevenshteinResults levenshteinResults = new LevenshteinResults(null, integer, integer, null); final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(null, null, null, null); @@ -45,7 +45,7 @@ public class LevenshteinResultsTest { @Test public void testEqualsWithNull() { - final Integer integer = new Integer((-647)); + final Integer integer = -647; final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); assertThat(levenshteinResults.equals(null)).isFalse(); @@ -53,7 +53,7 @@ public class LevenshteinResultsTest { @Test public void testEqualsDifferenceInSubstitutionCount() { - final Integer integer = new Integer(1662); + final Integer integer = 1662; final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, integer, integer, integer); final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integer, integer, integer, null); @@ -62,7 +62,7 @@ public class LevenshteinResultsTest { @Test public void testEqualsSameObject() { - final Integer integer = new Integer(1662); + final Integer integer = 1662; final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, integer, integer, null); assertThat(levenshteinResults.equals(levenshteinResults)).isTrue();
