From c3563566f805ede7ad5da0973b45767cc812c70f Mon Sep 17 00:00:00 2001 From: Vikas Ramsingh Rajput Date: Fri, 11 Jun 2021 19:55:03 +0530 Subject: [PATCH] BAEL-4936: converted multiline code to one liner, also changed names of unit test methods --- .../baeldung/interfaceVsAbstractClass/CircleClass.java | 6 +----- .../interfaceVsAbstractClass/CircleInterface.java | 8 ++------ .../InterfaceVsAbstractClassUnitTest.java | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleClass.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleClass.java index b2a0cfab9f..048ffa4fe9 100644 --- a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleClass.java +++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleClass.java @@ -9,11 +9,7 @@ public abstract class CircleClass { private List allowedColors = Arrays.asList("RED", "GREEN", "BLUE"); public boolean isValid() { - if (allowedColors.contains(getColor())) { - return true; - } else { - return false; - } + return allowedColors.contains(getColor()); } public String getColor() { diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleInterface.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleInterface.java index 1e01480c3f..a0c3a6d9c6 100644 --- a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleInterface.java +++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/interfaceVsAbstractClass/CircleInterface.java @@ -7,12 +7,8 @@ public interface CircleInterface { List allowedColors = Arrays.asList("RED", "GREEN", "BLUE"); String getColor(); - + public default boolean isValid() { - if (allowedColors.contains(getColor())) { - return true; - } else { - return false; - } + return allowedColors.contains(getColor()); } } diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java index ecaacc4b21..8cba13ddeb 100644 --- a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java +++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java @@ -6,14 +6,14 @@ import org.junit.Test; public class InterfaceVsAbstractClassUnitTest { @Test - public void givenAbstractClass_whenValidCircleUsedThenPass() { + public void givenAbstractClass_whenValidCircleUsed_thenPass() { CircleClass redCircle = new ChildCircleClass(); redCircle.setColor("RED"); assertTrue(redCircle.isValid()); } @Test - public void givenInterface_whenValidCircleWithoutStateUsedThenPass() { + public void givenInterface_whenValidCircleWithoutStateUsed_thenPass() { ChidlCircleInterfaceImpl redCircleWithoutState = new ChidlCircleInterfaceImpl(); redCircleWithoutState.setColor("RED"); assertTrue(redCircleWithoutState.isValid());