You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2017/07/27 11:47:36 UTC
[2/2] syncope git commit: Removing Java 8 idioms
Removing Java 8 idioms
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fffee9f1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fffee9f1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fffee9f1
Branch: refs/heads/2_0_X
Commit: fffee9f15d2a7dfdc49524e983e1cb0d9254271f
Parents: 025441a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 27 12:46:35 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 27 12:46:35 2017 +0100
----------------------------------------------------------------------
.../apache/syncope/fit/core/GroupITCase.java | 65 +++++++++++++++++---
.../syncope/fit/core/UserIssuesITCase.java | 12 +++-
2 files changed, 69 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/fffee9f1/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
index 9d833cc..fe9129d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
@@ -38,6 +38,8 @@ import javax.naming.directory.SearchResult;
import javax.ws.rs.ForbiddenException;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
+
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.SerializationUtils;
@@ -652,7 +654,14 @@ public class GroupITCase extends AbstractITCase {
List<MembershipTO> memberships = userService.read(
"c9b2dec2-00a7-4855-97c0-d854842b4b24").getDynMemberships();
- assertTrue(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
GroupPatch patch = new GroupPatch();
patch.setKey(group.getKey());
@@ -683,14 +692,35 @@ public class GroupITCase extends AbstractITCase {
assertNotNull(newAny.getPlainAttr("location"));
List<MembershipTO> memberships = anyObjectService.read(
"fc6dbc3a-6c07-4965-8781-921e7401a4a5").getDynMemberships();
- assertTrue(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
memberships = anyObjectService.read(
"8559d14d-58c2-46eb-a2d4-a7d35161e8f8").getDynMemberships();
- assertTrue(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
memberships = anyObjectService.read(newAny.getKey()).getDynMemberships();
- assertTrue(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
// 2. update group and change aDynMembership condition
fiql = SyncopeClient.getAnyObjectSearchConditionBuilder("PRINTER").is("location").nullValue().query();
@@ -717,12 +747,33 @@ public class GroupITCase extends AbstractITCase {
memberships = anyObjectService.read(
"fc6dbc3a-6c07-4965-8781-921e7401a4a5").getDynMemberships();
- assertFalse(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertTrue(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
memberships = anyObjectService.read(
"8559d14d-58c2-46eb-a2d4-a7d35161e8f8").getDynMemberships();
- assertFalse(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertTrue(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
memberships = anyObjectService.read(newAny.getKey()).getDynMemberships();
- assertTrue(memberships.stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(memberships, new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/fffee9f1/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index 4e7988a..fc1ecb7 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -35,6 +35,9 @@ import java.util.Set;
import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.ws.rs.core.GenericType;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.IOUtils;
@@ -1350,7 +1353,14 @@ public class UserIssuesITCase extends AbstractITCase {
// 3. verify that dynamic membership is set and that resource is consequently assigned
user = created.getEntity();
final String groupKey = group.getKey();
- assertTrue(user.getDynMemberships().stream().anyMatch(m -> m.getGroupKey().equals(groupKey)));
+ assertFalse(CollectionUtils.select(user.getDynMemberships(), new Predicate<MembershipTO>() {
+
+ public boolean evaluate(MembershipTO object) {
+ return object.getGroupKey().equals(groupKey);
+ }
+
+
+ }).isEmpty());
assertTrue(user.getResources().contains(RESOURCE_NAME_TESTDB));
// 4. verify that propagation happened towards the resource of the dynamic group