Update to Spring-Data 2.1.2.RELEASE and Spring Framework 5.1.2.RELEASE

Ryon · Ryon · commit 79e6208f5a5b · 2018-11-08T11:18:31.000-06:00
This required enabling Mockito mocking of final classes, adapting to a single changed
Spring-Data class name, and updating unit tests to compensate.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.derjust</groupId>
     <artifactId>spring-data-dynamodb</artifactId>
-    <version>5.0.4-SNAPSHOT</version>
+    <version>5.1.4-SNAPSHOT</version>
     <name>Spring Data DynamoDB</name>
     <inceptionYear>2018</inceptionYear>
 
@@ -37,13 +37,13 @@
     </licenses>
 
     <properties>
-        <spring.version>5.0.4.RELEASE</spring.version>
-        <spring-data.version>2.0.9.RELEASE</spring-data.version>
+        <spring.version>5.1.2.RELEASE</spring.version>
+        <spring-data.version>2.1.2.RELEASE</spring-data.version>
 
         <hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
-        <aws-java-sdk.version>1.11.301</aws-java-sdk.version>
+        <aws-java-sdk.version>1.11.443</aws-java-sdk.version>
         <junit.version>4.12</junit.version>
-        <mockito.version>2.13.0</mockito.version>
+        <mockito.version>2.23.0</mockito.version>
 
         <cdi.version>1.2</cdi.version>
         <slf4j-test.version>1.2.0</slf4j-test.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -23,6 +23,11 @@
     <author email="zeeman@zeeman.de">derjust</author>
   </properties>
   <body>
+    <release version="5.1.4" date="" description="Maintenance &amp; security release">
+      <action dev="ryonday" issue="218" type="fix" date="2018-11-09">
+        Update to Spring-Data 2.1.2.RELEASE and Spring Framework 5.1.2.RELEASE
+      </action>
+    </release>
      <release version="5.0.4" date="" description="Maintenance &amp; security release">
       <action dev="enriquezrene" issue="199" type="fix" date="2018-10-11">
         Fix README.md examples
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
@@ -25,7 +25,7 @@
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.query.EvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.util.Version;
@@ -108,7 +108,7 @@ public <T, ID> DynamoDBEntityInformation<T, ID> getEntityInformation(final Class
 
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(Key key,
-			EvaluationContextProvider evaluationContextProvider) {
+			QueryMethodEvaluationContextProvider evaluationContextProvider) {
 		return Optional.of(DynamoDBQueryLookupStrategy.create(dynamoDBOperations, key));
 	}
 
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
@@ -94,7 +94,7 @@ public void testHashCode() {
 	public void testToString() {
 		String actual = underTest.toString();
 
-		assertTrue(actual, actual.startsWith("Page 1 of 1 containing codegen.java.util.Iterator$MockitoMock"));
+		assertTrue(actual, actual.startsWith("Page 1 of 1 containing org.mockito.codegen.Iterator$MockitoMock"));
 	}
 
 	@Test
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java b/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
@@ -147,8 +147,7 @@ private <T, ID extends Serializable> void setupCommonMocksForThisRepositoryMetho
 		// https://github.com/mockito/mockito/wiki/FAQ#what-are-the-limitations-of-mockito
 		// Therefore setting the field explicitly that is used by all the isXXX methods
 		try {
-			Field unwrappedReturnTypeField = mockDynamoDBQueryMethod.getClass() // Mockito-generated class
-					.getSuperclass() // org.socialsignin.spring.data.dynamodb.repository.query.DynamoDBQueryMethod
+			Field unwrappedReturnTypeField = mockDynamoDBQueryMethod.getClass() // org.socialsignin.spring.data.dynamodb.repository.query.DynamoDBQueryMethod
 					.getSuperclass() // org.springframework.data.repository.query.QueryMethod
 					.getDeclaredField("unwrappedReturnType");
 			unwrappedReturnTypeField.setAccessible(true); // It's final therefore unlocking the field
diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void testHashCode() {`
`94`	`94`	`public void testToString() {`
`95`	`95`	`String actual = underTest.toString();`
`96`	`96`
`97`		`- assertTrue(actual, actual.startsWith("Page 1 of 1 containing codegen.java.util.Iterator$MockitoMock"));`
	`97`	`+ assertTrue(actual, actual.startsWith("Page 1 of 1 containing org.mockito.codegen.Iterator$MockitoMock"));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Test`