Skip to content

Clean up EntityMetadataSupport after bugfix for handling configured table prefixes and secondary indices #89

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
Aug 27, 2020
Merged

Clean up EntityMetadataSupport after bugfix for handling configured table prefixes and secondary indices #89

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
56 changes: 7 additions & 49 deletions ...g/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,53 +69,7 @@ public String getDynamoDBTableName() {
* must not be {@literal null}.
*/
public DynamoDBEntityMetadataSupport(final Class<T> domainType) {

Assert.notNull(domainType, "Domain type must not be null!");
this.domainType = domainType;

DynamoDBTable table = this.domainType.getAnnotation(DynamoDBTable.class);
Assert.notNull(table, "Domain type must by annotated with DynamoDBTable!");

this.dynamoDBTableName = table.tableName();
this.hashKeyPropertyName = null;
this.globalSecondaryIndexNames = new HashMap<>();
this.globalIndexHashKeyPropertyNames = new ArrayList<>();
this.globalIndexRangeKeyPropertyNames = new ArrayList<>();
ReflectionUtils.doWithMethods(domainType, method -> {
if (method.getAnnotation(DynamoDBHashKey.class) != null) {
hashKeyPropertyName = getPropertyNameForAccessorMethod(method);
}
if (method.getAnnotation(DynamoDBRangeKey.class) != null) {
hasRangeKey = true;
}
DynamoDBIndexRangeKey dynamoDBRangeKeyAnnotation = method.getAnnotation(DynamoDBIndexRangeKey.class);
DynamoDBIndexHashKey dynamoDBHashKeyAnnotation = method.getAnnotation(DynamoDBIndexHashKey.class);

if (dynamoDBRangeKeyAnnotation != null) {
addGlobalSecondaryIndexNames(method, dynamoDBRangeKeyAnnotation);
}
if (dynamoDBHashKeyAnnotation != null) {
addGlobalSecondaryIndexNames(method, dynamoDBHashKeyAnnotation);
}
});
ReflectionUtils.doWithFields(domainType, field -> {
if (field.getAnnotation(DynamoDBHashKey.class) != null) {
hashKeyPropertyName = getPropertyNameForField(field);
}
if (field.getAnnotation(DynamoDBRangeKey.class) != null) {
hasRangeKey = true;
}
DynamoDBIndexRangeKey dynamoDBRangeKeyAnnotation = field.getAnnotation(DynamoDBIndexRangeKey.class);
DynamoDBIndexHashKey dynamoDBHashKeyAnnotation = field.getAnnotation(DynamoDBIndexHashKey.class);

if (dynamoDBRangeKeyAnnotation != null) {
addGlobalSecondaryIndexNames(field, dynamoDBRangeKeyAnnotation);
}
if (dynamoDBHashKeyAnnotation != null) {
addGlobalSecondaryIndexNames(field, dynamoDBHashKeyAnnotation);
}
});
Assert.notNull(hashKeyPropertyName, "Unable to find hash key field or getter method on " + domainType + "!");
this(domainType, null);
}

/**
Expand All @@ -125,7 +79,7 @@ public DynamoDBEntityMetadataSupport(final Class<T> domainType) {
* @param domainType
* must not be {@literal null}.
* @param dynamoDBOperations
* must not be {@literal null}.
* dynamoDBOperations as populated from Spring Data DynamoDB Configuration
*/
public DynamoDBEntityMetadataSupport(final Class<T> domainType, DynamoDBOperations dynamoDBOperations) {

Expand All @@ -135,7 +89,11 @@ public DynamoDBEntityMetadataSupport(final Class<T> domainType, DynamoDBOperatio
DynamoDBTable table = this.domainType.getAnnotation(DynamoDBTable.class);
Assert.notNull(table, "Domain type must by annotated with DynamoDBTable!");

this.dynamoDBTableName = dynamoDBOperations.getOverriddenTableName(domainType, table.tableName());
if (dynamoDBOperations != null) {
this.dynamoDBTableName = dynamoDBOperations.getOverriddenTableName(domainType, table.tableName());
} else {
this.dynamoDBTableName = table.tableName();
}
this.hashKeyPropertyName = null;
this.globalSecondaryIndexNames = new HashMap<>();
this.globalIndexHashKeyPropertyNames = new ArrayList<>();
Expand Down