Merge branch 'spring-data-2.1.X' of https://github.com/ryonday/spring-data-dynamodb into Issue_218

derjust · derjust · commit 82285cfb8765 · 2018-11-27T23:52:46.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -41,9 +41,9 @@
         <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.452</aws-java-sdk.version>
+        <aws-java-sdk.version>1.11.443</aws-java-sdk.version>
         <junit.version>4.12</junit.version>
-        <mockito.version>2.21.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>
         <sqlite4java.version>1.0.392</sqlite4java.version>
@@ -798,6 +798,10 @@
         <contributor>
             <name>John Dorman</name>
             <url>https://github.com/boostchicken</url>
+		</contributor>
+		<contributor>
+            <name>Ryon Day</name>
+            <url>https://github.com/ryonday</url>
         </contributor>
     </contributors>
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -23,19 +23,17 @@
     <author email="zeeman@zeeman.de">derjust</author>
   </properties>
   <body>
-<<<<<<< HEAD
-     <release version="5.0.4" date="2018-11-27" description="Maintenance &amp; security release">
-=======
     <release version="5.1.0" date="" description="Spring Boot 2.1 and Spring Data Lovelace-SR1 support">
       <action dev="boostschicken" type="add" date="2018-10-28">
         Updated all code to work with Spring Boot 2.1 and Lovelace-SR1
       </action>
       <action dev="boostschicken" type="add" date="2018-10-28">
         Updated Mockito to improve test coverage
+      <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">
->>>>>>> 77d9206cb28add3923d8f414ea4762ee4bc95ac2
+    <release version="5.0.4" date="2018-11-27" description="Maintenance &amp; security release">
       <action dev="enriquezrene" issue="199" type="fix" date="2018-10-11">
         Fix README.md examples
       </action>
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
@@ -139,6 +139,18 @@ private <T, ID extends Serializable> void setupCommonMocksForThisRepositoryMetho
 			Mockito.when(mockEntityMetadata.isRangeKeyAware()).thenReturn(true);
 		}
 
+		try {
+			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
+			unwrappedReturnTypeField.set(mockDynamoDBQueryMethod, clazz);
+		} catch (Exception e) {
+			// There is little we can and want do if it fails - Aborting the whole test is
+			// fine
+			throw new RuntimeException(e);
+		}
+
 		Mockito.when(mockDynamoDBQueryMethod.getEntityType()).thenReturn(clazz);
 		Mockito.when(mockDynamoDBQueryMethod.getName()).thenReturn(repositoryMethodName);
 		Mockito.when(mockDynamoDBQueryMethod.getParameters()).thenReturn(mockParameters);
diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -1 +1 @@
-mock-maker-inline
+mock-maker-inline
