Merge pull request #50 from JavaMoney/remove_method_monetary_operator

keilw · keilw · commit f2c78c855b57 · 2015-05-04T13:33:19.000+02:00
Removes identity on MonetaryOperator
diff --git a/src/main/java/javax/money/AbstractContext.java b/src/main/java/javax/money/AbstractContext.java
@@ -44,7 +44,6 @@ public abstract class AbstractContext implements Serializable {
      *
      * @param builder the Builder.
      */
-	@SuppressWarnings("rawtypes")
 	protected AbstractContext(AbstractContextBuilder<?, ?> builder) {
         data.putAll(builder.data);
     }
@@ -135,7 +134,6 @@ public Integer getInt(String key) {
      * @param key the attribute's key, not null.
      * @return the value, or null.
      */
-    @SuppressWarnings("BooleanMethodNameMustStartWithQuestion")
     public Boolean getBoolean(String key) {
         return get(key, Boolean.class);
     }
diff --git a/src/main/java/javax/money/AbstractContextBuilder.java b/src/main/java/javax/money/AbstractContextBuilder.java
@@ -22,7 +22,7 @@
  * <p>
  * Instances of this class are not thread-safe and not serializable.
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public abstract class AbstractContextBuilder<B extends AbstractContextBuilder, C extends AbstractContext>{
 
     /**
@@ -190,35 +190,6 @@ public B setProviderName(String provider) {
         set(AbstractContext.KEY_PROVIDER, provider);
         return (B) this;
     }
-//
-//    /**
-//     * Set the target timestamp in UTC millis. This allows to select historical roundings that were valid in the
-//     * past. Its implementation specific, to what extend historical roundings are available. By default if this
-//     * property is not set always current {@link  javax.money.MonetaryRounding} instances are provided.
-//     *
-//     * @param timestamp the target timestamp
-//     * @return this instance for chaining
-//     * @see #setTimestamp(java.time.temporal.TemporalAccessor)
-//     */
-//    public B setTimestampMillis(long timestamp){
-//        set(AbstractContext.KEY_TIMESTAMP, timestamp);
-//        return (B) this;
-//    }
-//
-//    /**
-//     * Set the target timestamp as {@link java.time.temporal.TemporalAccessor}. This allows to select historical
-//     * roundings that were valid in the past. Its implementation specific, to what extend historical roundings
-//     * are available. By default if this property is not set always current {@link  javax.money.MonetaryRounding}
-//     * instances are provided.
-//     *
-//     * @param timestamp the target timestamp
-//     * @return this instance for chaining
-//     * @see #setTimestampMillis(long)
-//     */
-//	public B setTimestamp(LocalDateTime timestamp) {
-//        set(AbstractContext.KEY_TIMESTAMP, Objects.requireNonNull(timestamp));
-//        return (B) this;
-//    }
 
     /**
      * Removes an entry of a certain keys. This can be useful, when a context is initialized with another
@@ -243,12 +214,6 @@ public B removeAttributes(String... keys) {
      */
     public abstract C build();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see Object#toString()
-     */
-
     @Override
     public String toString(){
         return getClass().getSimpleName() + " [attributes:\n" + new TreeMap<>(data).toString() + ']';
diff --git a/src/main/java/javax/money/AbstractQuery.java b/src/main/java/javax/money/AbstractQuery.java
@@ -21,7 +21,9 @@
  */
 public abstract class AbstractQuery extends AbstractContext {
 
-    /**
+	private static final long serialVersionUID = 5309190820845869327L;
+
+	/**
      * Key for storing the target providers to be queried
      */
     protected static final String KEY_QUERY_PROVIDERS = "Query.providers";
@@ -42,7 +44,7 @@ public abstract class AbstractQuery extends AbstractContext {
      *
      * @param builder the builder, not null.
      */
-    protected AbstractQuery(AbstractQueryBuilder builder) {
+    protected AbstractQuery(@SuppressWarnings("rawtypes") AbstractQueryBuilder builder) {
         super(builder);
     }
 
diff --git a/src/main/java/javax/money/AbstractQueryBuilder.java b/src/main/java/javax/money/AbstractQueryBuilder.java
@@ -21,6 +21,7 @@
  * <p>
  * Instances of this class are not thread-safe and not serializable.
  */
+@SuppressWarnings("rawtypes")
 public abstract class AbstractQueryBuilder<B extends javax.money.AbstractQueryBuilder, C extends AbstractQuery>
         extends AbstractContextBuilder<B, C> {
 
diff --git a/src/main/java/javax/money/CurrencyContext.java b/src/main/java/javax/money/CurrencyContext.java
@@ -28,7 +28,10 @@
  */
 public final class CurrencyContext extends AbstractContext implements Serializable{
 
-    /**
+	private static final long serialVersionUID = 8450310852172607016L;
+
+
+	/**
      * Constructor, used from the {@link javax.money.CurrencyContextBuilder}.
      *
      * @param builder the corresponding builder, not null.
diff --git a/src/main/java/javax/money/CurrencyQuery.java b/src/main/java/javax/money/CurrencyQuery.java
@@ -31,7 +31,9 @@
 @SuppressWarnings("unchecked")
 public final class CurrencyQuery extends AbstractQuery implements Serializable {
 
-    /**
+	private static final long serialVersionUID = -5117949582074719190L;
+
+	/**
      * Key for storing a countries to be queried.
      */
     static final String KEY_QUERY_COUNTRIES = "Query.countries";
diff --git a/src/main/java/javax/money/Monetary.java b/src/main/java/javax/money/Monetary.java
@@ -5,9 +5,9 @@
  * 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-2015, Credit Suisse All rights reserved.
  */
 package javax.money;
@@ -18,6 +18,7 @@
 import javax.money.spi.MonetaryAmountsSingletonSpi;
 import javax.money.spi.MonetaryCurrenciesSingletonSpi;
 import javax.money.spi.MonetaryRoundingsSingletonSpi;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -373,7 +374,8 @@ public static Class<? extends MonetaryAmount> getDefaultAmountType() {
      * @param query the factory query, not null.
      * @return the factory found, or null.
      */
-    public static MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery query) {
+    @SuppressWarnings("rawtypes")
+	public static MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery query) {
         return Optional.ofNullable(MONETARY_AMOUNTS_SINGLETON_QUERY_SPI).orElseThrow(() -> new MonetaryException(
                 "No MonetaryAmountsSingletonQuerySpi loaded, query functionality is not available."))
                 .getAmountFactory(query);
diff --git a/src/main/java/javax/money/MonetaryAmountFactoryQuery.java b/src/main/java/javax/money/MonetaryAmountFactoryQuery.java
@@ -27,7 +27,9 @@
  */
 public final class MonetaryAmountFactoryQuery extends AbstractQuery implements Serializable {
 
-    /**
+	private static final long serialVersionUID = -6961037049540444782L;
+
+	/**
      * Key name for the context.
      */
     private static final String KEY_PRECISION = "precision";
diff --git a/src/main/java/javax/money/MonetaryContext.java b/src/main/java/javax/money/MonetaryContext.java
@@ -28,7 +28,9 @@
  */
 public final class MonetaryContext extends AbstractContext implements Serializable {
 
-    /**
+	private static final long serialVersionUID = 500722564420978659L;
+
+	/**
      * Constant that defines under which key the amount type is stored in the context map.
      */
     static final String AMOUNT_TYPE = "amountType";
diff --git a/src/main/java/javax/money/MonetaryOperator.java b/src/main/java/javax/money/MonetaryOperator.java
@@ -65,11 +65,4 @@ public interface MonetaryOperator{
      */
     MonetaryAmount apply(MonetaryAmount amount);
 
-    /**
-     * Returns a function that always returns its input argument.
-     * @return an operator  that always returns its input argument
-     */
-    static MonetaryOperator identity() {
-        return m -> m;
-    }
 }
diff --git a/src/main/java/javax/money/NumberValue.java b/src/main/java/javax/money/NumberValue.java
@@ -176,8 +176,8 @@ public abstract class NumberValue extends Number implements Comparable<NumberVal
     public abstract long getAmountFractionDenominator();
 
     @Override
-    public int compareTo(@SuppressWarnings("NullableProblems") NumberValue o) {
-        return numberValue(BigDecimal.class).compareTo(o.numberValue(BigDecimal.class));
+    public int compareTo(NumberValue other) {
+        return numberValue(BigDecimal.class).compareTo(other.numberValue(BigDecimal.class));
     }
 
 }
diff --git a/src/main/java/javax/money/RoundingQuery.java b/src/main/java/javax/money/RoundingQuery.java
@@ -26,7 +26,9 @@
  */
 public final class RoundingQuery extends AbstractQuery implements CurrencySupplier {
 
-    /**
+	private static final long serialVersionUID = -9088736532066489061L;
+
+	/**
      * Attribute key used for the rounding name attribute.
      */
     static final String KEY_QUERY_ROUNDING_NAME = "Query.roundingName";
@@ -76,7 +78,8 @@ public Integer getScale() {
      *
      * @return the CurrencyUnit, or null.
      */
-    public CurrencyUnit getCurrency() {
+    @Override
+	public CurrencyUnit getCurrency() {
         return get(CurrencyUnit.class);
     }
 
diff --git a/src/main/java/javax/money/convert/MonetaryConversions.java b/src/main/java/javax/money/convert/MonetaryConversions.java
@@ -187,7 +187,7 @@ public static ExchangeRateProvider getExchangeRateProvider(String... providers){
 	/**
 	 * Access an instance of {@link CurrencyConversion} using the
 	 * {@link ExchangeRateProviderSupplier}.
-	 * 
+	 *
 	 * @param provider
 	 *            the exchange rate provider.
 	 * @param providers
@@ -246,7 +246,6 @@ public static boolean isExchangeRateProviderAvailable(ConversionQuery conversion
      *
      * @return all supported provider ids, never {@code null}.
      */
-    @SuppressWarnings("ConstantConditions")
     public static Collection<String> getConversionProviderNames(){
         Collection<String> providers = Optional.ofNullable(MONETARY_CONVERSION_SPI).orElseThrow(
                 () -> new MonetaryException(
diff --git a/src/main/java/javax/money/format/AmountFormatQuery.java b/src/main/java/javax/money/format/AmountFormatQuery.java
@@ -28,7 +28,9 @@
  */
 public final class AmountFormatQuery extends AbstractQuery {
 
-    /**
+
+	private static final long serialVersionUID = 5848832058616502383L;
+	/**
      * Key used for the format name attribute.
      */
     static final String KEY_QUERY_FORMAT_NAME = "Query.formatName";
@@ -66,7 +68,8 @@ public Locale getLocale() {
      *
      * @return the monetary context, or {@code null}.
      */
-    public MonetaryAmountFactory getMonetaryAmountFactory() {
+    @SuppressWarnings("rawtypes")
+	public MonetaryAmountFactory getMonetaryAmountFactory() {
         MonetaryAmountFactory factory = get(MonetaryAmountFactory.class);
         if (factory == null) {
             return Monetary.getDefaultAmountFactory();
diff --git a/src/main/java/javax/money/format/MonetaryFormats.java b/src/main/java/javax/money/format/MonetaryFormats.java
@@ -156,7 +156,6 @@ public static Set<Locale> getAvailableLocales(String... providers) {
      *
      * @return the provider names, never null.
      */
-    @SuppressWarnings("ConstantConditions")
     public static Collection<String> getFormatProviderNames() {
         Collection<String> providers = Optional.ofNullable(MONETARY_FORMATS_SINGLETON_SPI).orElseThrow(
                 () -> new MonetaryException(
@@ -203,7 +202,8 @@ public static final class DefaultMonetaryFormatsSingletonSpi implements Monetary
          *                                       .MonetaryAmountFormatProviderSpi} can provide a
          *                                       corresponding {@link javax.money.format.MonetaryAmountFormat} instance.
          */
-        public Collection<MonetaryAmountFormat> getAmountFormats(AmountFormatQuery formatQuery) {
+        @Override
+		public Collection<MonetaryAmountFormat> getAmountFormats(AmountFormatQuery formatQuery) {
             Collection<MonetaryAmountFormat> result = new ArrayList<>();
             for (MonetaryAmountFormatProviderSpi spi : Bootstrap.getServices(MonetaryAmountFormatProviderSpi.class)) {
                 Collection<MonetaryAmountFormat> formats = spi.getAmountFormats(formatQuery);
@@ -239,7 +239,8 @@ public List<String> getDefaultProviderChain() {
          *
          * @return all available locales, never {@code null}.
          */
-        public Set<Locale> getAvailableLocales(String... providerNames) {
+        @Override
+		public Set<Locale> getAvailableLocales(String... providerNames) {
             Set<Locale> locales = new HashSet<>();
             Collection<MonetaryAmountFormatProviderSpi> spis = getSpis(providerNames);
             for (MonetaryAmountFormatProviderSpi spi : spis) {
diff --git a/src/main/java/javax/money/spi/Bootstrap.java b/src/main/java/javax/money/spi/Bootstrap.java
@@ -25,7 +25,6 @@ public final class Bootstrap {
     /**
      * The ServiceProvider used.
      */
-    @SuppressWarnings("StaticNonFinalField")
     private static volatile ServiceProvider serviceProviderDelegate;
     /**
      * The shared lock instance user.
@@ -43,7 +42,6 @@ private Bootstrap() {
      *
      * @return {@link ServiceProvider} to be used for loading the services.
      */
-    @SuppressWarnings("LoopStatementThatDoesntLoop")
     private static ServiceProvider loadDefaultServiceProvider() {
         try {
             for (ServiceProvider sp : ServiceLoader.load(ServiceProvider.class)) {
diff --git a/src/main/java/javax/money/spi/DefaultServiceProvider.java b/src/main/java/javax/money/spi/DefaultServiceProvider.java
@@ -24,7 +24,7 @@
  */
 class DefaultServiceProvider implements ServiceProvider {
     /** List of services loaded, per class. */
-    private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Class<?>, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
 
     @Override
     public int getPriority() {
diff --git a/src/main/java/javax/money/spi/MonetaryAmountsSingletonQuerySpi.java b/src/main/java/javax/money/spi/MonetaryAmountsSingletonQuerySpi.java
@@ -11,6 +11,7 @@
 import javax.money.MonetaryAmount;
 import javax.money.MonetaryAmountFactory;
 import javax.money.MonetaryAmountFactoryQuery;
+
 import java.util.Collection;
 import java.util.stream.Collectors;
 
@@ -93,7 +94,8 @@ default Collection<Class<? extends MonetaryAmount>> getAmountTypes(MonetaryAmoun
      * @param query the factory query, not null.
      * @return the type found, or null.
      */
-    default MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery query) {
+    @SuppressWarnings("rawtypes")
+	default MonetaryAmountFactory getAmountFactory(MonetaryAmountFactoryQuery query) {
         Collection<MonetaryAmountFactory<?>> factories = getAmountFactories(query);
         if (factories.isEmpty()) {
             return null;
diff --git a/src/test/java/javax/money/AbstractContextBuilderTest.java b/src/test/java/javax/money/AbstractContextBuilderTest.java
@@ -18,14 +18,18 @@
 
 import static org.testng.Assert.*;
 
+@SuppressWarnings("rawtypes")
 public class AbstractContextBuilderTest {
 
-    private AbstractContextBuilder<AbstractContextBuilder, AbstractContext> createBuilder() {
+
+	@SuppressWarnings("unchecked")
+	private AbstractContextBuilder<AbstractContextBuilder, AbstractContext> createBuilder() {
         //noinspection unchecked
         return new AbstractContextBuilder() {
             @Override
             public AbstractContext build() {
                 return new AbstractContext(this) {
+					private static final long serialVersionUID = -5720498720434069240L;
                 };
             }
         };
@@ -174,7 +178,6 @@ public void testSetSet() throws Exception {
         assertEquals(ctx.get("myKey", Set.class), set);
     }
 
-    @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
     @Test
     public void testRemoveAttributes() throws Exception {
         AbstractContextBuilder b = createBuilder();
@@ -190,7 +193,6 @@ public void testRemoveAttributes() throws Exception {
         assertEquals(ctx.getText("myKey"), null);
     }
 
-    @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
     @Test
     public void testToString() throws Exception {
         AbstractContextBuilder b = createBuilder();
diff --git a/src/test/java/javax/money/AbstractQueryTest.java b/src/test/java/javax/money/AbstractQueryTest.java
@@ -17,14 +17,15 @@
 /**
  * Test class for {@link javax.money.AbstractQuery} and  {@link javax.money.AbstractQueryBuilder}.
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class AbstractQueryTest {
 
-    private AbstractQueryBuilder<AbstractQueryBuilder, AbstractQuery> createBuilder() {
+	private AbstractQueryBuilder<AbstractQueryBuilder, AbstractQuery> createBuilder() {
         return new AbstractQueryBuilder() {
             @Override
             public AbstractQuery build() {
                 return new AbstractQuery(this) {
+					private static final long serialVersionUID = 7131918476096875127L;
                 };
             }
         };
diff --git a/src/test/java/javax/money/DummyAmount.java b/src/test/java/javax/money/DummyAmount.java
@@ -52,7 +52,7 @@ public CurrencyContext getContext() {
             }
 
             @Override
-            public int compareTo(@SuppressWarnings("NullableProblems") CurrencyUnit o) {
+            public int compareTo(CurrencyUnit o) {
                 return 0;
             }
         };
diff --git a/src/test/java/javax/money/MonetaryAmountsTest.java b/src/test/java/javax/money/MonetaryAmountsTest.java
diff --git a/src/test/java/javax/money/TestCurrency.java b/src/test/java/javax/money/TestCurrency.java
diff --git a/src/test/java/javax/money/TestCurrencyProvider.java b/src/test/java/javax/money/TestCurrencyProvider.java
diff --git a/src/test/java/javax/money/convert/DefaultExchangeRate.java b/src/test/java/javax/money/convert/DefaultExchangeRate.java
diff --git a/src/test/java/javax/money/format/AmountFormatContextTest.java b/src/test/java/javax/money/format/AmountFormatContextTest.java
diff --git a/src/test/java/javax/money/spi/MonetaryAmountFactoryProviderSpiTest.java b/src/test/java/javax/money/spi/MonetaryAmountFactoryProviderSpiTest.java

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public abstract class AbstractContext implements Serializable {`
`44`	`44`	`*`
`45`	`45`	`* @param builder the Builder.`
`46`	`46`	`*/`
`47`		`- @SuppressWarnings("rawtypes")`
`48`	`47`	`protected AbstractContext(AbstractContextBuilder<?, ?> builder) {`
`49`	`48`	`data.putAll(builder.data);`
`50`	`49`	`}`
`@@ -135,7 +134,6 @@ public Integer getInt(String key) {`
`135`	`134`	`* @param key the attribute's key, not null.`
`136`	`135`	`* @return the value, or null.`
`137`	`136`	`*/`
`138`		`- @SuppressWarnings("BooleanMethodNameMustStartWithQuestion")`
`139`	`137`	`public Boolean getBoolean(String key) {`
`140`	`138`	`return get(key, Boolean.class);`
`141`	`139`	`}`