Merge pull request #1 from derjust/master

Pulling latest

Author: boostchicken

README.md

@@ -37,7 +37,7 @@ Download the JAR though [Maven Central](http://mvnrepository.com/artifact/com.gi
 <dependency>
   <groupId>com.github.derjust</groupId>
   <artifactId>spring-data-dynamodb</artifactId>
-  <version>5.0.3</version>
+  <version>5.0.4</version>
 </dependency>
 ```
 
@@ -165,10 +165,10 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
 | ------------------------------- | ------------------------------ | ------------------------------ | ------------------------- |
 | 1.0.x                           |                                | >= 3.1 && < 4.2                |                           |
 | 4.2.x                           | >= 1.3.0 && < 1.4.0            | >= 4.2 && < 4.3                | Gosling-SR1               |
-| 4.3.x                           | >= 1.4.0 < 2.0                 | >= 4.3 && < 5.0                | Gosling-SR1               |
-| 4.4.x                           | >= 1.4.0 < 2.0                 | >= 4.3 && < 5.0                | Hopper-SR2                |
-| 4.5.x                           | >= 1.4.0 < 2.0                 | >= 4.3 && < 5.0                | Ingalls                   |
-| 5.0.x                           | >= 2.0                         | >= 5.0                         | Kay-SR1                   |
+| 4.3.x                           | >= 1.4.0 && < 2.0              | >= 4.3 && < 5.0                | Gosling-SR1               |
+| 4.4.x                           | >= 1.4.0 && < 2.0              | >= 4.3 && < 5.0                | Hopper-SR2                |
+| 4.5.x                           | >= 1.4.0 && < 2.0              | >= 4.3 && < 5.0                | Ingalls                   |
+| 5.0.x                           | >= 2.0 && < 2.1                | >= 5.0 && < 5.1                | Kay-SR1                   |
 | 5.1.x                           | >= 2.1                         | >= 5.1                         | Lovelace-SR1              |
 `spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
 

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>
 

src/changes/changes.xml

@@ -29,9 +29,11 @@
       </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">
+    <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>

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);

src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -1 +1 @@
-mock-maker-inline
+mock-maker-inline