BAEL-3722: Sync article and the code (eugenp#9897)

kwoyke · web-flow · commit da14002e0e94 · 2020-08-19T14:27:29.000+02:00
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
@@ -6,8 +6,11 @@ public interface Bar {
 
     String method(String string);
 
-    default String defaultMethod() {
-        return "String from Bar";
+    default String defaultBar() {
+        return "Default String from Bar";
     }
 
+    default String defaultCommon() {
+        return "Default Common from Bar";
+    }
 }
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
@@ -6,7 +6,11 @@ public interface Baz {
 
     String method(String string);
 
-    default String defaultMethod() {
-        return "String from Baz";
+    default String defaultBaz() {
+        return "Default String from Baz";
+    }
+
+    default String defaultCommon(){
+        return "Default Common from Baz";
     }
 }
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java b/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
@@ -5,8 +5,7 @@
 public interface FooExtended extends Baz, Bar {
 
     @Override
-    default String defaultMethod() {
-        return Bar.super.defaultMethod();
+    default String defaultCommon() {
+        return Bar.super.defaultCommon();
     }
-
 }
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
@@ -39,9 +39,9 @@ public void standardFIParameter_whenReturnDefiniteString_thenCorrect() {
     @Test
     public void defaultMethodFromExtendedInterface_whenReturnDefiniteString_thenCorrect() {
         final FooExtended fooExtended = string -> string;
-        final String result = fooExtended.defaultMethod();
+        final String result = fooExtended.defaultCommon();
 
-        assertEquals("String from Bar", result);
+        assertEquals("Default Common from Bar", result);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,11 @@ public interface Bar {`
`6`	`6`
`7`	`7`	`String method(String string);`
`8`	`8`
`9`		`- default String defaultMethod() {`
`10`		`- return "String from Bar";`
	`9`	`+ default String defaultBar() {`
	`10`	`+ return "Default String from Bar";`
`11`	`11`	`}`
`12`	`12`
	`13`	`+ default String defaultCommon() {`
	`14`	`+ return "Default Common from Bar";`
	`15`	`+ }`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@ public interface Baz {`
`6`	`6`
`7`	`7`	`String method(String string);`
`8`	`8`
`9`		`- default String defaultMethod() {`
`10`		`- return "String from Baz";`
	`9`	`+ default String defaultBaz() {`
	`10`	`+ return "Default String from Baz";`
	`11`	`+ }`
	`12`	`+`
	`13`	`+ default String defaultCommon(){`
	`14`	`+ return "Default Common from Baz";`
`11`	`15`	`}`
`12`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`public interface FooExtended extends Baz, Bar {`
`6`	`6`
`7`	`7`	`@Override`
`8`		`- default String defaultMethod() {`
`9`		`- return Bar.super.defaultMethod();`
	`8`	`+ default String defaultCommon() {`
	`9`	`+ return Bar.super.defaultCommon();`
`10`	`10`	`}`
`11`		`-`
`12`	`11`	`}`