Skip to content

Commit 41bcaea

Browse files
committed
extracting methods, renaming, tests fix
1 parent 265d0c4 commit 41bcaea

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/main/java/job/JobTitle.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,20 @@ public enum JobTitle {
1919
private static ImmutableSet<JobTitle> OPERATIONAL =
2020
ImmutableSet.of(MANAGER, OFFICER);
2121

22-
public static Predicate<JobTitle> isAdministrative() {
23-
return title -> ADMINISTRATION.contains(title);
22+
public boolean isAdministration() {
23+
return ADMINISTRATION.contains(this);
2424
}
2525

26-
public static Predicate<JobTitle> isOperational() {
27-
return title -> OPERATIONAL.contains(title);
26+
public boolean isOperational() {
27+
return OPERATIONAL.contains(this);
2828
}
2929

30-
public static Predicate<JobTitle> isBusiness() {
31-
return isAdministrative().or(isOperational());
30+
public static Predicate<JobTitle> administration() {
31+
return JobTitle::isAdministration;
32+
}
33+
34+
public static Predicate<JobTitle> operational() {
35+
return JobTitle::isOperational;
3236
}
3337

3438
public static Stream<JobTitle> stream() {

src/test/java/job/JobTitleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.junit.Test;
44

5-
import static job.JobTitle.isBusiness;
5+
import static job.JobTitle.*;
66

77
/**
88
* Created by mtumilowicz on 2018-11-07.
@@ -12,7 +12,7 @@ public class JobTitleTest {
1212
@Test
1313
public void isBusinessShowcase() {
1414
JobTitle.stream()
15-
.filter(isBusiness())
15+
.filter(administration().or(operational()))
1616
.forEach(title -> System.out.println("Performed action for: " + title));
1717
}
1818
}

0 commit comments

Comments
 (0)