Skip to content

backport #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 9, 2019
Merged

backport #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff913ad
Issue #17 Create tables as needed
derjust Sep 24, 2018
d9737a6
Merge pull request #219 from derjust/Issue-17
derjust Jan 23, 2019
44fc740
Reactivate & fix old tests
derjust Jan 25, 2019
58f536e
Prepare release 5.1.0
derjust Jan 28, 2019
a5f6de5
[maven-release-plugin] prepare release v5.1.0
derjust Jan 28, 2019
8180969
[maven-release-plugin] prepare for next development iteration
derjust Jan 28, 2019
ed90e1d
[maven-release-plugin] rollback the release of v5.1.0
derjust Jan 28, 2019
1080d86
[maven-release-plugin] prepare release v5.1.0
derjust Jan 28, 2019
137c822
[maven-release-plugin] rollback the release of v5.1.0
derjust Jan 28, 2019
24c6313
[maven-release-plugin] prepare release v5.1.0
derjust Jan 28, 2019
1920cbf
[maven-release-plugin] prepare for next development iteration
derjust Jan 28, 2019
bbc97ec
Added link to OSHR wiki article
derjust Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ please see [spring-data-dynamodb-examples](https://github.com/derjust/spring-dat

## Quick Start ##

Download the JAR though [Maven Central](http://mvnrepository.com/artifact/com.github.derjust/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://stackoverflow.com/a/7717234/25332) ):
Download the JAR though [Maven Central](http://mvnrepository.com/artifact/com.github.derjust/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) ):

```xml
<dependency>
<groupId>com.github.derjust</groupId>
<artifactId>spring-data-dynamodb</artifactId>
<version>5.0.4</version>
<version>5.1.0</version>
</dependency>
```

Expand Down
122 changes: 46 additions & 76 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.derjust</groupId>
<artifactId>spring-data-dynamodb</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.1.1-SNAPSHOT</version>
<name>Spring Data DynamoDB</name>
<inceptionYear>2018</inceptionYear>

Expand Down Expand Up @@ -101,6 +101,11 @@
<artifactId>DynamoDBLocal</artifactId>
<version>[1.11,2.0)</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.8.2</version>
</dependency>

<dependency>
<groupId>uk.org.lidalia</groupId>
Expand Down Expand Up @@ -175,7 +180,12 @@
<groupId>com.amazonaws</groupId>
<artifactId>DynamoDBLocal</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -248,6 +258,39 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
net.revelc.code.formatter
</groupId>
<artifactId>
formatter-maven-plugin
</artifactId>
<versionRange>
[2.7.2,)
</versionRange>
<goals>
<goal>validate</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>true</runOnIncremental>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -401,6 +444,7 @@
<!-- Reports all bugs (other values are medium and max) -->
<threshold>Max</threshold>
<!-- Produces XML report <xmlOutput>true</xmlOutput> -->
<excludeFilterFile>src/spotbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -434,26 +478,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<!-- Prepare standalone DynamoDB instance (Integration testing) -->
<id>unpack-dynamodb-local</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.jcabi</groupId>
<artifactId>DynamoDBLocal</artifactId>
<version>2015-07-16</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/dynamodb-dist</outputDirectory>
<overWrite>false</overWrite>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
<id>copy</id>
Expand All @@ -476,60 +500,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>reserver-dynamodb-port</id>
<goals>
<goal>reserve-network-port</goal>
</goals>
<phase>pre-integration-test</phase>
<configuration>
<portNames>
<portName>dynamodblocal.port</portName>
</portNames>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-dynamodb-maven-plugin</artifactId>
<version>0.9.1</version>
<configuration>
<tables>
<table>src/test/resources/user_table.json</table>
<table>src/test/resources/playlist_table.json</table>
<table>src/test/resources/feeduser_table.json</table>
<table>src/test/resources/customerhistory_table.json</table>
<table>src/test/resources/installation_table.json</table>
<table>src/test/resources/auditable_user_table.json</table>
</tables>
<port>${dynamodblocal.port}</port>
<dist>${project.build.directory}/dynamodb-dist</dist>
<arguments>
<argument>-inMemory</argument>
</arguments>
</configuration>
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
<goal>create-tables</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
<phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion src/changes/changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
<author email="[email protected]">derjust</author>
</properties>
<body>
<release version="5.1.0" date="" description="Spring Boot 2.1 and Spring Data Lovelace-SR1 support">
<release version="5.1.0" date="2019-01-28" 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>
<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>
Expand Down
86 changes: 10 additions & 76 deletions src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.socialsignin.spring.data.dynamodb.mapping.event.BeforeSaveEvent;
import org.socialsignin.spring.data.dynamodb.mapping.event.DynamoDBMappingEvent;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEventPublisher;
Expand All @@ -57,42 +58,6 @@ public class DynamoDBTemplate implements DynamoDBOperations, ApplicationContextA
private final DynamoDBMapperConfig dynamoDBMapperConfig;
private ApplicationEventPublisher eventPublisher;

/**
* Convenient constructor to use the default
* {@link DynamoDBMapper#DynamoDBMapper(AmazonDynamoDB)}
*
* @param amazonDynamoDB
* The AWS SDK instance to talk to DynamoDB
* @param dynamoDBMapperConfig
* The config to use
*/
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig) {
this(amazonDynamoDB, dynamoDBMapperConfig, null);
}

/**
* Convenient constructor to use the {@link DynamoDBMapperConfig#DEFAULT}
*
* @param amazonDynamoDB
* The AWS SDK instance to talk to DynamoDB
* @param dynamoDBMapper
* The Mapper to use
*/
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper) {
this(amazonDynamoDB, null, dynamoDBMapper);
}

/**
* Convenient construcotr to thse the {@link DynamoDBMapperConfig#DEFAULT} and
* default {@link DynamoDBMapper#DynamoDBMapper(AmazonDynamoDB)}
*
* @param amazonDynamoDB
* The AWS SDK instance to talk to DynamoDB
*/
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB) {
this(amazonDynamoDB, null, null);
}

/**
* Initializes a new {@code DynamoDBTemplate}. The following combinations are
* valid:
Expand All @@ -106,49 +71,18 @@ public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB) {
* can be {@code null} -
* {@link DynamoDBMapper#DynamoDBMapper(AmazonDynamoDB, DynamoDBMapperConfig)}
* is used if {@code null} is passed in
* @param dynamoDBMapperConfig
*/
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig,
DynamoDBMapper dynamoDBMapper) {
@Autowired
public DynamoDBTemplate(AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
DynamoDBMapperConfig dynamoDBMapperConfig) {
Assert.notNull(amazonDynamoDB, "amazonDynamoDB must not be null!");
this.amazonDynamoDB = amazonDynamoDB;
Assert.notNull(dynamoDBMapper, "dynamoDBMapper must not be null!");
Assert.notNull(dynamoDBMapperConfig, "dynamoDBMapperConfig must not be null!");

if (dynamoDBMapperConfig == null) {
this.dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
} else {

// #146, #81 #157
// Trying to fix half-initialized DynamoDBMapperConfigs here.
// The old documentation advised to start with an empty builder. Therefore we
// try here to set required fields to their defaults -
// As the documentation at
// https://github.com/derjust/spring-data-dynamodb/wiki/Alter-table-name-during-runtime
// (same as https://git.io/DynamoDBMapperConfig)
// now does: Start with #DEFAULT and add what's required
DynamoDBMapperConfig.Builder emptyBuilder = DynamoDBMapperConfig.builder(); // empty (!) builder

if (dynamoDBMapperConfig.getConversionSchema() == null) {
LOGGER.warn(
"No ConversionSchema set in the provided dynamoDBMapperConfig! Merging with DynamoDBMapperConfig.DEFAULT - Please see https://git.io/DynamoDBMapperConfig");
// DynamoDBMapperConfig#DEFAULT comes with a ConversionSchema
emptyBuilder.withConversionSchema(DynamoDBMapperConfig.DEFAULT.getConversionSchema());
}

if (dynamoDBMapperConfig.getTypeConverterFactory() == null) {
LOGGER.warn(
"No TypeConverterFactory set in the provided dynamoDBMapperConfig! Merging with DynamoDBMapperConfig.DEFAULT - Please see https://git.io/DynamoDBMapperConfig");
// DynamoDBMapperConfig#DEFAULT comes with a TypeConverterFactory
emptyBuilder.withTypeConverterFactory(DynamoDBMapperConfig.DEFAULT.getTypeConverterFactory());
}

// Deprecated but the only way how DynamoDBMapperConfig#merge is exposed
this.dynamoDBMapperConfig = new DynamoDBMapperConfig(dynamoDBMapperConfig, emptyBuilder.build());
}

if (dynamoDBMapper == null) {
this.dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);
} else {
this.dynamoDBMapper = dynamoDBMapper;
}
this.amazonDynamoDB = amazonDynamoDB;
this.dynamoDBMapper = dynamoDBMapper;
this.dynamoDBMapperConfig = dynamoDBMapperConfig;
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion ...ain/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.socialsignin.spring.data.dynamodb.repository.cdi;

import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
import org.socialsignin.spring.data.dynamodb.core.DynamoDBTemplate;
Expand Down Expand Up @@ -100,8 +101,13 @@ protected T create(CreationalContext<T> creationalContext, Class<T> repositoryTy
? null
: getDependencyInstance(dynamoDBOperationsBean, DynamoDBOperations.class);

if (dynamoDBMapperConfig == null) {
dynamoDBMapperConfig = DynamoDBMapperConfig.DEFAULT;
}
DynamoDBMapper dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);

if (dynamoDBOperations == null) {
dynamoDBOperations = new DynamoDBTemplate(amazonDynamoDB, dynamoDBMapperConfig);
dynamoDBOperations = new DynamoDBTemplate(amazonDynamoDB, dynamoDBMapper, dynamoDBMapperConfig);
}

DynamoDBRepositoryFactory factory = new DynamoDBRepositoryFactory(dynamoDBOperations);
Expand Down
Loading