Skip to content

Commit bee2791

Browse files
authored
Merge pull request #111 from marschall/collection-initialization-constructor
Use collection initialization constructor
2 parents 343b471 + e156312 commit bee2791

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

src/main/java/javax/money/DefaultMonetaryCurrenciesSingletonSpi.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public Set<CurrencyUnit> getCurrencies(CurrencyQuery query) {
6060
*/
6161
@Override
6262
public List<String> getDefaultProviderChain() {
63-
List<String> list = new ArrayList<>();
64-
list.addAll(getProviderNames());
63+
List<String> list = new ArrayList<>(getProviderNames());
6564
Collections.sort(list);
6665
return list;
6766
}

src/main/java/javax/money/DefaultMonetaryRoundingsSingletonSpi.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ public Set<String> getProviderNames() {
124124
*/
125125
@Override
126126
public List<String> getDefaultProviderChain() {
127-
List<String> result = new ArrayList<>();
128-
result.addAll(Monetary.getRoundingProviderNames());
127+
List<String> result = new ArrayList<>(Monetary.getRoundingProviderNames());
129128
Collections.sort(result);
130129
return result;
131130
}

src/main/java/javax/money/convert/ProviderContextBuilder.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ private ProviderContextBuilder(String provider, Collection<RateType> rateTypes)
5555
throw new IllegalArgumentException("At least one RateType is required.");
5656
}
5757
setProviderName(provider);
58-
Set<RateType> rts = new HashSet<>();
59-
rts.addAll(rateTypes);
58+
Set<RateType> rts = new HashSet<>(rateTypes);
6059
set("rateTypes", rts);
6160
}
6261

@@ -69,8 +68,7 @@ private ProviderContextBuilder(String provider, Collection<RateType> rateTypes)
6968
*/
7069
private ProviderContextBuilder(ProviderContext context) {
7170
importContext(context);
72-
Set<RateType> rts = new HashSet<>();
73-
rts.addAll(context.getRateTypes());
71+
Set<RateType> rts = new HashSet<>(context.getRateTypes());
7472
set(ProviderContext.KEY_RATE_TYPES, rts);
7573
}
7674

@@ -92,14 +90,12 @@ public ProviderContextBuilder setRateTypes(RateType... rateTypes) {
9290
* @return this, for chaining.
9391
* @throws IllegalArgumentException when not at least one {@link RateType} is provided.
9492
*/
95-
@SuppressWarnings({"unchecked", "rawtypes"})
9693
public ProviderContextBuilder setRateTypes(Collection<RateType> rateTypes) {
9794
Objects.requireNonNull(rateTypes);
9895
if (rateTypes.isEmpty()) {
9996
throw new IllegalArgumentException("At least one RateType is required.");
10097
}
101-
Set rtSet = new HashSet<>();
102-
rtSet.addAll(rateTypes);
98+
Set<RateType> rtSet = new HashSet<>(rateTypes);
10399
set(ProviderContext.KEY_RATE_TYPES, rtSet);
104100
return this;
105101
}

src/main/java/javax/money/format/MonetaryFormats.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ public Set<String> getProviderNames() {
236236
*/
237237
@Override
238238
public List<String> getDefaultProviderChain() {
239-
List<String> list = new ArrayList<>();
240-
list.addAll(getProviderNames());
239+
List<String> list = new ArrayList<>(getProviderNames());
241240
Collections.sort(list);
242241
return list;
243242
}

src/test/java/javax/money/format/AmountFormatQueryTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ public void testEquals(){
6464
List<AmountFormatContext> contexts = new ArrayList<>();
6565
contexts.add(AmountFormatContextBuilder.of(Locale.ENGLISH).build());
6666
contexts.add(AmountFormatContextBuilder.of(Locale.GERMAN).build());
67-
Set<AmountFormatContext> checkContexts = new HashSet<>();
68-
checkContexts.addAll(contexts);
67+
Set<AmountFormatContext> checkContexts = new HashSet<>(contexts);
6968
// Check we have 5 distinct hash codes...
7069
assertTrue(checkContexts.size() == 2);
7170
}

0 commit comments

Comments
 (0)