From b6cefe4d9a5f45bca4dd10cc0d22b8423790a44b Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Tue, 13 Jul 2021 15:13:28 +0200
Subject: [PATCH] Ensure buildability on JDK 16.

Properly initialize the MongoMappingContext in unit tests when using special identifier types. Explicitly add javax.annotation as dependency in shop tests.
---
 .../rest/webmvc/config/JsonPatchHandlerUnitTests.java    | 5 +++++
 .../spring-data-rest-tests-shop/pom.xml                  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/config/JsonPatchHandlerUnitTests.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/config/JsonPatchHandlerUnitTests.java
index 12b3ddc8b..624351806 100755
--- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/config/JsonPatchHandlerUnitTests.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/config/JsonPatchHandlerUnitTests.java
@@ -21,6 +21,7 @@ import static org.springframework.data.rest.tests.mongodb.TestUtils.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -30,6 +31,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.mapping.ResourceMappings;
@@ -59,7 +61,10 @@ public class JsonPatchHandlerUnitTests {
 	@Before
 	public void setUp() {
 
+		MongoCustomConversions conversions = new MongoCustomConversions(Collections.emptyList());
+
 		MongoMappingContext context = new MongoMappingContext();
+		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		context.getPersistentEntity(User.class);
 
 		PersistentEntities entities = new PersistentEntities(Arrays.asList(context));
diff --git a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
index acea3031d..2b7082a2d 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
@@ -30,6 +30,15 @@
 			<version>${springdata.keyvalue}</version>
 		</dependency>
 
+		<!-- Explicit declaration required on Java 11 and above-->
+
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 </project>