Skip to content

Commit e3bfc84

Browse files
committed
Use forEach()
1 parent ff724b8 commit e3bfc84

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,15 @@ public Languages.LanguageSet guessLanguages(final String input) {
205205
final String text = input.toLowerCase(Locale.ENGLISH);
206206

207207
final Set<String> langs = new HashSet<>(this.languages.getLanguages());
208-
for (final LangRule rule : this.rules) {
208+
this.rules.forEach(rule -> {
209209
if (rule.matches(text)) {
210210
if (rule.acceptOnMatch) {
211211
langs.retainAll(rule.languages);
212212
} else {
213213
langs.removeAll(rule.languages);
214214
}
215215
}
216-
}
216+
});
217217

218218
final Languages.LanguageSet ls = Languages.LanguageSet.from(langs);
219219
return ls.equals(Languages.NO_LANGUAGES) ? Languages.ANY_LANGUAGE : ls;

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.NoSuchElementException;
2525
import java.util.Scanner;
2626
import java.util.Set;
27+
import java.util.stream.Collectors;
2728

2829
import org.apache.commons.codec.Resources;
2930

@@ -125,13 +126,7 @@ public LanguageSet restrictTo(final LanguageSet other) {
125126
return this;
126127
}
127128
final SomeLanguages someLanguages = (SomeLanguages) other;
128-
final Set<String> set = new HashSet<>(Math.min(languages.size(), someLanguages.languages.size()));
129-
for (final String lang : languages) {
130-
if (someLanguages.languages.contains(lang)) {
131-
set.add(lang);
132-
}
133-
}
134-
return from(set);
129+
return from(languages.stream().filter(lang -> someLanguages.languages.contains(lang)).collect(Collectors.toSet()));
135130
}
136131

137132
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ private PhonemeBuilder(final Set<Rule.Phoneme> phonemes) {
8989
* @param str the characters to append to the phonemes
9090
*/
9191
public void append(final CharSequence str) {
92-
for (final Rule.Phoneme ph : this.phonemes) {
93-
ph.append(str);
94-
}
92+
phonemes.forEach(ph -> ph.append(str));
9593
}
9694

9795
/**

0 commit comments

Comments
 (0)