Upgrade to Spring 5.1.5 and fix test case failure due to

spring-projects/spring-security#5401
neeleshs · May 24, 2019 · 0b57e8b · 0b57e8b
1 parent 623bc32
commit 0b57e8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,11 @@
 
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-acl-mongodb</artifactId>
-    <version>4.2.3-SNAPSHOT</version>
+    <version>5.1.5-SNAPSHOT</version>
 
     <properties>
-        <spring.version>4.2.3.RELEASE</spring.version>
-        <spring.data.version>1.10.4.RELEASE</spring.data.version>
+        <spring.version>5.1.5.RELEASE</spring.version>
+        <spring.data.version>2.1.8.RELEASE</spring.data.version>
     </properties>
 
     <repositories>
@@ -46,7 +46,7 @@
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
-            <version>2.0.3</version>
+            <version>2.2.0</version>
         </dependency>
         <!-- Spring test framework -->
         <dependency>

diff --git a/src/test/java/org/springframework/security/acls/mongodb/MongoDBAclServiceTest.java b/src/test/java/org/springframework/security/acls/mongodb/MongoDBAclServiceTest.java
@@ -55,6 +55,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import java.io.Serializable;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -65,6 +66,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -489,11 +491,11 @@ public void issue3_testReadAclsByIdTwice() throws Exception {
 	}
 
 	private void checkPermissions(Acl acl) {
-		Set<AccessControlEntry> permissions = new LinkedHashSet<>();
+		Set<Serializable> permissions = new LinkedHashSet<>();
 		Acl _parent = acl.getParentAcl();
 		if (acl.isEntriesInheriting()) {
 			while (null != _parent) {
-				permissions.addAll(_parent.getEntries());
+				permissions.addAll(_parent.getEntries().stream().map(e->e.getId()).collect(Collectors.toList()));
 				if (_parent.isEntriesInheriting()) {
 					_parent = _parent.getParentAcl();
 				}