Skip to content

Commit 28910ee

Browse files
garydgregorygarydgregory
committed
[CODEC-244] Update from Java 6 to Java 7. Remove redundant type arguments.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1812843 13f79535-47bb-0310-9956-ffa450edef68
1 parent 5feb039 commit 28910ee

8 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ public String toString() {
220220
private static final int MAX_LENGTH = 6;
221221

222222
/** Transformation rules indexed by the first character of their pattern. */
223-
private static final Map<Character, List<Rule>> RULES = new HashMap<Character, List<Rule>>();
223+
private static final Map<Character, List<Rule>> RULES = new HashMap<>();
224224

225225
/** Folding rules. */
226-
private static final Map<Character, Character> FOLDINGS = new HashMap<Character, Character>();
226+
private static final Map<Character, Character> FOLDINGS = new HashMap<>();
227227

228228
static {
229229
final InputStream rulesIS = DaitchMokotoffSoundex.class.getClassLoader().getResourceAsStream(RESOURCE_FILE);
@@ -316,7 +316,7 @@ private static void parseRules(final Scanner scanner, final String location,
316316
final char patternKey = r.pattern.charAt(0);
317317
List<Rule> rules = ruleMapping.get(patternKey);
318318
if (rules == null) {
319-
rules = new ArrayList<Rule>();
319+
rules = new ArrayList<>();
320320
ruleMapping.put(patternKey, rules);
321321
}
322322
rules.add(r);
@@ -490,7 +490,7 @@ private String[] soundex(final String source, final boolean branching) {
490490

491491
final String input = cleanup(source);
492492

493-
final Set<Branch> currentBranches = new LinkedHashSet<Branch>();
493+
final Set<Branch> currentBranches = new LinkedHashSet<>();
494494
currentBranches.add(new Branch());
495495

496496
char lastChar = '\0';

‎src/main/java/org/apache/commons/codec/language/bm/Lang.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public boolean matches(final String txt) {
9393
}
9494
}
9595

96-
private static final Map<NameType, Lang> Langs = new EnumMap<NameType, Lang>(NameType.class);
96+
private static final Map<NameType, Lang> Langs = new EnumMap<>(NameType.class);
9797

9898
private static final String LANGUAGE_RULES_RN = "org/apache/commons/codec/language/bm/%s_lang.txt";
9999

@@ -127,7 +127,7 @@ public static Lang instance(final NameType nameType) {
127127
* @return a Lang encapsulating the loaded language-guessing rules.
128128
*/
129129
public static Lang loadFromResource(final String languageRulesResourceName, final Languages languages) {
130-
final List<LangRule> rules = new ArrayList<LangRule>();
130+
final List<LangRule> rules = new ArrayList<>();
131131
final InputStream lRulesIS = Lang.class.getClassLoader().getResourceAsStream(languageRulesResourceName);
132132

133133
if (lRulesIS == null) {
@@ -174,7 +174,7 @@ public static Lang loadFromResource(final String languageRulesResourceName, fina
174174
final String[] langs = parts[1].split("\\+");
175175
final boolean accept = parts[2].equals("true");
176176

177-
rules.add(new LangRule(pattern, new HashSet<String>(Arrays.asList(langs)), accept));
177+
rules.add(new LangRule(pattern, new HashSet<>(Arrays.asList(langs)), accept));
178178
}
179179
}
180180
}
@@ -214,7 +214,7 @@ public String guessLanguage(final String text) {
214214
public Languages.LanguageSet guessLanguages(final String input) {
215215
final String text = input.toLowerCase(Locale.ENGLISH);
216216

217-
final Set<String> langs = new HashSet<String>(this.languages.getLanguages());
217+
final Set<String> langs = new HashSet<>(this.languages.getLanguages());
218218
for (final LangRule rule : this.rules) {
219219
if (rule.matches(text)) {
220220
if (rule.acceptOnMatch) {

‎src/main/java/org/apache/commons/codec/language/bm/Languages.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public LanguageSet restrictTo(final LanguageSet other) {
119119
return this;
120120
} else {
121121
final SomeLanguages sl = (SomeLanguages) other;
122-
final Set<String> ls = new HashSet<String>(Math.min(languages.size(), sl.languages.size()));
122+
final Set<String> ls = new HashSet<>(Math.min(languages.size(), sl.languages.size()));
123123
for (final String lang : languages) {
124124
if (sl.languages.contains(lang)) {
125125
ls.add(lang);
@@ -137,7 +137,7 @@ public LanguageSet merge(final LanguageSet other) {
137137
return other;
138138
} else {
139139
final SomeLanguages sl = (SomeLanguages) other;
140-
final Set<String> ls = new HashSet<String>(languages);
140+
final Set<String> ls = new HashSet<>(languages);
141141
for (final String lang : sl.languages) {
142142
ls.add(lang);
143143
}
@@ -154,7 +154,7 @@ public String toString() {
154154

155155
public static final String ANY = "any";
156156

157-
private static final Map<NameType, Languages> LANGUAGES = new EnumMap<NameType, Languages>(NameType.class);
157+
private static final Map<NameType, Languages> LANGUAGES = new EnumMap<>(NameType.class);
158158

159159
static {
160160
for (final NameType s : NameType.values()) {
@@ -168,7 +168,7 @@ public static Languages getInstance(final NameType nameType) {
168168

169169
public static Languages getInstance(final String languagesResourceName) {
170170
// read languages list
171-
final Set<String> ls = new HashSet<String>();
171+
final Set<String> ls = new HashSet<>();
172172
final InputStream langIS = Languages.class.getClassLoader().getResourceAsStream(languagesResourceName);
173173

174174
if (langIS == null) {

‎src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static PhonemeBuilder empty(final Languages.LanguageSet languages) {
7575
private final Set<Rule.Phoneme> phonemes;
7676

7777
private PhonemeBuilder(final Rule.Phoneme phoneme) {
78-
this.phonemes = new LinkedHashSet<Rule.Phoneme>();
78+
this.phonemes = new LinkedHashSet<>();
7979
this.phonemes.add(phoneme);
8080
}
8181

@@ -104,7 +104,7 @@ public void append(final CharSequence str) {
104104
* @param maxPhonemes the maximum number of phonemes to build up
105105
*/
106106
public void apply(final Rule.PhonemeExpr phonemeExpr, final int maxPhonemes) {
107-
final Set<Rule.Phoneme> newPhonemes = new LinkedHashSet<Rule.Phoneme>(maxPhonemes);
107+
final Set<Rule.Phoneme> newPhonemes = new LinkedHashSet<>(maxPhonemes);
108108

109109
EXPR: for (final Rule.Phoneme left : this.phonemes) {
110110
for (final Rule.Phoneme right : phonemeExpr.getPhonemes()) {
@@ -232,19 +232,19 @@ public boolean isFound() {
232232
}
233233
}
234234

235-
private static final Map<NameType, Set<String>> NAME_PREFIXES = new EnumMap<NameType, Set<String>>(NameType.class);
235+
private static final Map<NameType, Set<String>> NAME_PREFIXES = new EnumMap<>(NameType.class);
236236

237237
static {
238238
NAME_PREFIXES.put(NameType.ASHKENAZI,
239239
Collections.unmodifiableSet(
240-
new HashSet<String>(Arrays.asList("bar", "ben", "da", "de", "van", "von"))));
240+
new HashSet<>(Arrays.asList("bar", "ben", "da", "de", "van", "von"))));
241241
NAME_PREFIXES.put(NameType.SEPHARDIC,
242242
Collections.unmodifiableSet(
243-
new HashSet<String>(Arrays.asList("al", "el", "da", "dal", "de", "del", "dela", "de la",
243+
new HashSet<>(Arrays.asList("al", "el", "da", "dal", "de", "del", "dela", "de la",
244244
"della", "des", "di", "do", "dos", "du", "van", "von"))));
245245
NAME_PREFIXES.put(NameType.GENERIC,
246246
Collections.unmodifiableSet(
247-
new HashSet<String>(Arrays.asList("da", "dal", "de", "del", "dela", "de la", "della",
247+
new HashSet<>(Arrays.asList("da", "dal", "de", "del", "dela", "de la", "della",
248248
"des", "di", "do", "dos", "du", "van", "von"))));
249249
}
250250

@@ -336,7 +336,7 @@ private PhonemeBuilder applyFinalRules(final PhonemeBuilder phonemeBuilder,
336336
}
337337

338338
final Map<Rule.Phoneme, Rule.Phoneme> phonemes =
339-
new TreeMap<Rule.Phoneme, Rule.Phoneme>(Rule.Phoneme.COMPARATOR);
339+
new TreeMap<>(Rule.Phoneme.COMPARATOR);
340340

341341
for (final Rule.Phoneme phoneme : phonemeBuilder.getPhonemes()) {
342342
PhonemeBuilder subBuilder = PhonemeBuilder.empty(phoneme.getLanguages());
@@ -424,7 +424,7 @@ public String encode(String input, final Languages.LanguageSet languageSet) {
424424
}
425425

426426
final List<String> words = Arrays.asList(input.split("\\s+"));
427-
final List<String> words2 = new ArrayList<String>();
427+
final List<String> words2 = new ArrayList<>();
428428

429429
// special-case handling of word prefixes based upon the name type
430430
switch (this.nameType) {

‎src/main/java/org/apache/commons/codec/language/bm/Rule.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ public boolean isMatch(final CharSequence input) {
207207
private static final String HASH_INCLUDE = "#include";
208208

209209
private static final Map<NameType, Map<RuleType, Map<String, Map<String, List<Rule>>>>> RULES =
210-
new EnumMap<NameType, Map<RuleType, Map<String, Map<String, List<Rule>>>>>(NameType.class);
210+
new EnumMap<>(NameType.class);
211211

212212
static {
213213
for (final NameType s : NameType.values()) {
214214
final Map<RuleType, Map<String, Map<String, List<Rule>>>> rts =
215-
new EnumMap<RuleType, Map<String, Map<String, List<Rule>>>>(RuleType.class);
215+
new EnumMap<>(RuleType.class);
216216

217217
for (final RuleType rt : RuleType.values()) {
218-
final Map<String, Map<String, List<Rule>>> rs = new HashMap<String, Map<String, List<Rule>>>();
218+
final Map<String, Map<String, List<Rule>>> rs = new HashMap<>();
219219

220220
final Languages ls = Languages.getInstance(s);
221221
for (final String l : ls.getLanguages()) {
@@ -306,7 +306,7 @@ private static boolean endsWith(final CharSequence input, final CharSequence suf
306306
public static List<Rule> getInstance(final NameType nameType, final RuleType rt,
307307
final Languages.LanguageSet langs) {
308308
final Map<String, List<Rule>> ruleMap = getInstanceMap(nameType, rt, langs);
309-
final List<Rule> allRules = new ArrayList<Rule>();
309+
final List<Rule> allRules = new ArrayList<>();
310310
for (final List<Rule> rules : ruleMap.values()) {
311311
allRules.addAll(rules);
312312
}
@@ -325,7 +325,7 @@ public static List<Rule> getInstance(final NameType nameType, final RuleType rt,
325325
* @return a list of Rules that apply
326326
*/
327327
public static List<Rule> getInstance(final NameType nameType, final RuleType rt, final String lang) {
328-
return getInstance(nameType, rt, LanguageSet.from(new HashSet<String>(Arrays.asList(lang))));
328+
return getInstance(nameType, rt, LanguageSet.from(new HashSet<>(Arrays.asList(lang))));
329329
}
330330

331331
/**
@@ -378,7 +378,7 @@ private static Phoneme parsePhoneme(final String ph) {
378378
}
379379
final String before = ph.substring(0, open);
380380
final String in = ph.substring(open + 1, ph.length() - 1);
381-
final Set<String> langs = new HashSet<String>(Arrays.asList(in.split("[+]")));
381+
final Set<String> langs = new HashSet<>(Arrays.asList(in.split("[+]")));
382382

383383
return new Phoneme(before, Languages.LanguageSet.from(langs));
384384
}
@@ -391,7 +391,7 @@ private static PhonemeExpr parsePhonemeExpr(final String ph) {
391391
throw new IllegalArgumentException("Phoneme starts with '(' so must end with ')'");
392392
}
393393

394-
final List<Phoneme> phs = new ArrayList<Phoneme>();
394+
final List<Phoneme> phs = new ArrayList<>();
395395
final String body = ph.substring(1, ph.length() - 1);
396396
for (final String part : body.split("[|]")) {
397397
phs.add(parsePhoneme(part));
@@ -406,7 +406,7 @@ private static PhonemeExpr parsePhonemeExpr(final String ph) {
406406
}
407407

408408
private static Map<String, List<Rule>> parseRules(final Scanner scanner, final String location) {
409-
final Map<String, List<Rule>> lines = new HashMap<String, List<Rule>>();
409+
final Map<String, List<Rule>> lines = new HashMap<>();
410410
int currentLine = 0;
411411

412412
boolean inMultilineComment = false;
@@ -482,7 +482,7 @@ public String toString() {
482482
final String patternKey = r.pattern.substring(0,1);
483483
List<Rule> rules = lines.get(patternKey);
484484
if (rules == null) {
485-
rules = new ArrayList<Rule>();
485+
rules = new ArrayList<>();
486486
lines.put(patternKey, rules);
487487
}
488488
rules.add(r);

‎src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static Collection<Object[]> data() {
102102
{ HmacAlgorithms.HMAC_SHA_512, STANDARD_SHA512_RESULT_BYTES, STANDARD_SHA512_RESULT_STRING } });
103103
// @formatter:on
104104
if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)) {
105-
list = new ArrayList<Object[]>(list);
105+
list = new ArrayList<>(list);
106106
list.add(new Object[] {HmacAlgorithms.HMAC_SHA_224, STANDARD_SHA224_RESULT_BYTES, STANDARD_SHA224_RESULT_STRING});
107107
}
108108
return list;

‎src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public static class PerformanceTest {
224224
public static final int BYTES_PER_SIZE = MAX_LEN * 4;
225225

226226
static final Class<? extends Checksum> zip = CRC32.class;
227-
static final List<Class<? extends Checksum>> CRCS = new ArrayList<Class<? extends Checksum>>();
227+
static final List<Class<? extends Checksum>> CRCS = new ArrayList<>();
228228
static {
229229
CRCS.add(zip);
230230
CRCS.add(PureJavaCrc32.class);
@@ -286,7 +286,7 @@ private static void doBench(final List<Class<? extends Checksum>> crcs,
286286
printCell(String.valueOf(numThreads), numThreadsStr.length(), out);
287287

288288
BenchResult expected = null;
289-
final List<BenchResult> previous = new ArrayList<BenchResult>();
289+
final List<BenchResult> previous = new ArrayList<>();
290290
for(final Class<? extends Checksum> c : crcs) {
291291
System.gc();
292292

0 commit comments

Comments
 (0)