Merge branch 'master' into solutions

mlex · mlex · commit 4f72662612f0 · 2013-12-04T13:41:11.000+01:00
diff --git a/src/main/java/de/codecentric/java8examples/Invoice.java b/src/main/java/de/codecentric/java8examples/Invoice.java
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
 public class Invoice {
 
     private String sender;
@@ -23,13 +25,7 @@ public List<InvoiceItem> getItems() {
     }
 
     public BigDecimal getTotal() {
-        return getItems().stream()
-                .map(invoice -> invoice
-                        .getPricePerUnit()
-                        .multiply(BigDecimal.valueOf(invoice.getQuantity())))
-                .collect(Collectors.reducing(
-                        BigDecimal.ZERO,
-                        (sum, elem) -> sum.add(elem)));
+        throw new NotImplementedException();
     }
 
     public Invoice(String sender, String recipient, List<InvoiceItem> items) {
diff --git a/src/main/java/de/codecentric/java8examples/streaming/CollectingAndReducing.java b/src/main/java/de/codecentric/java8examples/streaming/CollectingAndReducing.java
@@ -5,7 +5,9 @@
 import de.codecentric.java8examples.Person;
 
 import java.math.BigDecimal;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -117,7 +119,7 @@ public static Map<String, String> cheapestDealersByProduct(List<Invoice> invoice
     /**
      * From a given list of invoices, compute for every dealer the available products together with its price.
      */
-    public static Map<String, ProductWithPrice> computeDealerInventory(List<Invoice> invoices) {
+    public static Map<String, List<ProductWithPrice>> computeDealerInventory(List<Invoice> invoices) {
         return Collections.emptyMap();
     }
 
@@ -147,6 +149,34 @@ public String getProductName() {
         public BigDecimal getPrice() {
             return price;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            ProductWithPrice that = (ProductWithPrice) o;
+
+            if (price != null ? !price.equals(that.price) : that.price != null) return false;
+            if (productName != null ? !productName.equals(that.productName) : that.productName != null) return false;
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = productName != null ? productName.hashCode() : 0;
+            result = 31 * result + (price != null ? price.hashCode() : 0);
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "ProductWithPrice{" +
+                    "productName='" + productName + '\'' +
+                    ", price=" + price +
+                    '}';
+        }
     }
 
 }
diff --git a/src/test/java/de/codecentric/java8examples/streaming/CollectingAndReducingTest.java b/src/test/java/de/codecentric/java8examples/streaming/CollectingAndReducingTest.java
@@ -133,7 +133,28 @@ public void testCheapestDealersByProduct() throws Exception {
 
     @Test
     public void testComputeDealerInventory() throws Exception {
+        HashMap<String, List<CollectingAndReducing.ProductWithPrice>> expected = new HashMap<>();
+        for (Invoice invoice: invoices) {
+            String sender = invoice.getSender();
+            if (expected.get(sender) == null) {
+                expected.put(sender, new ArrayList<CollectingAndReducing.ProductWithPrice>());
+            }
+            List<CollectingAndReducing.ProductWithPrice> itemsOfSender = expected.get(sender);
+            for (InvoiceItem item: invoice.getItems()) {
+                CollectingAndReducing.ProductWithPrice newItem = new CollectingAndReducing.ProductWithPrice(item.getProduct(), item.getPricePerUnit());
+                if (!itemsOfSender.contains(newItem)) {
+                    itemsOfSender.add(newItem);
+                }
+            }
+        }
+
+        Map<String, List<CollectingAndReducing.ProductWithPrice>> actual =
+                CollectingAndReducing.computeDealerInventory(invoices);
 
+        assertThat(actual.keySet(), hasSize(expected.size()));
+        for (String sender: expected.keySet()) {
+            assertThat("Unexpected item set for dealer " + sender, actual.get(sender), containsInAnyOrder(expected.get(sender).toArray()));
+        }
     }
 
     @Test
diff --git a/src/test/java/de/codecentric/java8examples/streaming/FilteringAndMappingTest.java b/src/test/java/de/codecentric/java8examples/streaming/FilteringAndMappingTest.java
@@ -54,6 +54,7 @@ public void extractFirstnamesWhereLastnameStartsWith() {
 
     @Test
     public void testExtractAllProducts() throws Exception {
-	MatcherAssert.assertThat(FilteringAndMapping.extractAllProducts(invoices), containsInAnyOrder("Beer", "Burrito", "Coke"));
+	MatcherAssert.assertThat(FilteringAndMapping.extractAllProducts(invoices),
+		containsInAnyOrder("Beer", "Burger", "Corn Flakes", "Chips", "Coke", "Cake", "Left-Handed Scissors"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public void extractFirstnamesWhereLastnameStartsWith() {`
`54`	`54`
`55`	`55`	`@Test`
`56`	`56`	`public void testExtractAllProducts() throws Exception {`
`57`		`- MatcherAssert.assertThat(FilteringAndMapping.extractAllProducts(invoices), containsInAnyOrder("Beer", "Burrito", "Coke"));`
	`57`	`+ MatcherAssert.assertThat(FilteringAndMapping.extractAllProducts(invoices),`
	`58`	`+ containsInAnyOrder("Beer", "Burger", "Corn Flakes", "Chips", "Coke", "Cake", "Left-Handed Scissors"));`
`58`	`59`	`}`
`59`	`60`	`}`