Skip to content

Commit 97441b3

Browse files
boostchickenfrommeyercworkromancer
authored
v5.2.3 (#18)
* Read Consistency Setting * #8 Custom Mapper Spec * #8 Custom Mapper CDI fix * Fix symlink to CONTRIBUTING.md (#13) * #8 Don't use autowired or constructor injection with FactoryBeans (#12) * [maven-release-plugin] prepare release v5.2.2 * [maven-release-plugin] prepare for next development iteration * 5.2.2 docs fix * Hibernate Validator CVE fix GHSA-m8p2-495h-ccmh * Documentation updates * Create FUNDING.yml * Fixed a Type (#17) Co-authored-by: thedevluffy <52121827+TheDevLuffy@users.noreply.github.com> * Documentation updates * 5.2.3 prep * [maven-release-plugin] prepare release v5.2.3 * [maven-release-plugin] prepare for next development iteration Co-authored-by: Christian Frommeyer <frommeyerc@googlemail.com> Co-authored-by: thedevluffy <52121827+TheDevLuffy@users.noreply.github.com>
1 parent 8d241ab commit 97441b3

File tree

9 files changed

+77
-29
lines changed

9 files changed

+77
-29
lines changed

‎.github/FUNDING.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: #boostchicken
4+
custom: ["paypal.me/boostchicken"]

‎DONATION.md‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@ I'm always happy for donations - to help with some hosting costs or to just get
44

55
As I'm a firm believer in OSS I nevertheless have to pay once in a while for stuff - therefore feel free to contribute a bit:
66

7-
## Patreon
8-
9-
[![patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/derjust86)
10-
11-
## Liberapay
12-
[![liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://en.liberapay.com/spring-data-dynamodb/donate)
13-
147
## Paypal
158

16-
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=CWVWF9DD73J5S)
9+
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BR3VEY4ANCZNQ&source=url)
1710

1811
## Beer
1912

20-
Send me a message if you are around in New York City.
13+
Send me a message if you are in San Diego

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/boostchicken/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/boostchicken/spring-data-dynamodb)
22
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.boostchicken/spring-data-dynamodb/badge.svg)](https://search.maven.org/search?q=g:io.github.boostchicken)
3-
3+
[![Donation badge](https://img.shields.io/badge/Donate-%F0%9F%92%B8-DAA520.svg)](DONATION.md)
44

55
# Spring Data DynamoDB #
66

@@ -28,13 +28,13 @@ please see [spring-data-dynamodb-examples](https://github.com/derjust/spring-dat
2828

2929
## Quick Start ##
3030

31-
Download the JAR though [Maven Central](http://mvnrepository.com/artifact/io.github.boostchicken/spring-data-dynamodb) ([`SNAPSHOT` builds](https://oss.sonatype.org/content/repositories/snapshots/com/github/derjust/spring-data-dynamodb/) are available via the [OSSRH snapshot repository](https://github.com/derjust/spring-data-dynamodb/wiki/Access-to-releases) ):
31+
Download the JAR though [Maven Central](http://mvnrepository.com/artifact/io.github.boostchicken/spring-data-dynamodb) ([`SNAPSHOT` builds](https://oss.sonatype.org/content/repositories/snapshots/io/github/boostchicken/spring-data-dynamodb/) are available via the [OSSRH snapshot repository](https://github.com/derjust/spring-data-dynamodb/wiki/Access-to-releases) ):
3232

3333
```xml
3434
<dependency>
3535
<groupId>io.github.boostchicken</groupId>
3636
<artifactId>spring-data-dynamodb</artifactId>
37-
<version>5.2.1</version>
37+
<version>5.2.3</version>
3838
</dependency>
3939
```
4040

@@ -167,7 +167,7 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
167167
| 4.5.x | >= 1.4.0 && < 2.0 | >= 4.3 && < 5.0 | Ingalls |
168168
| 5.0.x | >= 2.0 && < 2.1 | >= 5.0 && < 5.1 | Kay-SR1 |
169169
| 5.1.x | == 2.1 | >= 5.1 | Lovelace-SR1 |
170-
| 5.2.x | >= 2.2 | >= 5.2 | Moore-RELASE |
170+
| 5.2.x | >= 2.2 | >= 5.2 | Moore-RELEASE |
171171

172172

173173
`spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
@@ -181,7 +181,7 @@ The code base has some history already in it - let's clarify it a bit:
181181
* It was forked and further maintained under [github.com/derjust/spring-data-dynamodb)](https://github.com/derjust/spring-data-dynamodb)
182182
* Available in Maven Central under [`com.github.derjust:spring-data-dynamodb`](http://central.maven.org/maven2/com/github/derjust/spring-data-dynamodb/)
183183
* It was forked and even further maintained under [github.com/boostchicken/spring-data-dynamodb)](https://github.com/boostchicken/spring-data-dynamodb)
184-
* Available in Maven Central under [`io.github.boostchicken:spring-data-dynamodb`](http://central.maven.org/maven2/io/github/boostchicken/spring-data-dynamodb/)
184+
* Available in Maven Central under [`io.github.boostchicken:spring-data-dynamodb`](https://repo1.maven.org/maven2/io/github/boostchicken/spring-data-dynamodb/)
185185

186186
The Java package name/XSD namespace never changed from `org.socialsignin.spring.data.dynamodb`.
187187
But the XSD is now also available at [`https://boostchicken.github.io/spring-data-dynamodb/spring-dynamodb-1.0.xsd`](https://boostchicken.github.io/spring-data-dynamodb/spring-dynamodb-1.0.xsd).

‎pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<groupId>io.github.boostchicken</groupId>
2222
<artifactId>spring-data-dynamodb</artifactId>
23-
<version>5.2.3-SNAPSHOT</version>
23+
<version>5.2.4-SNAPSHOT</version>
2424
<name>Spring Data DynamoDB</name>
2525
<inceptionYear>2018</inceptionYear>
2626

@@ -40,7 +40,7 @@
4040
<spring.version>5.2.0.RELEASE</spring.version>
4141
<spring-data.version>2.2.2.RELEASE</spring-data.version>
4242

43-
<hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
43+
<hibernate-validator.version>6.1.0.Final</hibernate-validator.version>
4444
<aws-java-sdk.version>1.11.664</aws-java-sdk.version>
4545
<junit.version>4.12</junit.version>
4646
<mockito.version>2.23.0</mockito.version>
@@ -297,6 +297,7 @@
297297
</properties>
298298
<excludes>
299299
<exclude>**/README.md</exclude>
300+
<exclude>**/FUNDING.yml</exclude>
300301
<exclude>**/DONATION.md</exclude>
301302
<exclude>**/CONTRIBUTING.md</exclude>
302303
<exclude>**/LICENSE</exclude>
@@ -608,7 +609,7 @@
608609
<plugin>
609610
<groupId>org.apache.maven.plugins</groupId>
610611
<artifactId>maven-javadoc-plugin</artifactId>
611-
<version>3.0.0</version>
612+
<version>3.1.1</version>
612613
<executions>
613614
<execution>
614615
<id>attach-javadocs</id>
@@ -683,6 +684,12 @@
683684
<email>zeeman@zeeman.de</email>
684685
<timezone>America/New_York</timezone>
685686
</developer>
687+
<developer>
688+
<id>boostchicken</id>
689+
<name>John Dorman</name>
690+
<url>https://www.github.com/boostchicken</url>
691+
<timezone>America/Los_Angeles</timezone>
692+
</developer>
686693
</developers>
687694
<contributors>
688695
<contributor>
@@ -785,7 +792,7 @@
785792
<plugin>
786793
<groupId>org.apache.maven.plugins</groupId>
787794
<artifactId>maven-javadoc-plugin</artifactId>
788-
<version>3.0.0</version>
795+
<version>3.1.1</version>
789796
<reportSets>
790797
<reportSet>
791798
<id>default</id>
@@ -799,7 +806,7 @@
799806
<groupId>org.apache.maven.plugins</groupId>
800807
<artifactId>maven-checkstyle-plugin</artifactId>
801808
<configuration>
802-
<configLocation>checkstyle.xml</configLocation>
809+
<configLocation>src/checkstyle.xml</configLocation>
803810
</configuration>
804811
</plugin>
805812
<plugin>

‎src/changes/changes.xml‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,40 @@
2020
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
2121
<properties>
2222
<title>spring-data-dynamodb Changes</title>
23-
<author email="zeeman@zeeman.de">derjust</author>
23+
<author>boostchicken</author>
2424
</properties>
2525
<body>
26+
<release version="5.2.3" description="Security Release">
27+
<action dev="boostchicken" type="fix" issue="10" date="2020-02-24">
28+
Update Hibernate Validator to fix CVE
29+
</action>
30+
</release>
31+
<release version="5.2.2" description="Feature Release">
32+
<action dev="boostchicken" issue="9" type="add" date="2020-02-24">
33+
Add Read Consistency Settings to @Query
34+
</action>
35+
<action dev="frommeyerc" issue="8" type="fix" date="2020-02-24">
36+
Bug fix for @Autowired beans
37+
</action>
38+
</release>
39+
<release version="5.2.1" description="Spring Data 2.2 Support release">
40+
<action dev="boostchicken" type="add" date="2019-11-19">
41+
Spring Data 2.2 Support
42+
</action>
43+
</release>
2644
<release version="5.1.1" description="Maintenance release">
2745
<action dev="derjust" issue="235" type="fix" date="2019-03-10">
2846
Upgrading to 5.1.0 results in the error Bean property 'dynamoDBMapperConfig' is not writable or has an invalid setter method
2947
</action>
30-
<action dev="boostschicken" issue="226" type="add" date="2019-03-10">
48+
<action dev="boostchicken" issue="226" type="add" date="2019-03-10">
3149
@Query annotation to support query limiting
3250
</action>
3351
</release>
3452
<release version="5.1.0" date="2019-01-28" description="Spring Boot 2.1 and Spring Data Lovelace-SR1 support">
35-
<action dev="boostschicken" type="add" date="2018-10-28">
53+
<action dev="boostchicken" type="add" date="2018-10-28">
3654
Updated all code to work with Spring Boot 2.1 and Lovelace-SR1
3755
</action>
38-
<action dev="boostschicken" type="add" date="2018-10-28">
56+
<action dev="boostchicken" type="add" date="2018-10-28">
3957
Updated Mockito to improve test coverage
4058
</action>
4159
<action dev="ryonday" issue="218" type="fix" date="2018-11-09">

‎src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import com.amazonaws.services.dynamodbv2.model.QueryRequest;
2929
import com.amazonaws.services.dynamodbv2.model.QueryResult;
3030
import com.amazonaws.services.dynamodbv2.model.Select;
31-
import org.slf4j.Logger;
32-
import org.slf4j.LoggerFactory;
3331
import org.socialsignin.spring.data.dynamodb.mapping.event.AfterDeleteEvent;
3432
import org.socialsignin.spring.data.dynamodb.mapping.event.AfterLoadEvent;
3533
import org.socialsignin.spring.data.dynamodb.mapping.event.AfterQueryEvent;
@@ -52,7 +50,6 @@
5250
import java.util.stream.Collectors;
5351

5452
public class DynamoDBTemplate implements DynamoDBOperations, ApplicationContextAware {
55-
private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBTemplate.class);
5653
private final DynamoDBMapper dynamoDBMapper;
5754
private final AmazonDynamoDB amazonDynamoDB;
5855
private final DynamoDBMapperConfig dynamoDBMapperConfig;
@@ -71,7 +68,6 @@ public class DynamoDBTemplate implements DynamoDBOperations, ApplicationContextA
7168
* can be {@code null} -
7269
* {@link DynamoDBMapper#DynamoDBMapper(AmazonDynamoDB, DynamoDBMapperConfig)}
7370
* is used if {@code null} is passed in
74-
* @param dynamoDBMapperConfig
7571
*/
7672
@Autowired
7773
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
* @see <a href=
3737
* "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.ProjectionExpressions.html">Projection
3838
* Expressions</a>
39+
* @return comma-separated list of fields
3940
*/
4041
String fields() default "";
4142

@@ -45,9 +46,18 @@
4546
* @see <a href=
4647
* "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.ProjectionExpressions.html">Projection
4748
* Expressions</a>
49+
* @return number of results to return
4850
*/
4951
int limit() default QUERY_LIMIT_UNLIMITED;
5052

51-
53+
/**
54+
* Override consistent read mode set in the DynamoDBMapper
55+
*
56+
* @see <a href=
57+
* "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadConsistency.html">Read Consistency</a>
58+
* @see <a href=
59+
* "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBMapper.OptionalConfig.html">DynamoDBMapper Configuration</a>
60+
* @return ConistentReadMode to enforce on query
61+
*/
5262
ConsistentReadMode consistentReads() default ConsistentReadMode.DEFAULT;
5363
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,28 @@ private QueryConstants() {
2323
public static final int QUERY_LIMIT_UNLIMITED = Integer.MIN_VALUE;
2424

2525
public enum ConsistentReadMode {
26+
/**
27+
* Use the default configured in the DynamoDBMapper
28+
* @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig
29+
* @see <a href=
30+
* "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBMapper.OptionalConfig.html">DynamoDBMapper Configuration</a>
31+
*
32+
*/
2633
DEFAULT,
34+
/**
35+
* Set consistent read mode to true
36+
* @see <a href=
37+
* "https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBQueryExpression.html#setConsistentRead-boolean-">Consistent Reads</a>
38+
* @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression#setConsistentRead(boolean)
39+
*/
2740
CONSISTENT,
41+
/**
42+
* Set consistent read mode to false
43+
* @see <a href=
44+
* "https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBQueryExpression.html#setConsistentRead-boolean-">Consistent Reads</a>
45+
*
46+
* @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression#setConsistentRead(boolean)
47+
*/
2848
EVENTUAL
2949
}
3050
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* Alias for the {@link #basePackages()} attribute. Allows for more concise
4646
* annotation declarations e.g.:
4747
* {@code @EnableDynamoDBRepositories("org.my.pkg")} instead of
48-
* {@code @EnableDynamoDBaRepositories(basePackages="org.my.pkg")}.
48+
* {@code @EnableDynamoDBRepositories(basePackages="org.my.pkg")}.
4949
*
5050
* @return The package name for scanning
5151
*/

0 commit comments

Comments
 (0)