Fixed several quality issues.

Author: atsticks

src/main/java/javax/money/AbstractContextBuilder.java

@@ -68,7 +68,7 @@ public B importContext(AbstractContext context){
      * @return the Builder, for chaining.
      */
     public B set(String key, int value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -81,7 +81,7 @@ public B set(String key, int value) {
      * @return the Builder, for chaining.
      */
     public B set(String key, boolean value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -94,7 +94,7 @@ public B set(String key, boolean value) {
      * @return the Builder, for chaining.
      */
     public B set(String key, long value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -107,7 +107,7 @@ public B set(String key, long value) {
      * @return the Builder, for chaining.
      */
     public B set(String key, float value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -119,7 +119,7 @@ public B set(String key, float value) {
      * @return the Builder, for chaining.
      */
     public B set(String key, double value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -132,7 +132,7 @@ public B set(String key, double value) {
      * @return the Builder, for chaining.
      */
     public B set(String key, char value) {
-        this.data.put(key, Objects.requireNonNull(value));
+        this.data.put(key, value);
         return (B) this;
     }
 
@@ -142,37 +142,37 @@ public B set(String key, char value) {
      * <i>type</i> and {@code attribute.getClass().getName()} as attribute
      * <i>name</i>.
      *
-     * @param value the attribute value
+     * @param value the attribute value, not null.
      * @return this Builder, for chaining
      */
     public B set(Object value) {
-        data.put(value.getClass().getName(), value);
+        data.put(value.getClass().getName(), Objects.requireNonNull(value));
         return (B) this;
     }
 
     /**
      * Sets an attribute, using {@code attribute.getClass()} as attribute
      * <i>type</i>.
      *
-     * @param value the attribute value
+     * @param value the attribute value, not null.
      * @param key   the attribute's key, not {@code null}
      * @return this Builder, for chaining
      */
     public B set(String key, Object value) {
-        data.put(key, value);
+        data.put(key, Objects.requireNonNull(value));
         return (B) this;
     }
 
     /**
      * Sets an attribute, using {@code attribute.getClass()} as attribute
      * <i>type</i>.
      *
-     * @param value the attribute value
+     * @param value the attribute value, not null.
      * @param key   the attribute's key, not {@code null}
      * @return this Builder, for chaining
      */
     public <T> B set(Class<T> key, T value) {
-        Object old = set(key.getName(), value);
+        Object old = set(key.getName(), Objects.requireNonNull(value));
         if (old != null && old.getClass().isAssignableFrom(value.getClass())) {
             return (B) old;
         }
@@ -186,8 +186,7 @@ public <T> B set(Class<T> key, T value) {
      * @return the Builder for chaining
      */
     public B setProviderName(String provider) {
-        Objects.requireNonNull(provider);
-        set(AbstractContext.KEY_PROVIDER, provider);
+        set(AbstractContext.KEY_PROVIDER, Objects.requireNonNull(provider));
         return (B) this;
     }
 

src/main/java/javax/money/Monetary.java

@@ -12,12 +12,7 @@
  */
 package javax.money;
 
-import javax.money.spi.Bootstrap;
-import javax.money.spi.CurrencyProviderSpi;
-import javax.money.spi.MonetaryAmountsSingletonQuerySpi;
-import javax.money.spi.MonetaryAmountsSingletonSpi;
-import javax.money.spi.MonetaryCurrenciesSingletonSpi;
-import javax.money.spi.MonetaryRoundingsSingletonSpi;
+import javax.money.spi.*;
 
 import java.util.Collection;
 import java.util.List;
@@ -69,7 +64,7 @@ private static MonetaryAmountsSingletonSpi monetaryAmountsSingletonSpi() {
     /**
      * The used {@link javax.money.spi.MonetaryAmountsSingletonSpi} instance.
      */
-    private static MonetaryAmountsSingletonQuerySpi MONETARY_AMOUNTS_SINGLETON_QUERY_SPI() {
+    private static MonetaryAmountsSingletonQuerySpi monetaryAmountsSingletonQuerySpi() {
         try {
             return Bootstrap.getService(MonetaryAmountsSingletonQuerySpi.class);
         } catch (Exception e) {
@@ -84,7 +79,7 @@ private static MonetaryAmountsSingletonQuerySpi MONETARY_AMOUNTS_SINGLETON_QUERY
     /**
      * The used {@link javax.money.spi.MonetaryCurrenciesSingletonSpi} instance.
      */
-    private static MonetaryRoundingsSingletonSpi MONETARY_ROUNDINGS_SINGLETON_SPI() {
+    private static MonetaryRoundingsSingletonSpi monetaryRoundingsSingletonSpi() {
         try {
             return Optional.ofNullable(Bootstrap
                     .getService(MonetaryRoundingsSingletonSpi.class))
@@ -108,7 +103,7 @@ private Monetary() {
      * @return the set of provider names, never {@code null}.
      */
     public static Set<String> getRoundingProviderNames() {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getProviderNames();
     }
@@ -119,7 +114,7 @@ public static Set<String> getRoundingProviderNames() {
      * @return the chained list of provider names, never {@code null}.
      */
     public static List<String> getDefaultRoundingProviderChain() {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getDefaultProviderChain();
     }
@@ -133,7 +128,7 @@ public static List<String> getDefaultRoundingProviderChain() {
      * @return the (shared) default rounding instance.
      */
     public static MonetaryRounding getDefaultRounding() {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getDefaultRounding();
     }
@@ -151,7 +146,7 @@ public static MonetaryRounding getDefaultRounding() {
      * rounding, never {@code null}.
      */
     public static MonetaryRounding getRounding(CurrencyUnit currencyUnit, String... providers) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getRounding(currencyUnit, providers);
     }
@@ -169,7 +164,7 @@ public static MonetaryRounding getRounding(CurrencyUnit currencyUnit, String...
      *                                  {@link javax.money.spi.RoundingProviderSpi} instance.
      */
     public static MonetaryRounding getRounding(String roundingName, String... providers) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getRounding(roundingName, providers);
     }
@@ -184,7 +179,7 @@ public static MonetaryRounding getRounding(String roundingName, String... provid
      *                                  {@link javax.money.spi.RoundingProviderSpi} instance.
      */
     public static MonetaryRounding getRounding(RoundingQuery roundingQuery) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getRounding(roundingQuery);
     }
@@ -200,7 +195,7 @@ public static MonetaryRounding getRounding(RoundingQuery roundingQuery) {
      *                                  {@link javax.money.spi.RoundingProviderSpi} instance.
      */
     public static boolean isRoundingAvailable(String roundingName, String... providers) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .isRoundingAvailable(roundingName, providers);
     }
@@ -217,7 +212,7 @@ public static boolean isRoundingAvailable(String roundingName, String... provide
      *                                  {@link javax.money.spi.RoundingProviderSpi} instance.
      */
     public static boolean isRoundingAvailable(CurrencyUnit currencyUnit, String... providers) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .isRoundingAvailable(currencyUnit, providers);
     }
@@ -232,7 +227,7 @@ public static boolean isRoundingAvailable(CurrencyUnit currencyUnit, String... p
      *                                  {@link javax.money.spi.RoundingProviderSpi} instance.
      */
     public static boolean isRoundingAvailable(RoundingQuery roundingQuery) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .isRoundingAvailable(roundingQuery);
     }
@@ -246,7 +241,7 @@ public static boolean isRoundingAvailable(RoundingQuery roundingQuery) {
      * @return all {@link javax.money.MonetaryRounding} instances matching the query, never {@code null}.
      */
     public static Collection<MonetaryRounding> getRoundings(RoundingQuery roundingQuery) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getRoundings(roundingQuery);
     }
@@ -260,7 +255,7 @@ public static Collection<MonetaryRounding> getRoundings(RoundingQuery roundingQu
      * @return the set of custom rounding ids, never {@code null}.
      */
     public static Set<String> getRoundingNames(String... providers) {
-        return Optional.ofNullable(MONETARY_ROUNDINGS_SINGLETON_SPI()).orElseThrow(
+        return Optional.ofNullable(monetaryRoundingsSingletonSpi()).orElseThrow(
                 () -> new MonetaryException("No MonetaryRoundingsSpi loaded, query functionality is not available."))
                 .getRoundingNames(providers);
     }
@@ -275,10 +270,9 @@ public static Set<String> getRoundingNames(String... providers) {
      *                           implementation class is registered.
      */
     public static <T extends MonetaryAmount> MonetaryAmountFactory<T> getAmountFactory(Class<T> amountType) {
-        Optional.ofNullable(monetaryAmountsSingletonSpi())
+        MonetaryAmountsSingletonSpi spi = Optional.ofNullable(monetaryAmountsSingletonSpi())
                 .orElseThrow(() -> new MonetaryException("No MonetaryAmountsSingletonSpi loaded."));
-
-        MonetaryAmountFactory<T> factory = monetaryAmountsSingletonSpi().getAmountFactory(amountType);
+        MonetaryAmountFactory<T> factory = spi.getAmountFactory(amountType);
         return Optional.ofNullable(factory).orElseThrow(
                 () -> new MonetaryException("No AmountFactory available for type: " + amountType.getName()));
     }
@@ -344,7 +338,7 @@ public static Class<? extends MonetaryAmount> getDefaultAmountType() {
      */
     @SuppressWarnings("rawtypes")
 	public static MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery query) {
-        return Optional.ofNullable(MONETARY_AMOUNTS_SINGLETON_QUERY_SPI()).orElseThrow(() -> new MonetaryException(
+        return Optional.ofNullable(monetaryAmountsSingletonQuerySpi()).orElseThrow(() -> new MonetaryException(
                 "No MonetaryAmountsSingletonQuerySpi loaded, query functionality is not available."))
                 .getAmountFactory(query);
     }
@@ -356,7 +350,7 @@ public static MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery
      * @return the instances found, never null.
      */
     public static Collection<MonetaryAmountFactory<?>> getAmountFactories(MonetaryAmountFactoryQuery query) {
-        return Optional.ofNullable(MONETARY_AMOUNTS_SINGLETON_QUERY_SPI()).orElseThrow(() -> new MonetaryException(
+        return Optional.ofNullable(monetaryAmountsSingletonQuerySpi()).orElseThrow(() -> new MonetaryException(
                 "No MonetaryAmountsSingletonQuerySpi loaded, query functionality is not available."))
                 .getAmountFactories(query);
     }
@@ -369,7 +363,7 @@ public static Collection<MonetaryAmountFactory<?>> getAmountFactories(MonetaryAm
      * @return true, if at least one {@link MonetaryAmountFactory} matches the query.
      */
     public static boolean isAvailable(MonetaryAmountFactoryQuery query) {
-        return Optional.ofNullable(MONETARY_AMOUNTS_SINGLETON_QUERY_SPI()).orElseThrow(() -> new MonetaryException(
+        return Optional.ofNullable(monetaryAmountsSingletonQuerySpi()).orElseThrow(() -> new MonetaryException(
                 "No MonetaryAmountsSingletonQuerySpi loaded, query functionality is not available."))
                 .isAvailable(query);
     }

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

@@ -141,9 +141,6 @@ public static ConversionContext from(ProviderContext providerContext, RateType r
      */
     public static ConversionContext of(RateType rateType) {
         switch (rateType) {
-            default:
-            case ANY:
-                return ANY_CONVERSION;
             case DEFERRED:
                 return DEFERRED_CONVERSION;
             case HISTORIC:
@@ -152,6 +149,9 @@ public static ConversionContext of(RateType rateType) {
                 return REALTIME_CONVERSION;
             case OTHER:
                 return OTHER_CONVERSION;
+            case ANY:
+            default:
+                return ANY_CONVERSION;
         }
     }
 

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

@@ -19,7 +19,6 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
-import java.util.stream.Stream;
 
 import javax.money.CurrencyUnit;
 import javax.money.Monetary;

src/test/java/javax/money/AbstractContextBuilderTest.java

@@ -95,7 +95,7 @@ public void testSet_Float() throws Exception {
         AbstractContextBuilder b = createBuilder();
         b.set("myKey", 1.5f);
         AbstractContext ctx = b.build();
-        assertEquals(ctx.getFloat("myKey").floatValue(), 1.5f, 0.0f);
+        assertEquals(ctx.getFloat("myKey"), 1.5f, 0.0f);
     }
 
     @Test
@@ -181,8 +181,6 @@ public void testSetSet() throws Exception {
     @Test
     public void testRemoveAttributes() throws Exception {
         AbstractContextBuilder b = createBuilder();
-        Set<Number> set = new HashSet<>();
-        set.add(BigDecimal.ONE);
         b.set("myKey", "test");
         AbstractContext ctx = b.build();
         assertEquals(ctx.getText("myKey"), "test");
@@ -196,8 +194,6 @@ public void testRemoveAttributes() throws Exception {
     @Test
     public void testToString() throws Exception {
         AbstractContextBuilder b = createBuilder();
-        Set<Number> set = new HashSet<>();
-        set.add(BigDecimal.ONE);
         b.set("myKey", "test");
         String toString = b.toString();
         assertNotNull(toString);

src/test/java/javax/money/AbstractContextTest.java

@@ -144,7 +144,7 @@ private static class TestContext extends AbstractContext {
         private static final long serialVersionUID = 1L;
 
         /**
-         * Private constructor, used by {@link AbstractContext.AbstractContextBuilder}.
+         * Private constructor, used by {@link AbstractContextBuilder}.
          *
          * @param builder the Builder.
          */

src/test/java/javax/money/AbstractDynamicServiceProviderTest.java

@@ -72,7 +72,7 @@ protected final <T> void registerService(Class<T> serviceType, T service) {
 
     class TestServiceProvider implements ServiceProvider {
 
-        private Map<Class<?>, List<?>> services = new HashMap<>();
+        private final Map<Class<?>, List<?>> services = new HashMap<>();
 
         @Override
         public int getPriority() {

src/test/java/javax/money/AbstractQueryTest.java

@@ -10,14 +10,7 @@
 
 import org.testng.annotations.Test;
 
-import javax.money.convert.CurrencyConversion;
-import javax.money.convert.ExchangeRate;
-import javax.money.convert.ExchangeRateProvider;
-import javax.money.convert.MonetaryConversions;
-import java.time.LocalDate;
-import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 
 import static org.testng.Assert.*;
 

src/test/java/javax/money/DummyAmountBuilder.java

@@ -9,7 +9,7 @@
 package javax.money;
 
 /**
- * Dummy amount factory only used for testing of the {@link MonetaryAmounts} singleton's delegation
+ * Dummy amount factory only used for testing of the {@link Monetary} singleton's delegation
  * logic.
  *
  * @author Anatole Tresch

src/test/java/javax/money/DummyAmountFactoryProvider.java

@@ -11,7 +11,7 @@
 import javax.money.spi.MonetaryAmountFactoryProviderSpi;
 
 /**
- * Dummy amount factory only used for testing of the {@link MonetaryAmounts} singleton's delegation
+ * Dummy amount factory only used for testing of the {@link Monetary} singleton's delegation
  * logic.
  *
  * @author Anatole Tresch