Merge pull request #39 from otaviojava/clean_code

Removed some unnecessary cast and Array creation.

Author: atsticks

src/main/java/javax/money/AbstractContext.java

@@ -5,7 +5,7 @@
  * DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE
  * AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE"
  * BUTTON AT THE BOTTOM OF THIS PAGE. Specification: JSR-354 Money and Currency
- * API ("Specification") Copyright (c) 2012-2013, Credit Suisse All rights
+ * API ("Specification") Copyright (c) 2012-2013, Credit SUISSE All rights
  * reserved.
  */
 package javax.money;
@@ -18,7 +18,7 @@
 
 /**
  * Represents a general context of data targeting an item of type {@code Q}. Contexts are used to add arbitrary
- * data that cannot be be mapped in a atandard way to the money API, e.g. use case or customer specific
+ * data that cannot be be mapped in a standard way to the money API, e.g. use case or customer specific
  * extensions os specialities.<p>
  * Superclasses of this class must be final, immutable, serializable and thread-safe.
  */
@@ -47,7 +47,7 @@ public abstract class AbstractContext implements Serializable{
     @SuppressWarnings({"unchecked", "rawtypes"})
     protected AbstractContext(AbstractContextBuilder<?,?> builder){
         for(Map.Entry<Class,Map<Object,Object>> en : ((Map<Class,Map<Object,Object>>) builder.data).entrySet()){
-            Map<Object,Object> presentMap = (Map<Object,Object>) this.data.get(en.getKey());
+            Map<Object,Object> presentMap = this.data.get(en.getKey());
             if(presentMap == null){
                 presentMap = new HashMap<>(en.getValue());
                 this.data.put(en.getKey(), presentMap);

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

@@ -357,7 +357,7 @@ public <T> B set(Object key, T value, Class<? extends T> type){
     @Override
     public String toString(){
         StringBuilder attrsBuilder = new StringBuilder();
-        for(Map.Entry<Class,Map<Object,Object>> en : ((Map<Class,Map<Object,Object>>) this.data).entrySet()){
+        for(Map.Entry<Class,Map<Object,Object>> en : this.data.entrySet()){
 
             Map<Object,Object> sortedMap = new TreeMap<>(Comparator.comparing(Object::toString));
             sortedMap.putAll(en.getValue());

src/main/java/javax/money/RoundingContext.java

@@ -59,7 +59,7 @@ public String getRoundingName(){
      * @return the target CurrencyUnit, or null.
      */
     public CurrencyUnit getCurrency(){
-        return get(CurrencyUnit.class, (CurrencyUnit) null);
+        return get(CurrencyUnit.class, null);
     }
 
     /**

src/main/java/javax/money/RoundingQuery.java

@@ -75,7 +75,7 @@ public Integer getScale(){
      * @return the CurrencyUnit, or null.
      */
     public CurrencyUnit getCurrency(){
-        return get(CurrencyUnit.class, (CurrencyUnit) null);
+        return get(CurrencyUnit.class, null);
     }
 
     /**

src/main/java/javax/money/spi/MonetaryAmountsSingletonQuerySpi.java

@@ -11,9 +11,8 @@
 import javax.money.MonetaryAmount;
 import javax.money.MonetaryAmountFactory;
 import javax.money.MonetaryAmountFactoryQuery;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * SPI (core) for the backing implementation of the {@link javax.money.MonetaryAmounts} singleton, implementing
@@ -48,7 +47,7 @@ public interface MonetaryAmountsSingletonQuerySpi{
      *                                       the required
      *                                       {@link javax.money.MonetaryContext}.
      */
-    Collection<MonetaryAmountFactory<?>> getAmountFactories(MonetaryAmountFactoryQuery query);
+    Collection<MonetaryAmountFactory<? extends MonetaryAmount>> getAmountFactories(MonetaryAmountFactoryQuery query);
 
     /**
      * Checks if an {@link javax.money.MonetaryAmountFactory} is matching the given query.
@@ -83,12 +82,8 @@ default Class<? extends MonetaryAmount> getAmountType(MonetaryAmountFactoryQuery
      * @return the type found, or null.
      */
     default Collection<Class<? extends MonetaryAmount>> getAmountTypes(MonetaryAmountFactoryQuery query){
-        Collection<MonetaryAmountFactory<?>> factories = getAmountFactories(query);
-        List<Class<? extends MonetaryAmount>> result = new ArrayList<>();
-        for(MonetaryAmountFactory<?> f : factories){
-            result.add(f.getAmountType());
-        }
-        return result;
+        Collection<MonetaryAmountFactory<? extends  MonetaryAmount>> factories = getAmountFactories(query);
+        return factories.stream().map(MonetaryAmountFactory::getAmountType).collect(Collectors.toList());
     }
 
     /**

src/test/java/javax/money/UnknownCurrencyExceptionTest.java

@@ -13,13 +13,17 @@
 import org.testng.annotations.Test;
 
 import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import static org.testng.Assert.*;
 
 /**
  * Created by Anatole on 05.03.14.
  */
-public class UnknownCurrencyExceptionTest{
+public class UnknownCurrencyExceptionTest {
+
+    private static final Logger LOGGER = Logger.getLogger(UnknownCurrencyExceptionTest.class.getName());
     @Test
     public void testGetCurrencyCode() throws Exception{
         UnknownCurrencyException e = new UnknownCurrencyException("GGG");
@@ -34,7 +38,7 @@ public void testGetLocale() throws Exception{
         UnknownCurrencyException e = new UnknownCurrencyException(Locale.CANADA_FRENCH);
         assertEquals(Locale.CANADA_FRENCH, e.getLocale());
         assertNull(e.getCurrencyCode());
-        System.out.println(e);
+        LOGGER.log(Level.INFO, e.getMessage(), e);
         assertTrue(e.toString().contains(Locale.CANADA_FRENCH.toString()));
         assertTrue(e.toString().contains("UnknownCurrencyException"));
     }

src/test/java/javax/money/convert/ExchangeRate_BuilderTest.java

@@ -66,7 +66,7 @@ public void testGetSetExchangeRateChain(){
         ExchangeRate rate =
                 b.setFactor(TestNumberValue.of(9)).setContext(ConversionContext.of("test", RateType.DEFERRED)).build();
         assertEquals(rate.getFactor().numberValue(BigDecimal.class), BigDecimal.valueOf(9));
-        assertEquals(rate.getExchangeRateChain(), Arrays.asList(new ExchangeRate[]{rate1, rate2}));
+        assertEquals(rate.getExchangeRateChain(), Arrays.asList(rate1, rate2));
     }
 
     @Test

src/test/java/javax/money/convert/TestMonetaryConversionsSingletonSpi.java

@@ -28,7 +28,6 @@ public class TestMonetaryConversionsSingletonSpi implements MonetaryConversionsS
 
     @Override
     public ExchangeRateProvider getExchangeRateProvider(ConversionQuery conversionQuery){
-        Collection<ExchangeRateProvider> providers = null;
 
         if(conversionQuery.getProviders().isEmpty() || conversionQuery.getProviders().contains("test")){
             return provider;
@@ -48,7 +47,7 @@ public boolean isConversionAvailable(ConversionQuery conversionQuery){
 
     @Override
     public Collection<String> getProviderNames(){
-        return Arrays.asList(new String[]{"test"});
+        return Arrays.asList("test");
     }
 
     @Override

src/test/java/javax/money/spi/BootstrapTest.java

@@ -59,7 +59,7 @@ public void testGetServices() throws Exception{
     @Test
     public void testGetServicesWithDefault() throws Exception{
         Collection<Object> services = Collection.class
-                .cast(Bootstrap.getServices(Boolean.class, Arrays.asList(new Boolean[]{Boolean.FALSE, Boolean.TRUE})));
+                .cast(Bootstrap.getServices(Boolean.class, Arrays.asList(Boolean.FALSE, Boolean.TRUE)));
         assertNotNull(services);
         assertFalse(services.isEmpty());
         assertTrue(services.size() == 2);
@@ -92,27 +92,27 @@ public final static class TestServiceProvider extends DefaultServiceProvider
         @Override
         public <T> List<T> getServices(Class<T> serviceType){
             if(String.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new String[]{"service1", "service2"}));
+                return List.class.cast(Arrays.asList("service1", "service2"));
             }
             else if(Integer.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new Integer[]{5}));
+                return List.class.cast(Arrays.asList(5));
             }
             else if(Long.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new Long[]{(long) 111}));
+                return List.class.cast(Arrays.asList((long) 111));
             }
             return super.getServices(serviceType);
         }
 
         @Override
         public <T> List<T> getServices(Class<T> serviceType, List<T> defaultList){
             if(String.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new String[]{"service1", "service2"}));
+                return List.class.cast(Arrays.asList("service1", "service2"));
             }
             else if(Integer.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new Integer[]{5}));
+                return List.class.cast(Arrays.asList(5));
             }
             else if(Long.class.equals(serviceType)){
-                return List.class.cast(Arrays.asList(new Long[]{(long) 111}));
+                return List.class.cast(Arrays.asList((long) 111));
             }
             return super.getServices(serviceType, defaultList);
         }