Skip to content

Issue #17 - Create table when not exist #219

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 1 commit into from
Jan 23, 2019
Merged

Issue #17 - Create table when not exist #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
120 changes: 45 additions & 75 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
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
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
83 changes: 83 additions & 0 deletions .../org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/**
* Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/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.config;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.lang.Nullable;

import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;

public class DynamoDBMapperConfigFactory implements FactoryBean<DynamoDBMapperConfig>, BeanPostProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBMapperConfigFactory.class);
@Override
public DynamoDBMapperConfig getObject() throws Exception {
return DynamoDBMapperConfig.DEFAULT;
}

@Override
public Class<?> getObjectType() {
return DynamoDBMapperConfig.class;
}

@Nullable
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof DynamoDBMapperConfig) {
DynamoDBMapperConfig dynamoDBMapperConfig = (DynamoDBMapperConfig) bean;
if (dynamoDBMapperConfig == DynamoDBMapperConfig.DEFAULT) {
return bean;
}
// #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());
}

return createDynamoDBMapperConfig(dynamoDBMapperConfig, emptyBuilder);

} else {
return bean;
}
}

@SuppressWarnings("deprecation")
private DynamoDBMapperConfig createDynamoDBMapperConfig(DynamoDBMapperConfig dynamoDBMapperConfig,
DynamoDBMapperConfig.Builder emptyBuilder) {
// Deprecated but the only way how DynamoDBMapperConfig#merge is exposed
return new DynamoDBMapperConfig(dynamoDBMapperConfig, emptyBuilder.build());
}
}
Loading