Skip to content

https://github.com/boostchicken/spring-data-dynamodb/issues/8 #11

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 25, 2020
Merged

https://github.com/boostchicken/spring-data-dynamodb/issues/8 #11

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
14 changes: 11 additions & 3 deletions ...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 @@ -46,6 +46,8 @@ class DynamoDBRepositoryBean<T> extends CdiRepositoryBean<T> {

private final Bean<DynamoDBOperations> dynamoDBOperationsBean;

private final Bean<DynamoDBMapper> dynamoDBMapperBean;

/**
* Constructs a {@link DynamoDBRepositoryBean}.
*
Expand All @@ -62,7 +64,7 @@ class DynamoDBRepositoryBean<T> extends CdiRepositoryBean<T> {
*/
DynamoDBRepositoryBean(BeanManager beanManager, Bean<AmazonDynamoDB> amazonDynamoDBBean,
Bean<DynamoDBMapperConfig> dynamoDBMapperConfigBean, Bean<DynamoDBOperations> dynamoDBOperationsBean,
Set<Annotation> qualifiers, Class<T> repositoryType) {
Bean<DynamoDBMapper> dynamoDBMapperBean, Set<Annotation> qualifiers, Class<T> repositoryType) {

super(qualifiers, repositoryType, beanManager);
if (dynamoDBOperationsBean == null) {
Expand All @@ -77,6 +79,7 @@ class DynamoDBRepositoryBean<T> extends CdiRepositoryBean<T> {
this.amazonDynamoDBBean = amazonDynamoDBBean;
this.dynamoDBMapperConfigBean = dynamoDBMapperConfigBean;
this.dynamoDBOperationsBean = dynamoDBOperationsBean;
this.dynamoDBMapperBean = dynamoDBMapperBean;
}

/*
Expand All @@ -97,15 +100,20 @@ protected T create(CreationalContext<T> creationalContext, Class<T> repositoryTy
? null
: getDependencyInstance(dynamoDBMapperConfigBean, DynamoDBMapperConfig.class);

DynamoDBMapper dynamoDBMapper = dynamoDBMapperBean == null
? null
: getDependencyInstance(dynamoDBMapperBean, DynamoDBMapper.class);

DynamoDBOperations dynamoDBOperations = dynamoDBOperationsBean == null
? null
: getDependencyInstance(dynamoDBOperationsBean, DynamoDBOperations.class);

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

if(dynamoDBMapper == null) {
dynamoDBMapper = new DynamoDBMapper(amazonDynamoDB, dynamoDBMapperConfig);
}
if (dynamoDBOperations == null) {
dynamoDBOperations = new DynamoDBTemplate(amazonDynamoDB, dynamoDBMapper, dynamoDBMapperConfig);
}
Expand Down
15 changes: 13 additions & 2 deletions ...ava/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -54,6 +55,7 @@ public class DynamoDBRepositoryExtension extends CdiRepositoryExtensionSupport {

private final Map<Set<Annotation>, Bean<DynamoDBMapperConfig>> dbMapperConfigs = new HashMap<Set<Annotation>, Bean<DynamoDBMapperConfig>>();

private final Map<Set<Annotation>, Bean<DynamoDBMapper>> dbMapper = new HashMap<>();
public DynamoDBRepositoryExtension() {
LOGGER.info("Activating CDI extension for Spring Data DynamoDB repositories.");
}
Expand Down Expand Up @@ -89,6 +91,14 @@ <X> void processBean(@Observes ProcessBean<X> processBean) {
dbMapperConfigs.put(qualifiers, (Bean<DynamoDBMapperConfig>) bean);
}
}
if (type instanceof Class<?> && DynamoDBMapper.class.isAssignableFrom((Class<?>) type)) {
Set<Annotation> qualifiers = new HashSet<Annotation>(bean.getQualifiers());
if (bean.isAlternative() || !dbMapper.containsKey(qualifiers)) {
LOGGER.debug("Discovered '{}' with qualifiers {}.", DynamoDBMapper.class.getName(),
qualifiers);
dbMapper.put(qualifiers, (Bean<DynamoDBMapper>) bean);
}
}
}
}

Expand Down Expand Up @@ -138,16 +148,17 @@ private <T> Bean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation
// qualifiers of the repository.
Bean<DynamoDBMapperConfig> dynamoDBMapperConfigBean = dbMapperConfigs.get(qualifiers);

Bean<DynamoDBOperations> dynamoDBOperationsBean = dynamoDBOperationss.get(qualifiers);
if (amazonDynamoDBBean == null) {
throw new UnsatisfiedResolutionException(
String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
AmazonDynamoDBClient.class.getName(), qualifiers));
}

Bean<DynamoDBOperations> dynamoDBOperationsBean = dynamoDBOperationss.get(qualifiers);
Bean<DynamoDBMapper> dynamoDBMapperBean = dbMapper.get(qualifiers);

// Construct and return the repository bean.
return new DynamoDBRepositoryBean<T>(beanManager, amazonDynamoDBBean, dynamoDBMapperConfigBean,
dynamoDBOperationsBean, qualifiers, repositoryType);
dynamoDBOperationsBean, dynamoDBMapperBean, qualifiers, repositoryType);
}
}
15 changes: 9 additions & 6 deletions ...java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.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.junit.Before;
import org.junit.Rule;
Expand Down Expand Up @@ -62,6 +63,8 @@ interface SampleRepository extends Repository<User, String> {
@Mock
private Bean<DynamoDBOperations> dynamoDBOperationsBean;

@Mock
private Bean<DynamoDBMapper> dynamoDBMapperBean;
private Set<Annotation> qualifiers = Collections.emptySet();
private Class<SampleRepository> repositoryType = SampleRepository.class;

Expand All @@ -75,7 +78,7 @@ public void setUp() {
@Test
public void testNullOperationsOk() {
DynamoDBRepositoryBean<SampleRepository> underTest = new DynamoDBRepositoryBean<>(beanManager,
amazonDynamoDBBean, dynamoDBMapperConfigBean, null, qualifiers, repositoryType);
amazonDynamoDBBean, dynamoDBMapperConfigBean, null, dynamoDBMapperBean, qualifiers, repositoryType);

assertNotNull(underTest);
}
Expand All @@ -84,13 +87,13 @@ public void testNullOperationsOk() {
public void testNullOperationFail() {
expectedException.expectMessage("amazonDynamoDBBean must not be null!");

new DynamoDBRepositoryBean<>(beanManager, null, dynamoDBMapperConfigBean, null, qualifiers, repositoryType);
new DynamoDBRepositoryBean<>(beanManager, null, dynamoDBMapperConfigBean, null, null, qualifiers, repositoryType);
}

@Test
public void testSetOperationOk1() {
DynamoDBRepositoryBean<SampleRepository> underTest = new DynamoDBRepositoryBean<>(beanManager, null, null,
dynamoDBOperationsBean, qualifiers, repositoryType);
dynamoDBOperationsBean, dynamoDBMapperBean, qualifiers, repositoryType);

assertNotNull(underTest);
}
Expand All @@ -100,7 +103,7 @@ public void testSetOperationFail1() {
expectedException.expectMessage(
"Cannot specify both dynamoDBMapperConfigBean bean and dynamoDBOperationsBean in repository configuration");

new DynamoDBRepositoryBean<>(beanManager, null, dynamoDBMapperConfigBean, dynamoDBOperationsBean, qualifiers,
new DynamoDBRepositoryBean<>(beanManager, null, dynamoDBMapperConfigBean, dynamoDBOperationsBean, dynamoDBMapperBean, qualifiers,
repositoryType);
}

Expand All @@ -109,14 +112,14 @@ public void testSetOperationFail2() {
expectedException.expectMessage(
"Cannot specify both amazonDynamoDB bean and dynamoDBOperationsBean in repository configuration");

new DynamoDBRepositoryBean<>(beanManager, amazonDynamoDBBean, null, dynamoDBOperationsBean, qualifiers,
new DynamoDBRepositoryBean<>(beanManager, amazonDynamoDBBean, null, dynamoDBOperationsBean, dynamoDBMapperBean, qualifiers,
repositoryType);
}

@Test
public void testCreateRepostiory() {
DynamoDBRepositoryBean<SampleRepository> underTest = new DynamoDBRepositoryBean<>(beanManager,
amazonDynamoDBBean, dynamoDBMapperConfigBean, null, qualifiers, repositoryType);
amazonDynamoDBBean, dynamoDBMapperConfigBean, null, dynamoDBMapperBean, qualifiers, repositoryType);

SampleRepository actual = underTest.create(repoCreationalContext, SampleRepository.class,
Optional.<Object>empty());
Expand Down