mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-21 20:31:00 +02:00
Code Issues Projects Releases Wiki Activity

Simplify expression and statement

Browse Source 
Change-Id: I66cc2bee3a929108c7b4451b3d64c9aac4dcf5d6
This commit is contained in:
Sho SHIMIZU 2016-02-15 18:47:08 -08:00 committed by Gerrit Code Review
parent b5638b8bf3
commit 36ef79f97d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
View File

@ -53,12 +53,8 @@ public abstract class BooleanConstraint implements Constraint {
@Override
public boolean validate(Path path, LinkResourceService resourceService) {
for (Link link : path.links()) {
if (!isValid(link, resourceService)) {
return false;
}
}
return true;
return path.links().stream()
.allMatch(link -> isValid(link, resourceService));
}
}

2
core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
View File

@ -60,7 +60,7 @@ public class LinkTypeConstraint extends BooleanConstraint {
@Override
public boolean isValid(Link link, LinkResourceService resourceService) {
boolean contains = types.contains(link.type());
return isInclusive ? contains : !contains;
return isInclusive == contains;
}
/**