This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git
commit 18d95f9b59c7a74be741f400ff97fc2d83b396bc Author: LahiruJayasekara <mlpjayasek...@gmail.com> AuthorDate: Sun May 12 13:23:31 2019 +0530 Fix mapping file name access method in dynamoDBStore --- .../main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java index e5ba17c..48ecf3a 100644 --- a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java +++ b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java @@ -41,6 +41,7 @@ import org.apache.gora.query.PartitionQuery; import org.apache.gora.query.Query; import org.apache.gora.query.Result; import org.apache.gora.store.DataStore; +import org.apache.gora.store.DataStoreFactory; import org.apache.gora.util.GoraException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -226,7 +227,9 @@ public class DynamoDBStore<K, T extends Persistent> implements DataStore<K, T> { setDynamoDBClient(DynamoDBUtils.getClient( properties.getProperty(CLI_TYP_PROP), creds)); getDynamoDBClient().setEndpoint(properties.getProperty(ENDPOINT_PROP)); - setDynamoDbMapping(readMapping()); + String mappingFile = DataStoreFactory.getMappingFile(properties, this, + MAPPING_FILE); + setDynamoDbMapping(readMapping(mappingFile)); setConsistency(properties.getProperty(CONSISTENCY_READS)); } @@ -311,14 +314,14 @@ public class DynamoDBStore<K, T extends Persistent> implements DataStore<K, T> { * @throws IOException */ @SuppressWarnings("unchecked") - private DynamoDBMapping readMapping() throws IOException { + private DynamoDBMapping readMapping(String filename) throws IOException { DynamoDBMappingBuilder mappingBuilder = new DynamoDBMappingBuilder(); try { SAXBuilder builder = new SAXBuilder(); Document doc = builder.build(getClass().getClassLoader() - .getResourceAsStream(MAPPING_FILE)); + .getResourceAsStream(filename)); if (doc == null || doc.getRootElement() == null) throw new GoraException("Unable to load " + MAPPING_FILE + ". Please check its existance!");