Adapt to Spring Data commons changes.

Author: meistermeier

pom.xml

@@ -87,7 +87,7 @@
 		<jqassistant.plugin.git.version>1.8.0</jqassistant.plugin.git.version>
 		<jqassistant.plugin.version>1.9.1</jqassistant.plugin.version>
 		<jqassistant.version>1.9.1</jqassistant.version>
-		<junit-cc-testcontainer>2020.0.7</junit-cc-testcontainer>
+		<junit-cc-testcontainer>2021.0.1</junit-cc-testcontainer>
 		<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
 		<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
 		<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
@@ -351,6 +351,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<scope>test</scope>
+			<!-- Exclusion because there is a Spring Data parent dependency to a newer JUnit version -->
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>neo4j</artifactId>

src/test/kotlin/org/springframework/data/neo4j/integration/imperative/KotlinInheritanceIT.kt

@@ -38,6 +38,7 @@ import org.springframework.data.neo4j.test.Neo4jIntegrationTest
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.EnableTransactionManagement
 import org.springframework.transaction.support.TransactionTemplate
+import java.util.function.Consumer
 
 /**
  * @author Michael J. Simons
@@ -204,12 +205,12 @@ class KotlinInheritanceIT @Autowired constructor(
 
 		val cinemas = cinemaRepository.findAll()
 		assertThat(cinemas).hasSize(1);
-		assertThat(cinemas).first().satisfies { c ->
-			assertThat(c.plays).hasSize(1);
-			assertThat(c.plays).first().isInstanceOf(KotlinAnimationMovie::class.java)
+		assertThat(cinemas).first().satisfies(Consumer<KotlinCinema> {
+				assertThat(it.plays).hasSize(1);
+				assertThat(it.plays).first().isInstanceOf(KotlinAnimationMovie::class.java)
 					.extracting { m -> (m as KotlinAnimationMovie).studio }
 					.isEqualTo("Pixar")
-		}
+			})
 	}
 
 	interface KotlinCinemaRepository: Neo4jRepository<KotlinCinema, String>

src/test/kotlin/org/springframework/data/neo4j/integration/imperative/KotlinProjectionIT.kt

@@ -39,6 +39,7 @@ import org.springframework.data.neo4j.test.Neo4jExtension.Neo4jConnectionSupport
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.EnableTransactionManagement
+import java.util.function.Consumer
 
 /**
  * @author Michael J. Simons
@@ -71,7 +72,9 @@ internal class KotlinProjectionIT {
 		assertThat(results)
 				.hasSize(1)
 				.first()
-				.satisfies { personAndDepartment -> projectedEntities(personAndDepartment) }
+				.satisfies(Consumer<PersonDepartmentQueryResult> {
+					projectedEntities(it)
+				})
 	}
 
 	@Test // GH-2349
@@ -83,7 +86,9 @@ internal class KotlinProjectionIT {
 		assertThat(results)
 				.hasSize(1)
 				.first()
-				.satisfies { personAndDepartment -> projectedEntities(personAndDepartment) }
+				.satisfies(Consumer<PersonDepartmentQueryResult> {
+					projectedEntities(it)
+				})
 	}
 
 	private fun projectedEntities(personAndDepartment: PersonDepartmentQueryResult) {
@@ -131,4 +136,4 @@ internal class KotlinProjectionIT {
 			return neo4jConnectionSupport.driver
 		}
 	}
-}
+}