Merge branch 'develop'

# Conflicts:
#	README.md
#	pom.xml
#	src/changes/changes.xml
#	src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java

Author: boostchicken

CHANELOG.md

@@ -0,0 +1,32 @@
+# 5.2.4
+
+## Housekeeping
+1. Built against Spring Data 2.3.0, not changes needed.
+
+## Bug fixes
+1. [Missing LSI Indexes Projection Settings](https://github.com/boostchicken/spring-data-dynamodb/issues/19)
+2. [Failed to register dynamoDBMapperRef](https://github.com/boostchicken/spring-data-dynamodb/issues/25)
+3. [Limit and Consistent Reads only works on GSIs](https://github.com/boostchicken/spring-data-dynamodb/issues/23)
+
+## New Features
+1. [Ability to apply filter expressions to a Query](https://github.com/boostchicken/spring-data-dynamodb/issues/27)
+
+With static parameters
+```	
+@Query(fields = "leaveDate", limit = 1, filterExpression = "contains(#field, :value)",
+			expressionMappingNames = {@ExpressionAttribute(key = "#field", value = "name")},
+			expressionMappingValues = {@ExpressionAttribute(key=":value", value = "projection")})
+	List<User> findByPostCode(String postCode);
+```
+
+With dynamic parameters from methods
+```
+	@Query(fields = "leaveDate", limit = 1, filterExpression = "contains(#field, :value)",
+			expressionMappingNames = {@ExpressionAttribute(key = "#field", value = "name")},
+			expressionMappingValues = {@ExpressionAttribute(key=":value", parameterName = "projection")})
+	List<User> findByPostCode(@Param("postCode") String postCode, @Param("projection") String projection);
+```
+2. [Support for Nested Repositories](https://github.com/boostchicken/spring-data-dynamodb/pull/24)
+```
+@EnableDynamoDBRepositories(basePackages = "org.socialsignin.spring.data.dynamodb.domain.sample", considerNestedRepositories = true)
+```

README.md

@@ -34,7 +34,7 @@ Download the JAR though [Maven Central](http://mvnrepository.com/artifact/io.git
 <dependency>
   <groupId>io.github.boostchicken</groupId>
   <artifactId>spring-data-dynamodb</artifactId>
-  <version>5.2.3</version>
+  <version>5.2.4</version>
 </dependency>
 ```
 
@@ -167,12 +167,12 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
 | 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              |
-| 5.2.x                           | >= 2.2                         | >= 5.2                         | Moore-RELEASE              |
+| 5.2.x                           | >= 2.2                         | >= 5.2                         | Moore-RELEASE, Nuemann-RELASE              |
 
 
 `spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
 
-`compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into 
+`compile` and `runtime` dependencies are kept to a minimum to allow easy integration, for example into 
 Spring-Boot projects.
 
 ## History

pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.boostchicken</groupId>
     <artifactId>spring-data-dynamodb</artifactId>
-    <version>5.2.4-SNAPSHOT</version>
+    <version>5.2.5-SNAPSHOT</version>
     <name>Spring Data DynamoDB</name>
     <inceptionYear>2018</inceptionYear>
 
@@ -32,13 +32,13 @@
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
     <properties>
-        <spring.version>5.2.0.RELEASE</spring.version>
-        <spring-data.version>2.2.2.RELEASE</spring-data.version>
+        <spring.version>5.2.3.RELEASE</spring.version>
+        <spring-data.version>2.3.0.RELEASE</spring-data.version>
 
         <hibernate-validator.version>6.1.0.Final</hibernate-validator.version>
         <aws-java-sdk.version>1.11.664</aws-java-sdk.version>
@@ -501,7 +501,7 @@
     <repositories>
         <repository>
             <id>spring-libs-snapshot</id>
-            <url>http://repo.springsource.org/libs-snapshot</url>
+            <url>https://repo.springsource.org/libs-snapshot</url>
         </repository>
         <repository>
             <id>dynamodb-local-oregon</id>
@@ -513,7 +513,7 @@
     <pluginRepositories>
         <pluginRepository>
             <id>com.springsource.repository.bundles.release</id>
-            <url>http://repository.springsource.com/maven/bundles/release</url>
+            <url>https://repository.springsource.com/maven/bundles/release</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>

src/changes/changes.xml

@@ -23,6 +23,20 @@
     <author>boostchicken</author>
   </properties>
   <body>
+    <release version="5.2.4" description="Feature Release">
+      <action dev="boostchicken" type="add" issue="29" date="2020-05-24">
+        Added Filter Expression Support
+      </action>
+      <action dev="felixwimpyw" type="fix" issue="25" date="2020-05-24">
+        Failed to register dynamoDBMapperRef
+      </action>
+      <action dev="majusko" type="fix" issue="19" date="2020-05-24">
+        Missing Local index projection settings
+      </action>
+      <action dev="phaser4" type="add"  issue="24" date="2020-05-24">
+        Nested Repository Support
+      </action>
+    </release>
     <release version="5.2.3" description="Security Release">
       <action dev="boostchicken" type="fix" issue="10" date="2020-02-24">
         Update Hibernate Validator to fix CVE

src/main/java/org/socialsignin/spring/data/dynamodb/repository/ExpressionAttribute.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/boostchicken/spring-data-dynamodb)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.socialsignin.spring.data.dynamodb.repository;
+
+public @interface ExpressionAttribute {
+    String key() default "";
+    String value() default "";
+    String parameterName() default "";
+}

src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java

@@ -57,7 +57,58 @@
 	 *      "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadConsistency.html">Read Consistency</a>
 	 * @see <a href=
 	 *      "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBMapper.OptionalConfig.html">DynamoDBMapper Configuration</a>
-	 * @return ConistentReadMode to enforce on query
+	 * @return ConsistentReadMode to enforce on query
 	 */
 	ConsistentReadMode consistentReads() default ConsistentReadMode.DEFAULT;
+
+	/**
+	 * Set filter expressions for a query
+	 *
+	 * @see <a href=
+	 * 		"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.html#Query.FilterExpression">Filter Expressions</a>
+	 * @see <a href=
+	 * 	 	"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.OperatorsAndFunctions.html"> Expression Syntax</a>
+	 *
+	 *
+	 * Example: {@code @Query(filterExpression = "contains(#field, :value)",
+	 * 	           				expressionMappingNames = {@ExpressionAttribute(key = "#field", value = "name")},
+	 * 							expressionMappingValues = {@ExpressionAttribute(key=":value", value = "John Doe")})}
+	 *
+	 * @return filter expression for query
+	 */
+	String filterExpression() default "";
+
+	/**
+	 * Set filter expressions for a query
+	 *
+	 * @see <a href=
+	 * 		"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.html#Query.FilterExpression">Filter Expressions</a>
+	 * @see <a href=
+	 * 	 	"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.OperatorsAndFunctions.html"> Expression Syntax</a>
+	 *
+	 *
+	 * Example: {@code @Query(filterExpression = "contains(#field, :value)",
+	 * 	           				expressionMappingNames = {@ExpressionAttribute(key = "#field", value = "name")},
+	 * 							expressionMappingValues = {@ExpressionAttribute(key=":value", value = "John Doe")})}
+	 *
+	 * @return expression name mappings for query
+	 */
+	ExpressionAttribute[] expressionMappingNames() default @ExpressionAttribute;
+
+	/**
+	 * Set filter expressions for a query
+	 *
+	 * @see <a href=
+	 * 		"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.html#Query.FilterExpression">Filter Expressions</a>
+	 * @see <a href=
+	 * 	 	"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.OperatorsAndFunctions.html">Expression Syntax</a>
+	 *
+	 *
+	 * Example: {@code @Query(filterExpression = "contains(#field, :value)",
+	 * 	           				expressionMappingNames = {@ExpressionAttribute(key = "#field", value = "name")},
+	 * 							expressionMappingValues = {@ExpressionAttribute(key=":value", value = "John Doe")})}
+	 *
+	 * @return expression value mappings for query
+	 */
+	ExpressionAttribute[] expressionMappingValues() default @ExpressionAttribute;
 }

src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java

@@ -47,4 +47,5 @@ public enum ConsistentReadMode {
 		 */
 		EVENTUAL
 	}
+
 }

src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java

@@ -93,8 +93,8 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi
 		String repositoryBeanName = config.generateBeanName(builder.getBeanDefinition());
 
 		postProcess(builder, repositoryBeanName, attributes.getString("amazonDynamoDBRef"),
-				attributes.getString("dynamoDBMapperConfigRef"), attributes.getString("dynamoDBOperationsRef"),
-				attributes.getString("mappingContextRef"));
+				attributes.getString("dynamoDBMapperRef"), attributes.getString("dynamoDBMapperConfigRef"),
+				attributes.getString("dynamoDBOperationsRef"), attributes.getString("mappingContextRef"));
 	}
 
 	/*
@@ -129,7 +129,8 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio
 
 	private Map<String, String> dynamoDBTemplateCache = new HashMap<>();
 	private void postProcess(BeanDefinitionBuilder builder, String repositoryName, String amazonDynamoDBRef,
-			String dynamoDBMapperConfigRef, String dynamoDBOperationsRef, String dynamoDBMappingContextRef) {
+			String dynamoDBMapperRef, String dynamoDBMapperConfigRef, String dynamoDBOperationsRef,
+			String dynamoDBMappingContextRef) {
 
 		if (StringUtils.hasText(dynamoDBOperationsRef)) {
 			builder.addPropertyReference("dynamoDBOperations", dynamoDBOperationsRef);
@@ -155,7 +156,12 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
 							// AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
 							// DynamoDBMapperConfig dynamoDBMapperConfig
 							dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBRef);
-							dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
+
+							if (StringUtils.hasText(dynamoDBMapperRef)) {
+								dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperRef);
+							} else {
+								dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
+							}
 
 							if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
 								dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBMapperConfigRef);

src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java

@@ -180,4 +180,10 @@
 	 *         bean name
 	 */
 	String mappingContextRef() default "";
+
+	/**
+	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
+	 * repositories infrastructure.
+	 */
+	boolean considerNestedRepositories() default false;
 }

src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java

@@ -77,13 +77,13 @@ protected QueryExecution<T, ID> getExecution() {
 	protected abstract Integer getResultsRestrictionIfApplicable();
 	protected abstract boolean isSingleEntityResultsRestriction();
 
-	protected Query<T> doCreateQueryWithPermissions(Object values[]) {
+	protected Query<T> doCreateQueryWithPermissions(Object[] values) {
 		Query<T> query = doCreateQuery(values);
 		query.setScanEnabled(method.isScanEnabled());
 		return query;
 	}
 
-	protected Query<Long> doCreateCountQueryWithPermissions(Object values[], boolean pageQuery) {
+	protected Query<Long> doCreateCountQueryWithPermissions(Object[] values, boolean pageQuery) {
 		Query<Long> query = doCreateCountQuery(values, pageQuery);
 		query.setScanCountEnabled(method.isScanCountEnabled());
 		return query;
@@ -244,13 +244,13 @@ private Slice<T> createSlice(List<T> allResults, Pageable pageable) {
 			if (pageable.getOffset() > 0) {
 				long processedCount = scanThroughResults(iterator, pageable.getOffset());
 				if (processedCount < pageable.getOffset())
-					return new SliceImpl<>(new ArrayList<T>());
+					return new SliceImpl<>(new ArrayList<>());
 			}
 			List<T> results = readPageOfResultsRestrictMaxResultsIfNecessary(iterator, pageable.getPageSize());
 			// Scan ahead to retrieve the next page count
 			boolean hasMoreResults = scanThroughResults(iterator, 1) > 0;
 			if (getResultsRestrictionIfApplicable() != null
-					&& getResultsRestrictionIfApplicable().intValue() <= results.size())
+					&& getResultsRestrictionIfApplicable() <= results.size())
 				hasMoreResults = false;
 			return new SliceImpl<>(results, pageable, hasMoreResults);
 		}