Skip to content

Commit 4b233aa

Browse files
sayed-moinsayed-moin
committed
refactor
1 parent 854e9ca commit 4b233aa

File tree

5 files changed

+83
-56
lines changed

5 files changed

+83
-56
lines changed

‎src/main/java/com/java15/example/java8inaction/Java8_9_10_11_whatshappening/Apple.java renamed to ‎src/main/java/com/java15/example/java8inaction/Apple.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.java15.example.java8inaction.Java8_9_10_11_whatshappening;
1+
package com.java15.example.java8inaction;
22

33
public class Apple {
44

‎src/main/java/com/java15/example/java8inaction/Java8_9_10_11_whatshappening/Colors.java renamed to ‎src/main/java/com/java15/example/java8inaction/Colors.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.java15.example.java8inaction.Java8_9_10_11_whatshappening;
1+
package com.java15.example.java8inaction;
22

33
public interface Colors {
44
String GREEN ="GREEN";

‎src/main/java/com/java15/example/java8inaction/Data.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.java15.example.java8inaction;
2+
3+
import java.util.ArrayList;
4+
import java.util.Comparator;
5+
import java.util.List;
6+
7+
public class Data {
8+
public static List<Apple> getData() {
9+
Apple apple1 = new Apple(10, Colors.GREEN);
10+
Apple apple2 = new Apple(1,Colors.RED);
11+
Apple apple3 = new Apple(5,Colors.GREEN);
12+
Apple apple4 = new Apple(3,Colors.RED);
13+
Apple apple5 = new Apple(3,Colors.RED);
14+
Apple apple6 = new Apple(5,Colors.GREEN);
15+
List<Apple> apples = List.of(apple1,apple2,apple3,apple4,apple5,apple6);
16+
return apples;
17+
}
18+
19+
public static List<Apple> getData1() {
20+
Apple apple1 = new Apple(10,Colors.GREEN);
21+
Apple apple2 = new Apple(1,Colors.RED);
22+
Apple apple3 = new Apple(5,Colors.GREEN);
23+
Apple apple4 = new Apple(3,Colors.RED);
24+
Apple apple5 = new Apple(3,Colors.RED);
25+
Apple apple6 = new Apple(5,Colors.GREEN);
26+
List<Apple> apples = new ArrayList<>();
27+
apples.add(apple1);
28+
apples.add(apple2);
29+
apples.add(apple3);
30+
apples.add(apple4);
31+
apples.add(apple5);
32+
apples.add(apple6);
33+
apples.sort(Comparator.comparing(Apple::getWeight));
34+
return apples;
35+
}
36+
}

‎src/main/java/com/java15/example/java8inaction/Java8_9_10_11_whatshappening/Test.java

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.java15.example.java8inaction.Java8_9_10_11_whatshappening;
22

3+
import com.java15.example.java8inaction.Apple;
4+
import com.java15.example.java8inaction.Colors;
5+
import com.java15.example.java8inaction.Data;
6+
37
import java.io.File;
48
import java.util.*;
59
import java.util.function.Predicate;
@@ -10,8 +14,7 @@
1014
public class Test {
1115

1216
public static void main(String[] args) {
13-
List<Apple> apples = getData();
14-
// beforeJava8(apples);
17+
List<Apple> apples = Data.getData();
1518
//filterApples(apples,(Apple a) -> Colors.GREEN.equals(a.getColor())).stream().forEach(System.out::println);
1619
// filterApples(apples,(Apple a) -> Colors.GREEN.equals(a.getColor())).stream().forEach(System.out::println);
1720
// filterGroupApples(apples,(Apple a) -> Colors.RED.equals(a.getColor())).forEach((i,list) ->{System.out.println(i+""+list);});
@@ -21,16 +24,6 @@ public static void main(String[] args) {
2124
// getData1().forEach(System.out::println);
2225
}
2326

24-
private static void beforeJava8(List<Apple> apples) {
25-
final List<Apple> filteredApple = new ArrayList<>();
26-
apples.forEach(e->
27-
{
28-
if(new CustomPredicateImpl().test(e))
29-
filteredApple.add(e);
30-
});
31-
filteredApple.forEach(System.out::println);
32-
}
33-
3427
static List<Apple> filterApples(List<Apple> inventory, Predicate<Apple> p) {
3528
return inventory.stream().filter(p).collect(Collectors.toList());
3629
}
@@ -47,53 +40,11 @@ static Optional<Apple> maxAppleByWeight(List<Apple> inventory) {
4740
return inventory.stream().max(Comparator.comparing(Apple::getWeight));
4841
}
4942

50-
private static List<Apple> getData() {
51-
Apple apple1 = new Apple(10,Colors.GREEN);
52-
Apple apple2 = new Apple(1,Colors.RED);
53-
Apple apple3 = new Apple(5,Colors.GREEN);
54-
Apple apple4 = new Apple(3,Colors.RED);
55-
Apple apple5 = new Apple(3,Colors.RED);
56-
Apple apple6 = new Apple(5,Colors.GREEN);
57-
List<Apple> apples = List.of(apple1,apple2,apple3,apple4,apple5,apple6);
58-
return apples;
59-
}
60-
61-
private static List<Apple> getData1() {
62-
Apple apple1 = new Apple(10,Colors.GREEN);
63-
Apple apple2 = new Apple(1,Colors.RED);
64-
Apple apple3 = new Apple(5,Colors.GREEN);
65-
Apple apple4 = new Apple(3,Colors.RED);
66-
Apple apple5 = new Apple(3,Colors.RED);
67-
Apple apple6 = new Apple(5,Colors.GREEN);
68-
List<Apple> apples = new ArrayList<>();
69-
apples.add(apple1);
70-
apples.add(apple2);
71-
apples.add(apple3);
72-
apples.add(apple4);
73-
apples.add(apple5);
74-
apples.add(apple6);
75-
apples.sort(Comparator.comparing(Apple::getWeight));
76-
return apples;
77-
}
78-
7943
static File[] handlingFiles(){
8044
File[] hiddenFiles = new File(".").listFiles(File::isHidden);
8145
return hiddenFiles;
8246
}
8347

8448
}
8549

86-
interface CustomPredicate<T>{
87-
boolean test(T t);
88-
}
89-
90-
class CustomPredicateImpl implements CustomPredicate{
91-
92-
@Override
93-
public boolean test(Object o) {
94-
if(Colors.GREEN.equals(((Apple)o).getColor()))
95-
return true;
96-
return false;
97-
}
98-
}
9950

‎src/main/java/com/java15/example/java8inaction/passingcodewithbehaviorparameterization/Test.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.java15.example.java8inaction.passingcodewithbehaviorparameterization;
2+
3+
import com.java15.example.java8inaction.Apple;
4+
import com.java15.example.java8inaction.Colors;
5+
import com.java15.example.java8inaction.Data;
6+
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
10+
public class Test {
11+
public static void main(String[] args) {
12+
List<Apple> apples = Data.getData();
13+
beforeJava8(apples);
14+
}
15+
private static void beforeJava8(List<Apple> apples) {
16+
final List<Apple> filteredApple = new ArrayList<>();
17+
apples.forEach(e->
18+
{
19+
if(new CustomPredicateImpl().test(e))
20+
filteredApple.add(e);
21+
});
22+
filteredApple.forEach(System.out::println);
23+
}
24+
25+
}
26+
27+
28+
interface CustomPredicate<T>{
29+
boolean test(T t);
30+
}
31+
32+
class CustomPredicateImpl implements CustomPredicate{
33+
34+
@Override
35+
public boolean test(Object o) {
36+
if(Colors.GREEN.equals(((Apple)o).getColor()))
37+
return true;
38+
return false;
39+
}
40+
}

0 commit comments

Comments
 (0)