Skip to content

Commit 846e228

Browse files
atsticksatsticks
committed
Renamed singletons to plurals, including corresponding spis.
1 parent 1b74a3c commit 846e228

File tree

15 files changed

+83
-83
lines changed

15 files changed

+83
-83
lines changed

‎money-api/convert/src/main/java/javax/money/convert/CurrencyConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* It is provided by a {@link ConversionProvider} implementation.
1717
*
1818
* @see ConversionProvider
19-
* @see MonetaryConversion
19+
* @see MonetaryConversions
2020
* @author Anatole Tresch
2121
*/
2222
public interface CurrencyConverter {

‎money-api/convert/src/main/java/javax/money/convert/MonetaryConversion.java‎ renamed to ‎money-api/convert/src/main/java/javax/money/convert/MonetaryConversions.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @author Anatole Tresch
2323
*/
24-
public final class MonetaryConversion {
24+
public final class MonetaryConversions {
2525
/**
2626
* The spi currently active, use {@link ServiceLoader} to register an
2727
* altetrnate implementaiont.
@@ -31,7 +31,7 @@ public final class MonetaryConversion {
3131
/**
3232
* Private singleton constructor.
3333
*/
34-
private MonetaryConversion() {
34+
private MonetaryConversions() {
3535
}
3636

3737
/**
@@ -48,7 +48,7 @@ private static MonetaryConversionSpi loadMonetaryConversionSpi() {
4848
return instances.next();
4949
}
5050
} catch (Throwable e) {
51-
Logger.getLogger(MonetaryConversion.class.getName()).log(
51+
Logger.getLogger(MonetaryConversions.class.getName()).log(
5252
Level.INFO,
5353
"No MonetaryConversionSpi registered, using default.", e);
5454
}
@@ -136,7 +136,7 @@ public static Collection<ExchangeRateType> getSupportedExchangeRateTypes() {
136136
* the required {@link ExchangeRateType}, not {@code null}.
137137
* @return true, if a {@link ConversionProvider} for this
138138
* {@link ExchangeRateType} can be obtained from this
139-
* {@link MonetaryConversion} instance.
139+
* {@link MonetaryConversions} instance.
140140
*/
141141
public static boolean isSupportedExchangeRateType(ExchangeRateType type) {
142142
return MONETARY_CONVERSION_SPI.isSupportedExchangeRateType(type);

‎money-api/convert/src/test/java/javax/money/convert/MonetaryConversionTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ public class MonetaryConversionTest {
1515

1616
@Test
1717
public void testGetConversionProvider() {
18-
ConversionProvider prov = MonetaryConversion
18+
ConversionProvider prov = MonetaryConversions
1919
.getConversionProvider(ExchangeRateType.of("test"));
2020
assertTrue(prov != null);
2121
assertEquals(DummyConversionProvider.class, prov.getClass());
2222
}
2323

2424
@Test
2525
public void testGetSupportedExchangeRateTypes() {
26-
Collection<ExchangeRateType> types = MonetaryConversion
26+
Collection<ExchangeRateType> types = MonetaryConversions
2727
.getSupportedExchangeRateTypes();
2828
assertNotNull(types);
2929
assertTrue(types.size() == 1);
@@ -32,9 +32,9 @@ public void testGetSupportedExchangeRateTypes() {
3232

3333
@Test
3434
public void testIsSupportedExchangeRateType() {
35-
assertTrue(MonetaryConversion
35+
assertTrue(MonetaryConversions
3636
.isSupportedExchangeRateType(ExchangeRateType.of("test")));
37-
assertFalse(MonetaryConversion
37+
assertFalse(MonetaryConversions
3838
.isSupportedExchangeRateType(ExchangeRateType.of("test2")));
3939
}
4040

‎money-api/convert/src/test/java/javax/money/convert/TestMonetaryConversionSpi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Collection;
55

66
import javax.money.CurrencyUnit;
7-
import javax.money.convert.MonetaryConversion.MonetaryConversionSpi;
7+
import javax.money.convert.MonetaryConversions.MonetaryConversionSpi;
88

99
public class TestMonetaryConversionSpi implements MonetaryConversionSpi {
1010

‎money-api/ext/src/main/java/javax/money/ext/MonetaryRegions.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class MonetaryRegions {
2929
* The spi currently active, use {@link ServiceLoader} to register an
3030
* alternate implementation.
3131
*/
32-
private static final MonetaryRegionSpi MONETARY_REGION_SPI = loadMonetaryRegionSpi();
32+
private static final MonetaryRegionsSpi MONETARY_REGION_SPI = loadMonetaryRegionSpi();
3333

3434
/**
3535
* Private singleton constructor.
@@ -160,7 +160,7 @@ public static Set<CurrencyUnit> getLegalCurrencyUnits(Region region,
160160
*
161161
* @author Anatole Tresch
162162
*/
163-
public static interface MonetaryRegionSpi {
163+
public static interface MonetaryRegionsSpi {
164164

165165
/**
166166
* Access all regions available, that have no parent region. It is
@@ -235,19 +235,19 @@ public Set<CurrencyUnit> getLegalCurrencyUnits(Region region,
235235
*
236236
* @return the instance ot be registered into the shared variable.
237237
*/
238-
private static MonetaryRegionSpi loadMonetaryRegionSpi() {
238+
private static MonetaryRegionsSpi loadMonetaryRegionSpi() {
239239
try {
240240
// try loading directly from ServiceLoader
241-
Iterator<MonetaryRegionSpi> instances = ServiceLoader.load(
242-
MonetaryRegionSpi.class).iterator();
241+
Iterator<MonetaryRegionsSpi> instances = ServiceLoader.load(
242+
MonetaryRegionsSpi.class).iterator();
243243
if (instances.hasNext()) {
244244
return instances.next();
245245
}
246246
} catch (Throwable e) {
247-
Logger.getLogger(MonetaryRegionSpi.class.getName()).log(Level.INFO,
247+
Logger.getLogger(MonetaryRegionsSpi.class.getName()).log(Level.INFO,
248248
"No MonetaryRegionSpi registered, using default.", e);
249249
}
250-
return new DefaultMonetaryRegionSpi();
250+
return new DefaultMonetaryRegionsSpi();
251251
}
252252

253253
/**
@@ -258,8 +258,8 @@ private static MonetaryRegionSpi loadMonetaryRegionSpi() {
258258
* @author Anatole Tresch
259259
*
260260
*/
261-
private final static class DefaultMonetaryRegionSpi implements
262-
MonetaryRegionSpi {
261+
private final static class DefaultMonetaryRegionsSpi implements
262+
MonetaryRegionsSpi {
263263
/*
264264
* (non-Javadoc)
265265
*

‎money-api/format/src/main/java/javax/money/format/MonetaryFormat.java‎ renamed to ‎money-api/format/src/main/java/javax/money/format/MonetaryFormats.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222
*
2323
* @author Anatole Tresch
2424
*/
25-
public final class MonetaryFormat {
25+
public final class MonetaryFormats {
2626

27-
private static MonetaryFormatSpi monetaryFormatSpi = loadMonetaryFormatSpi();
27+
private static MonetaryFormatsSpi monetaryFormatSpi = loadMonetaryFormatSpi();
2828

29-
private MonetaryFormat() {
29+
private MonetaryFormats() {
3030
}
3131

32-
private static MonetaryFormatSpi loadMonetaryFormatSpi() {
33-
MonetaryFormatSpi spi = null;
32+
private static MonetaryFormatsSpi loadMonetaryFormatSpi() {
33+
MonetaryFormatsSpi spi = null;
3434
try {
3535
// try loading directly from ServiceLoader
36-
Iterator<MonetaryFormatSpi> instances = ServiceLoader.load(
37-
MonetaryFormatSpi.class).iterator();
36+
Iterator<MonetaryFormatsSpi> instances = ServiceLoader.load(
37+
MonetaryFormatsSpi.class).iterator();
3838
if (instances.hasNext()) {
3939
spi = instances.next();
4040
return spi;
4141
}
4242
} catch (Exception e) {
43-
Logger.getLogger(MonetaryFormat.class.getName()).log(Level.INFO,
43+
Logger.getLogger(MonetaryFormats.class.getName()).log(Level.INFO,
4444
"No MonetaryFormatSpi found, using default.", e);
4545
}
46-
return new DefaultMonetaryFormatSpi();
46+
return new DefaultMonetaryFormatsSpi();
4747
}
4848

4949
/**
@@ -59,7 +59,7 @@ public static Collection<String> getSupportedStyleIds(Class<?> targetType) {
5959
Collection<String> styleIDs = monetaryFormatSpi
6060
.getSupportedStyleIds(targetType);
6161
if (styleIDs == null) {
62-
Logger.getLogger(MonetaryFormat.class.getName()).log(
62+
Logger.getLogger(MonetaryFormats.class.getName()).log(
6363
Level.WARNING,
6464
"MonetaryFormatSpi.getSupportedStyleIds returned null for "
6565
+ targetType);
@@ -140,7 +140,7 @@ public static <T> ItemFormat<T> getItemFormat(Class<T> targetType,
140140
return getItemFormat(targetType, LocalizationStyle.of(locale));
141141
}
142142

143-
public static interface MonetaryFormatSpi {
143+
public static interface MonetaryFormatsSpi {
144144
/**
145145
* Return the style id's supported by this
146146
* {@link ItemFormatterFactorySpi} instance.
@@ -185,8 +185,8 @@ public <T> ItemFormat<T> getItemFormat(Class<T> targetType,
185185

186186
}
187187

188-
private static final class DefaultMonetaryFormatSpi implements
189-
MonetaryFormatSpi {
188+
private static final class DefaultMonetaryFormatsSpi implements
189+
MonetaryFormatsSpi {
190190

191191
@Override
192192
public Collection<String> getSupportedStyleIds(Class<?> targetType) {

‎money-api/format/src/test/java/javax/money/format/MonetaryFormatTest.java‎ renamed to ‎money-api/format/src/test/java/javax/money/format/MonetaryFormatsTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
import org.junit.Test;
2020

2121
/**
22-
* Tests class for {@link MonetaryFormat}.
22+
* Tests class for {@link MonetaryFormats}.
2323
*
2424
* @author Anatole Tresch
2525
*
2626
*/
27-
public class MonetaryFormatTest {
27+
public class MonetaryFormatsTest {
2828

2929
/**
3030
* Test method for
31-
* {@link javax.money.format.MonetaryFormat#getSupportedStyleIds(java.lang.Class)}
31+
* {@link javax.money.format.MonetaryFormats#getSupportedStyleIds(java.lang.Class)}
3232
* .
3333
*/
3434
@Test
3535
public void testGetSupportedStyleIds() {
36-
Collection<String> ids = MonetaryFormat
36+
Collection<String> ids = MonetaryFormats
3737
.getSupportedStyleIds(String.class);
3838
assertNotNull(ids);
3939
assertTrue(ids.size() == 1);
@@ -42,29 +42,29 @@ public void testGetSupportedStyleIds() {
4242

4343
/**
4444
* Test method for
45-
* {@link javax.money.format.MonetaryFormat#isSupportedStyle(java.lang.Class, java.lang.String)}
45+
* {@link javax.money.format.MonetaryFormats#isSupportedStyle(java.lang.Class, java.lang.String)}
4646
* .
4747
*/
4848
@Test
4949
public void testIsSupportedStyle() {
50-
assertTrue(MonetaryFormat.isSupportedStyle(String.class, "String"));
51-
assertTrue(MonetaryFormat.isSupportedStyle(Integer.class, "Integer"));
52-
assertFalse(MonetaryFormat.isSupportedStyle(Integer.class, "String"));
53-
assertFalse(MonetaryFormat.isSupportedStyle(Double.class, "Integer"));
50+
assertTrue(MonetaryFormats.isSupportedStyle(String.class, "String"));
51+
assertTrue(MonetaryFormats.isSupportedStyle(Integer.class, "Integer"));
52+
assertFalse(MonetaryFormats.isSupportedStyle(Integer.class, "String"));
53+
assertFalse(MonetaryFormats.isSupportedStyle(Double.class, "Integer"));
5454

5555
}
5656

5757
/**
5858
* Test method for
59-
* {@link javax.money.format.MonetaryFormat#getItemFormat(java.lang.Class, javax.money.format.LocalizationStyle)}
59+
* {@link javax.money.format.MonetaryFormats#getItemFormat(java.lang.Class, javax.money.format.LocalizationStyle)}
6060
* .
6161
*
6262
* @throws ItemParseException
6363
*/
6464
@Test
6565
public void testGetItemFormatterClassOfTLocalizationStyle()
6666
throws ItemParseException {
67-
ItemFormat<String> formatter = MonetaryFormat.getItemFormat(
67+
ItemFormat<String> formatter = MonetaryFormats.getItemFormat(
6868
String.class, LocalizationStyle.of(Locale.ENGLISH));
6969
assertEquals("testest", formatter.format("testest"));
7070
assertEquals("gugus", formatter.format("gugus"));
@@ -76,14 +76,14 @@ public void testGetItemFormatterClassOfTLocalizationStyle()
7676

7777
/**
7878
* Test method for
79-
* {@link javax.money.format.MonetaryFormat#getItemFormat(java.lang.Class, java.util.Locale)}
79+
* {@link javax.money.format.MonetaryFormats#getItemFormat(java.lang.Class, java.util.Locale)}
8080
* .
8181
*
8282
* @throws ItemParseException
8383
*/
8484
@Test
8585
public void testGetItemFormatterClassOfTLocale() throws ItemParseException {
86-
ItemFormat<String> formatter = MonetaryFormat.getItemFormat(
86+
ItemFormat<String> formatter = MonetaryFormats.getItemFormat(
8787
String.class, Locale.ENGLISH);
8888
assertEquals("testest", formatter.format("testest"));
8989
assertEquals("gugus", formatter.format("gugus"));

‎money-api/format/src/test/java/javax/money/format/TestMonetaryFormatSpi.java‎ renamed to ‎money-api/format/src/test/java/javax/money/format/TestMonetaryFormatsSpi.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
import java.util.HashSet;
1414
import java.util.Set;
1515

16-
import javax.money.format.MonetaryFormat.MonetaryFormatSpi;
16+
import javax.money.format.MonetaryFormats.MonetaryFormatsSpi;
1717

1818
/**
19-
* Tests class registered into {@link MonetaryFormat} to test
20-
* {@link MonetaryFormat}.
19+
* Tests class registered into {@link MonetaryFormats} to test
20+
* {@link MonetaryFormats}.
2121
*
2222
* @author Anatole Tresch
2323
*
2424
*/
25-
public class TestMonetaryFormatSpi implements MonetaryFormatSpi {
25+
public class TestMonetaryFormatsSpi implements MonetaryFormatsSpi {
2626

2727
@Override
2828
public Collection<String> getSupportedStyleIds(Class<?> targetType) {

‎money-impl/cdi/src/test/java/SmokeTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import javax.money.convert.ConversionProvider;
3333
import javax.money.convert.ExchangeRate;
3434
import javax.money.convert.ExchangeRateType;
35-
import javax.money.convert.MonetaryConversion;
35+
import javax.money.convert.MonetaryConversions;
3636
import javax.money.ext.MonetaryCurrencies;
3737
import javax.money.format.ItemFormat;
3838
import javax.money.format.ItemParseException;
3939
import javax.money.format.LocalizationStyle;
40-
import javax.money.format.MonetaryFormat;
40+
import javax.money.format.MonetaryFormats;
4141

4242
import org.junit.Test;
4343
import org.slf4j.Logger;
@@ -78,7 +78,7 @@ public void testCreateMoney() {
7878

7979
@Test
8080
public void testExchange() {
81-
ConversionProvider prov = MonetaryConversion
81+
ConversionProvider prov = MonetaryConversions
8282
.getConversionProvider(RATE_TYPE);
8383
assertNotNull(prov);
8484
ExchangeRate rate1 = prov.getExchangeRate(MoneyCurrency.of("CHF"),
@@ -103,21 +103,21 @@ public void testCurrencyConverter() {
103103
MonetaryAmount srcUSD = Money.of(MoneyCurrency.of("USD"), 100.15);
104104
MonetaryAmount srcEUR = Money.of(MoneyCurrency.of("EUR"), 100.15);
105105

106-
MonetaryAmount tgt = MonetaryConversion
106+
MonetaryAmount tgt = MonetaryConversions
107107
.getConversionProvider(RATE_TYPE).getConverter()
108108
.convert(srcCHF, MoneyCurrency.of("EUR"));
109-
MonetaryAmount tgt3 = MonetaryConversion
109+
MonetaryAmount tgt3 = MonetaryConversions
110110
.getConversionProvider(RATE_TYPE).getConverter()
111111
.convert(tgt, MoneyCurrency.of("CHF"));
112112
assertEquals(srcCHF.with(rounding), tgt3.with(rounding));
113-
tgt = MonetaryConversion.getConversionProvider(RATE_TYPE)
113+
tgt = MonetaryConversions.getConversionProvider(RATE_TYPE)
114114
.getConverter().convert(srcEUR, MoneyCurrency.of("CHF"));
115-
tgt3 = MonetaryConversion.getConversionProvider(RATE_TYPE)
115+
tgt3 = MonetaryConversions.getConversionProvider(RATE_TYPE)
116116
.getConverter().convert(tgt, MoneyCurrency.of("EUR"));
117117
assertEquals(srcEUR.with(rounding), rounding.apply(tgt3));
118-
tgt = MonetaryConversion.getConversionProvider(RATE_TYPE)
118+
tgt = MonetaryConversions.getConversionProvider(RATE_TYPE)
119119
.getConverter().convert(srcCHF, MoneyCurrency.of("USD"));
120-
tgt3 = MonetaryConversion.getConversionProvider(RATE_TYPE)
120+
tgt3 = MonetaryConversions.getConversionProvider(RATE_TYPE)
121121
.getConverter().convert(tgt, MoneyCurrency.of("CHF"));
122122
assertEquals(srcCHF, tgt3);
123123
assertEquals(srcCHF.with(rounding), rounding.apply(tgt3));
@@ -127,7 +127,7 @@ public void testCurrencyConverter() {
127127
public void testGettingParsers() {
128128
// Using parsers
129129
try {
130-
ItemFormat<CurrencyUnit> parser = MonetaryFormat.getItemFormat(
130+
ItemFormat<CurrencyUnit> parser = MonetaryFormats.getItemFormat(
131131
CurrencyUnit.class,
132132
LocalizationStyle.of("ID", Locale.ENGLISH));
133133
CurrencyUnit cur = parser.parse("CHF");
@@ -143,7 +143,7 @@ public void testGettingFormatters() {
143143
// Using formatters
144144
CurrencyUnit currency = MonetaryCurrencies.get("ISO-4217", "CHF");
145145
MonetaryAmount amount = Money.of(currency, 1.0d);
146-
ItemFormat<MonetaryAmount> formatter = MonetaryFormat.getItemFormat(
146+
ItemFormat<MonetaryAmount> formatter = MonetaryFormats.getItemFormat(
147147
MonetaryAmount.class,
148148
LocalizationStyle.of("CODE", Locale.GERMANY));
149149
System.out.println("Formatted amount: " + formatter.format(amount));

‎money-impl/ri/src/main/java/net/java/javamoney/ri/convert/MonetaryConversionSpiImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import javax.inject.Singleton;
2727
import javax.money.convert.ConversionProvider;
2828
import javax.money.convert.ExchangeRateType;
29-
import javax.money.convert.MonetaryConversion.MonetaryConversionSpi;
29+
import javax.money.convert.MonetaryConversions.MonetaryConversionSpi;
3030

3131
import net.java.javamoney.ri.spi.MonetaryLoader;
3232

0 commit comments

Comments
 (0)