Merge branch 'workshop-changes'

britter · britter · commit c101aa573db2 · 2013-12-13T13:27:46.000+01:00
diff --git a/src/main/java/de/codecentric/java8examples/defaultmethods/CombinedGreetingService.java b/src/main/java/de/codecentric/java8examples/defaultmethods/CombinedGreetingService.java
@@ -0,0 +1,20 @@
+package de.codecentric.java8examples.defaultmethods;
+
+/**
+ * A greeting service implementation that inherits {@link #greet()} from two unrelated interfaces. It has to provide
+ * an implementation for {@code greet()}.
+ */
+public class CombinedGreetingService implements GreetingService, AlternativeGreetingService {
+
+    /**
+     * An implementation of the {@code greet()} method which is defined in both, {@link GreetingService} and
+     * {@link AlternativeGreetingService}. This implementation simply delegates to the default {@code greet()}
+     * implementation of the {@code GreetingService} interface
+     *
+     * @return the result of calling {@link GreetingService#greet()}.
+     */
+    @Override
+    public String greet() {
+        return GreetingService.super.greet();
+    }
+}
diff --git a/src/main/java/de/codecentric/java8examples/defaultmethods/GreetingService.java b/src/main/java/de/codecentric/java8examples/defaultmethods/GreetingService.java
@@ -5,6 +5,11 @@
  */
 public interface GreetingService {
 
+    /**
+     * Creates a greeting message. The provided default implementation simply returns "Hello world!"
+     *
+     * @return A greeting message.
+     */
     default String greet() {
         return "Hello World!";
     }
diff --git a/src/test/java/de/codecentric/java8examples/defaultmethods/GreetingServiceTest.java b/src/test/java/de/codecentric/java8examples/defaultmethods/GreetingServiceTest.java
@@ -23,4 +23,10 @@ public void greetFromExtended() throws Exception {
     public void greetFromDerived() throws Exception {
         assertEquals("Salut le monde!", new DerivedGreetingService().greet());
     }
+
+    @Test
+    public void testName() throws Exception {
+        assertEquals("Hello World!", new CombinedGreetingService().greet());
+
+    }
 }
diff --git a/src/test/java/de/codecentric/java8examples/lambdas/LambdaExampleTest.java b/src/test/java/de/codecentric/java8examples/lambdas/LambdaExampleTest.java
@@ -60,6 +60,8 @@ public void peterIsOlderThan30WithTypeInference() throws Exception {
     public void getAgeFromWrappedElementViaFunctionApplication() throws Exception {
         // type is inferred from context
         assertEquals("Parker", example.apply(p -> p.getLastName()));
+        // different notation using a method reference
+        assertEquals("Parker", example.apply(Person::getLastName));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,10 @@ public void greetFromExtended() throws Exception {`
`23`	`23`	`public void greetFromDerived() throws Exception {`
`24`	`24`	`assertEquals("Salut le monde!", new DerivedGreetingService().greet());`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ @Test`
	`28`	`+ public void testName() throws Exception {`
	`29`	`+ assertEquals("Hello World!", new CombinedGreetingService().greet());`
	`30`	`+`
	`31`	`+ }`
`26`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ public void peterIsOlderThan30WithTypeInference() throws Exception {`
`60`	`60`	`public void getAgeFromWrappedElementViaFunctionApplication() throws Exception {`
`61`	`61`	`// type is inferred from context`
`62`	`62`	`assertEquals("Parker", example.apply(p -> p.getLastName()));`
	`63`	`+ // different notation using a method reference`
	`64`	`+ assertEquals("Parker", example.apply(Person::getLastName));`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`@Test`