missing spell

Author: otaviojava

src/main/java/org/javamoney/moneta/function/MonetaryFunctions.java

@@ -20,8 +20,9 @@
  * This singleton class provides access to the predefined monetary functions.
  *
  * @author otaviojava
+ * @author anatole
  */
-public final class MonetaryFunctions{
+public final class MonetaryFunctions {
 
 
     /**
@@ -93,13 +94,28 @@ public static Comparator<MonetaryAmount> sortNumberDesc(){
     }
 
     /**
-     * Create predicate that filters by CurrencyUnit.
-     *
-     * @param currencyUnit the target {@link javax.money.CurrencyUnit}
-     * @return the predicate from CurrencyUnit
-     */
-    public static Predicate<MonetaryAmount> isCurrency(CurrencyUnit currencyUnit){
-        return m -> m.getCurrency().equals(currencyUnit);
+	 * Create predicate that filters by CurrencyUnit.
+	 * @param currencies
+	 *            the target {@link javax.money.CurrencyUnit}
+	 * @return the predicate from CurrencyUnit
+	 */
+	public static Predicate<MonetaryAmount> isCurrency(
+			CurrencyUnit... currencies) {
+
+		if (Objects.isNull(currencies) || currencies.length == 0) {
+			return m -> true;
+		}
+		Predicate<MonetaryAmount> predicate = null;
+
+		for (CurrencyUnit currencyUnit : currencies) {
+			if (Objects.isNull(predicate)) {
+				predicate = m -> m.getCurrency().equals(currencyUnit);
+			} else {
+				predicate = predicate.or(m -> m.getCurrency().equals(
+						currencyUnit));
+			}
+		}
+		return predicate;
     }
 
     /**
@@ -108,23 +124,13 @@ public static Predicate<MonetaryAmount> isCurrency(CurrencyUnit currencyUnit){
      * @param currencyUnit the target {@link javax.money.CurrencyUnit}
      * @return the predicate from CurrencyUnit
      */
-    public static Predicate<MonetaryAmount> isNotCurrency(CurrencyUnit currencyUnit){
-        return isCurrency(currencyUnit).negate();
-    }
+	public static Predicate<MonetaryAmount> fiterByExcludingCurrency(
+			CurrencyUnit... currencies) {
 
-    /**
-     * Creates a filtering predicate based on the given currencies.
-     *
-     * @param requiredUnit first CurrencyUnit, required.
-     * @param otherUnits   - any another units, not null.
-     * @return the predicate filtering entries with one of the given currencies.
-     */
-    public static Predicate<MonetaryAmount> containsCurrencies(CurrencyUnit requiredUnit, CurrencyUnit... otherUnits){
-        Predicate<MonetaryAmount> inPredicate = isCurrency(requiredUnit);
-        for(CurrencyUnit unit : otherUnits){
-            inPredicate = inPredicate.or(isCurrency(unit));
-        }
-        return inPredicate;
+		if (Objects.isNull(currencies) || currencies.length == 0) {
+			return m -> true;
+		}
+		return isCurrency(currencies).negate();
     }
 
     /**
@@ -228,19 +234,19 @@ public static BinaryOperator<MonetaryAmount> sum(){
     }
 
     /**
-     * Creates a BinaryOperator to calculate the mininum amount
-     *
-     * @return the min BinaryOperator, not null.
-     */
+	 * Creates a BinaryOperator to calculate the minimum amount
+	 *
+	 * @return the min BinaryOperator, not null.
+	 */
     public static BinaryOperator<MonetaryAmount> min(){
         return MonetaryFunctions::min;
     }
 
     /**
-     * Creates a BinaryOperator to caclulate the maximum amount.
-     *
-     * @return the max BinaryOperator, not null.
-     */
+	 * Creates a BinaryOperator to calculate the maximum amount.
+	 *
+	 * @return the max BinaryOperator, not null.
+	 */
     public static BinaryOperator<MonetaryAmount> max(){
         return MonetaryFunctions::max;
     }

src/test/java/org/javamoney/moneta/function/MonetaryFunctionsFilterTest.java

@@ -26,18 +26,33 @@ public void isCurrencyTest() {
 
 	@Test
 	public void isNotCurrencyTest() {
-		List<MonetaryAmount> justRealList = currencies().filter(isNotCurrency(BRAZILIAN_REAL)).collect(
+		List<MonetaryAmount> justRealList = currencies().filter(fiterByExcludingCurrency(BRAZILIAN_REAL)).collect(
 				Collectors.toList());
 		Assert.assertEquals(6, justRealList.size());
 	}
 
 	@Test
-	public void ContainsCurrenciesTest() {
-		List<MonetaryAmount> justRealList = currencies().filter(containsCurrencies(BRAZILIAN_REAL, DOLLAR)).collect(
+	public void containsCurrenciesTest() {
+		List<MonetaryAmount> justRealList = currencies().filter(
+				isCurrency(BRAZILIAN_REAL, DOLLAR))
+				.collect(
 				Collectors.toList());
 		Assert.assertEquals(6, justRealList.size());
 	}
 
+	@Test
+	public void shouldReturnAllisCurrencyEmptyTest() {
+		List<MonetaryAmount> justRealList = currencies().filter(isCurrency())
+				.collect(Collectors.toList());
+		Assert.assertEquals(9, justRealList.size());
+	}
+
+	@Test
+	public void shouldReturnAllfiterByExcludingCurrencyEmptyTest() {
+		List<MonetaryAmount> justRealList = currencies().filter(
+				fiterByExcludingCurrency()).collect(Collectors.toList());
+		Assert.assertEquals(9, justRealList.size());
+	}
 	@Test
 	public void isGreaterThanTest() {
 		MonetaryAmount money = FastMoney.of(1, BRAZILIAN_REAL);