Committed by
Gerrit Code Review
Simplify expression and statement
Change-Id: I66cc2bee3a929108c7b4451b3d64c9aac4dcf5d6
Showing
2 changed files
with
3 additions
and
7 deletions
... | @@ -53,12 +53,8 @@ public abstract class BooleanConstraint implements Constraint { | ... | @@ -53,12 +53,8 @@ public abstract class BooleanConstraint implements Constraint { |
53 | 53 | ||
54 | @Override | 54 | @Override |
55 | public boolean validate(Path path, LinkResourceService resourceService) { | 55 | public boolean validate(Path path, LinkResourceService resourceService) { |
56 | - for (Link link : path.links()) { | 56 | + return path.links().stream() |
57 | - if (!isValid(link, resourceService)) { | 57 | + .allMatch(link -> isValid(link, resourceService)); |
58 | - return false; | ||
59 | - } | ||
60 | - } | ||
61 | - return true; | ||
62 | } | 58 | } |
63 | 59 | ||
64 | } | 60 | } | ... | ... |
... | @@ -60,7 +60,7 @@ public class LinkTypeConstraint extends BooleanConstraint { | ... | @@ -60,7 +60,7 @@ public class LinkTypeConstraint extends BooleanConstraint { |
60 | @Override | 60 | @Override |
61 | public boolean isValid(Link link, LinkResourceService resourceService) { | 61 | public boolean isValid(Link link, LinkResourceService resourceService) { |
62 | boolean contains = types.contains(link.type()); | 62 | boolean contains = types.contains(link.type()); |
63 | - return isInclusive ? contains : !contains; | 63 | + return isInclusive == contains; |
64 | } | 64 | } |
65 | 65 | ||
66 | /** | 66 | /** | ... | ... |
-
Please register or login to post a comment