BAEL-4936: converted multiline code to one liner, also changed names of unit test methods

Vikas Ramsingh Rajput · Vikas Ramsingh Rajput · commit 4aa72e62510c · 2021-06-11T19:55:03.000+05:30
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
@@ -9,11 +9,7 @@ public abstract class CircleClass {
     private List<String> 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
@@ -7,12 +7,8 @@ public interface CircleInterface {
     List<String> 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
@@ -6,14 +6,14 @@
 
 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());

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,8 @@ public interface CircleInterface {`
`7`	`7`	`List<String> allowedColors = Arrays.asList("RED", "GREEN", "BLUE");`
`8`	`8`
`9`	`9`	`String getColor();`
`10`		`-`
	`10`	`+`
`11`	`11`	`public default boolean isValid() {`
`12`		`- if (allowedColors.contains(getColor())) {`
`13`		`- return true;`
`14`		`- } else {`
`15`		`- return false;`
`16`		`- }`
	`12`	`+ return allowedColors.contains(getColor());`
`17`	`13`	`}`
`18`	`14`	`}`