Merge pull request #43 from otaviojava/refactor_summary

add default value to summary

Author: Otávio Santana

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

@@ -15,7 +15,6 @@
  */
 package org.javamoney.moneta.function;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -27,7 +26,7 @@
  */
 public class GroupMonetarySummaryStatistics {
 
-    private Map<CurrencyUnit, MonetarySummaryStatistics> groupSummary = new HashMap<>();
+	private Map<CurrencyUnit, MonetarySummaryStatistics> groupSummary = new MonetarySummaryMap();
 
     GroupMonetarySummaryStatistics() {
 

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

@@ -0,0 +1,115 @@
+package org.javamoney.moneta.function;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.money.CurrencyUnit;
+
+/**
+ * This map is decorator of HashMap that returns an empty Summary when there
+ * isn't currency in get's method
+ * @author otaviojava
+ */
+class MonetarySummaryMap implements
+		Map<CurrencyUnit, MonetarySummaryStatistics> {
+
+	private Map<CurrencyUnit, MonetarySummaryStatistics> map = new HashMap<>();
+
+	@Override
+	public int size() {
+		return map.size();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
+	@Override
+	public boolean containsKey(Object key) {
+		return map.containsKey(key);
+	}
+
+	@Override
+	public boolean containsValue(Object value) {
+		return map.containsValue(value);
+	}
+
+	@Override
+	public MonetarySummaryStatistics get(Object key) {
+		if (CurrencyUnit.class.isInstance(key)) {
+			CurrencyUnit unit = CurrencyUnit.class.cast(key);
+			return map.getOrDefault(unit, new MonetarySummaryStatistics(unit));
+		}
+		return map.get(key);
+	}
+
+	@Override
+	public MonetarySummaryStatistics put(CurrencyUnit key,
+			MonetarySummaryStatistics value) {
+		return map.put(key, value);
+	}
+
+	@Override
+	public MonetarySummaryStatistics remove(Object key) {
+		return map.remove(key);
+	}
+
+	@Override
+	public void putAll(
+			Map<? extends CurrencyUnit, ? extends MonetarySummaryStatistics> m) {
+		map.putAll(m);
+	}
+
+	@Override
+	public void clear() {
+		map.clear();
+	}
+
+	@Override
+	public Set<CurrencyUnit> keySet() {
+		return map.keySet();
+	}
+
+	@Override
+	public Collection<MonetarySummaryStatistics> values() {
+		return map.values();
+	}
+
+	@Override
+	public Set<java.util.Map.Entry<CurrencyUnit, MonetarySummaryStatistics>> entrySet() {
+		return map.entrySet();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (MonetarySummaryMap.class.isInstance(obj)) {
+			MonetarySummaryMap other = MonetarySummaryMap.class.cast(obj);
+			return map.equals(other.map);
+		}
+		return false;
+	}
+
+	@Override
+	public MonetarySummaryStatistics putIfAbsent(CurrencyUnit key,
+			MonetarySummaryStatistics value) {
+		MonetarySummaryStatistics v = map.get(key);
+		if (Objects.isNull(v)) {
+			v = put(key, value);
+		}
+		return v;
+	}
+
+	@Override
+	public int hashCode() {
+		return map.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return "MonetarySummaryMap: " + map.toString();
+	}
+}

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

@@ -1,11 +1,11 @@
 package org.javamoney.moneta.function;
 
-import org.javamoney.moneta.FastMoney;
-import org.javamoney.moneta.spi.MoneyUtils;
+import java.util.Objects;
 
 import javax.money.CurrencyUnit;
 import javax.money.MonetaryAmount;
-import java.util.Objects;
+
+import org.javamoney.moneta.FastMoney;
 
 /**
  * A state object for collecting statistics such as count, min, max, sum, and
@@ -43,7 +43,11 @@ public class MonetarySummaryStatistics {
      *            the input amount value to be addeed, not null.
      */
     public void accept(MonetaryAmount amount) {
-        MoneyUtils.checkAmountParameter(amount, this.empty.getCurrency());
+
+		if (!empty.getCurrency().equals(
+				Objects.requireNonNull(amount).getCurrency())) {
+			return;
+		}
         if (isEmpty()) {
             setSameMonetary(amount);
             count++;
@@ -60,6 +64,10 @@ public void accept(MonetaryAmount amount) {
      */
     public MonetarySummaryStatistics combine(MonetarySummaryStatistics summaryStatistics) {
         Objects.requireNonNull(summaryStatistics);
+
+		if (!equals(summaryStatistics)) {
+        	return this;
+        }
         min = MonetaryFunctions.min(min, summaryStatistics.min);
         max = MonetaryFunctions.max(max, summaryStatistics.max);
         sum = sum.add(summaryStatistics.sum);
@@ -126,10 +134,28 @@ public MonetaryAmount getAverage() {
 		return average;
 	}
 
+	/**
+	 * will equals when the currency utils were equals
+	 */
+	@Override
+    public boolean equals(Object obj) {
+    	if (MonetarySummaryStatistics.class.isInstance(obj)) {
+    		MonetarySummaryStatistics other = MonetarySummaryStatistics.class.cast(obj);
+			return Objects.equals(empty.getCurrency(),
+					other.empty.getCurrency());
+    	}
+    	return false;
+    }
+	@Override
+	public int hashCode() {
+		return empty.getCurrency().hashCode();
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("[count:").append(count).append(",");
+		sb.append("[currency: ").append(empty.getCurrency()).append(",");
+		sb.append("count:").append(count).append(",");
 		sb.append("min:").append(min).append(",");
 		sb.append("max:").append(max).append(",");
 		sb.append("sum:").append(sum).append(",");

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

@@ -35,7 +35,14 @@ public void acceptTest() {
 
 		Map<CurrencyUnit, MonetarySummaryStatistics> map = group.get();
 		Assert.assertEquals(map.keySet().size(), 1);
+	}
 
+	@Test
+	public void shouldReturnsAnEmptySummaryWhenCurrencyThereIsNot() {
+		GroupMonetarySummaryStatistics group = new GroupMonetarySummaryStatistics();
+		MonetarySummaryStatistics brazilianSummary = group.get().get(
+				BRAZILIAN_REAL);
+		verifySummary(brazilianSummary, 0, 0, 0L);
 	}
 
 	@Test

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

@@ -3,7 +3,7 @@
 import static org.javamoney.moneta.function.StreamFactory.BRAZILIAN_REAL;
 import static org.javamoney.moneta.function.StreamFactory.DOLLAR;
 
-import javax.money.MonetaryException;
+import javax.money.CurrencyUnit;
 
 import junit.framework.Assert;
 
@@ -31,11 +31,16 @@ public void shouldErrorWhenIsNull() {
 		summary.accept(null);
 	}
 
-	@Test(expectedExceptions = MonetaryException.class)
-	public void shouldErrorWhenIsDifferentCurrency() {
+	@Test
+	public void shouldStayEmptyWhenIsDifferentCurrency() {
 		MonetarySummaryStatistics summary = new MonetarySummaryStatistics(
 				BRAZILIAN_REAL);
 		summary.accept(Money.of(10, DOLLAR));
+		Assert.assertEquals(0L, summary.getCount());
+		Assert.assertEquals(0L, summary.getMin().getNumber().longValue());
+		Assert.assertEquals(0L, summary.getMax().getNumber().longValue());
+		Assert.assertEquals(0L, summary.getSum().getNumber().longValue());
+		Assert.assertEquals(0L, summary.getAverage().getNumber().longValue());
 	}
 
 	@Test
@@ -52,7 +57,7 @@ public void shouldBeSameValueWhenOneMonetaryIsAdded() {
 
 	@Test
 	public void addTest() {
-		MonetarySummaryStatistics summary = createSummary();
+		MonetarySummaryStatistics summary = createSummary(BRAZILIAN_REAL);
 		Assert.assertEquals(3L, summary.getCount());
 		Assert.assertEquals(10L, summary.getMin().getNumber().longValue());
 		Assert.assertEquals(110L, summary.getMax().getNumber().longValue());
@@ -62,8 +67,8 @@ public void addTest() {
 
 	@Test
 	public void combineTest() {
-		MonetarySummaryStatistics summaryA = createSummary();
-		MonetarySummaryStatistics summaryB = createSummary();
+		MonetarySummaryStatistics summaryA = createSummary(BRAZILIAN_REAL);
+		MonetarySummaryStatistics summaryB = createSummary(BRAZILIAN_REAL);
 		summaryA.combine(summaryB);
 		Assert.assertEquals(6L, summaryA.getCount());
 		Assert.assertEquals(10L, summaryA.getMin().getNumber().longValue());
@@ -72,13 +77,26 @@ public void combineTest() {
 		Assert.assertEquals(70L, summaryA.getAverage().getNumber().longValue());
 	}
 
-	private MonetarySummaryStatistics createSummary() {
+	@Test
+	public void shouldIgnoreCombineWhenCurrencyInSummaryAreDifferent() {
+		MonetarySummaryStatistics summaryA = createSummary(BRAZILIAN_REAL);
+		MonetarySummaryStatistics summaryB = createSummary(DOLLAR);
+		summaryA.combine(summaryB);
+		Assert.assertEquals(3L, summaryA.getCount());
+		Assert.assertEquals(10L, summaryA.getMin().getNumber().longValue());
+		Assert.assertEquals(110L, summaryA.getMax().getNumber().longValue());
+		Assert.assertEquals(210L, summaryA.getSum().getNumber().longValue());
+		Assert.assertEquals(70L, summaryA.getAverage().getNumber().longValue());
+	}
+
+	private MonetarySummaryStatistics createSummary(CurrencyUnit currencyUnit) {
 		MonetarySummaryStatistics summary = new MonetarySummaryStatistics(
-				BRAZILIAN_REAL);
-		summary.accept(Money.of(10, BRAZILIAN_REAL));
-		summary.accept(Money.of(90, BRAZILIAN_REAL));
-		summary.accept(Money.of(110, BRAZILIAN_REAL));
+				currencyUnit);
+		summary.accept(Money.of(10, currencyUnit));
+		summary.accept(Money.of(90, currencyUnit));
+		summary.accept(Money.of(110, currencyUnit));
 		return summary;
 	}
 
+
 }