diff --git a/core-java-8/src/main/java/com/baeldung/doublecolumn/Computer.java b/core-java-8/src/main/java/com/baeldung/doublecolumn/Computer.java index d2a72ca04d..cd201eef5f 100644 --- a/core-java-8/src/main/java/com/baeldung/doublecolumn/Computer.java +++ b/core-java-8/src/main/java/com/baeldung/doublecolumn/Computer.java @@ -1,6 +1,5 @@ package com.baeldung.doublecolumn; - public class Computer { private Integer age; @@ -47,21 +46,20 @@ public class Computer { @Override public String toString() { - return "Computer{" + - "age=" + age + - ", color='" + color + '\'' + - ", healty=" + healty + - '}'; + return "Computer{" + "age=" + age + ", color='" + color + '\'' + ", healty=" + healty + '}'; } @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Computer computer = (Computer) o; - if (age != null ? !age.equals(computer.age) : computer.age != null) return false; + if (age != null ? !age.equals(computer.age) : computer.age != null) + return false; return color != null ? color.equals(computer.color) : computer.color == null; } diff --git a/core-java-8/src/main/java/com/baeldung/doublecolumn/ComputerUtils.java b/core-java-8/src/main/java/com/baeldung/doublecolumn/ComputerUtils.java index eac4db7577..bdd3675a6d 100644 --- a/core-java-8/src/main/java/com/baeldung/doublecolumn/ComputerUtils.java +++ b/core-java-8/src/main/java/com/baeldung/doublecolumn/ComputerUtils.java @@ -7,11 +7,10 @@ import java.util.List; public class ComputerUtils { + public static final ComputerPredicate after2010Predicate = (c) -> (c.getAge() > 2010); + public static final ComputerPredicate blackPredicate = (c) -> "black".equals(c.getColor()); - public static final ComputerPredicate after2010Predicate = (c ) -> ( c.getAge() > 2010 ); - public static final ComputerPredicate blackPredicate = ( c ) -> "black".equals(c.getColor()); - - public static List filter(List inventory, ComputerPredicate p){ + public static List filter(List inventory, ComputerPredicate p) { List result = new ArrayList<>(); inventory.stream().filter(p::filter).forEach(result::add); @@ -19,12 +18,10 @@ public class ComputerUtils { return result; } - - public static void repair (Computer computer){ - if(computer.getHealty()<50){ + public static void repair(Computer computer) { + if (computer.getHealty() < 50) { computer.setHealty(100); } } - } diff --git a/core-java-8/src/main/java/com/baeldung/doublecolumn/function/ComputerPredicate.java b/core-java-8/src/main/java/com/baeldung/doublecolumn/function/ComputerPredicate.java index f73e985d9c..94cf0a2be7 100644 --- a/core-java-8/src/main/java/com/baeldung/doublecolumn/function/ComputerPredicate.java +++ b/core-java-8/src/main/java/com/baeldung/doublecolumn/function/ComputerPredicate.java @@ -2,7 +2,6 @@ package com.baeldung.doublecolumn.function; import com.baeldung.doublecolumn.Computer; - @FunctionalInterface public interface ComputerPredicate { diff --git a/core-java-8/src/main/java/com/baeldung/doublecolumn/function/TriFunction.java b/core-java-8/src/main/java/com/baeldung/doublecolumn/function/TriFunction.java index f7bbc64090..50aa85c0b2 100644 --- a/core-java-8/src/main/java/com/baeldung/doublecolumn/function/TriFunction.java +++ b/core-java-8/src/main/java/com/baeldung/doublecolumn/function/TriFunction.java @@ -4,12 +4,11 @@ import java.util.Objects; import java.util.function.Function; @FunctionalInterface -public interface TriFunction { +public interface TriFunction { R apply(A a, B b, C c); - default TriFunction andThen( - Function after) { + default TriFunction andThen(Function after) { Objects.requireNonNull(after); return (A a, B b, C c) -> after.apply(apply(a, b, c)); } diff --git a/core-java-8/src/test/java/com/baeldung/doublecolumn/TestComputerUtils.java b/core-java-8/src/test/java/com/baeldung/doublecolumn/TestComputerUtils.java index 260074dde6..c46630ec13 100644 --- a/core-java-8/src/test/java/com/baeldung/doublecolumn/TestComputerUtils.java +++ b/core-java-8/src/test/java/com/baeldung/doublecolumn/TestComputerUtils.java @@ -13,43 +13,42 @@ import static com.baeldung.doublecolumn.ComputerUtils.*; public class TestComputerUtils { - @Before - public void setup (){ + public void setup() { } @After - public void tearDown(){ + public void tearDown() { } @Test - public void testFilter(){ + public void testFilter() { - Computer c1=new Computer(2015,"white"); - Computer c2=new Computer(2009,"black"); - Computer c3=new Computer(2014,"black"); + Computer c1 = new Computer(2015, "white"); + Computer c2 = new Computer(2009, "black"); + Computer c3 = new Computer(2014, "black"); - BiFunction c4Function=Computer::new; - Computer c4=c4Function.apply(2013,"white"); - BiFunction c5Function=Computer::new; - Computer c5=c5Function.apply(2010,"black"); - BiFunction c6Function=Computer::new; - Computer c6=c6Function.apply(2008,"black"); + BiFunction c4Function = Computer::new; + Computer c4 = c4Function.apply(2013, "white"); + BiFunction c5Function = Computer::new; + Computer c5 = c5Function.apply(2010, "black"); + BiFunction c6Function = Computer::new; + Computer c6 = c6Function.apply(2008, "black"); - List inventory = Arrays.asList(c1,c2,c3,c4,c5,c6); + List inventory = Arrays.asList(c1, c2, c3, c4, c5, c6); List blackComputer = filter(inventory, blackPredicate); - Assert.assertEquals("The black Computers are: ",blackComputer.size(),4); + Assert.assertEquals("The black Computers are: ", blackComputer.size(), 4); List after2010Computer = filter(inventory, after2010Predicate); - Assert.assertEquals("The Computer bought after 2010 are: ",after2010Computer.size(),3); + Assert.assertEquals("The Computer bought after 2010 are: ", after2010Computer.size(), 3); List before2011Computer = filter(inventory, c -> c.getAge() < 2011); - Assert.assertEquals("The Computer bought before 2011 are: ",before2011Computer.size(),3); + Assert.assertEquals("The Computer bought before 2011 are: ", before2011Computer.size(), 3); inventory.sort(Comparator.comparing(Computer::getAge)); - Assert.assertEquals("Oldest Computer in inventory", c6,inventory.get(0) ); + Assert.assertEquals("Oldest Computer in inventory", c6, inventory.get(0)); }