From fd04d756da135e4cb7813d2bdd2cb889493a32a9 Mon Sep 17 00:00:00 2001 From: Sebastian J Date: Tue, 23 Jan 2018 02:00:07 -0500 Subject: [PATCH 1/2] Issue #96: NullPointerException for findAllByOrderByProperty queries --- .../domain/sample/RepositoryFindTest.java | 58 +++++++++++++++++++ .../domain/sample/UserRepository.java | 3 + .../dynamodb/utils/DynamoDBLocalResource.java | 26 ++++++--- 3 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java new file mode 100644 index 00000000..a45e689c --- /dev/null +++ b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java @@ -0,0 +1,58 @@ +/** + * Copyright © 2013 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.domain.sample; + + +import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories; +import org.socialsignin.spring.data.dynamodb.utils.DynamoDBLocalResource; +import org.socialsignin.spring.data.dynamodb.utils.DynamoDBResource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {DynamoDBLocalResource.class, RepositoryFindTest.TestAppConfig.class}) +public class RepositoryFindTest { + + @Configuration + @EnableDynamoDBRepositories(basePackages = "org.socialsignin.spring.data.dynamodb.domain.sample") + public static class TestAppConfig { + } + + @Autowired + private AmazonDynamoDB ddb; + @Autowired + private UserRepository userRepository; + + @Before + public void setUp() { + DynamoDBLocalResource.createTable(ddb, User.class); + } + + @Test + public void testFindAll() { + List actual = userRepository.findAllByOrderByName(); + } +} + + diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java index 63cdbc13..b787cb28 100644 --- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java +++ b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java @@ -30,6 +30,9 @@ public interface UserRepository extends Repository { @EnableScan List findByLeaveDate(Instant leaveDate); + @EnableScan + List findAllByOrderByName(); + @EnableScan Optional findByName(String name); diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java b/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java index f704c15b..7a2f207f 100644 --- a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java +++ b/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java @@ -25,12 +25,16 @@ import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; import org.junit.rules.ExternalResource; +import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBEntityInformation; import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBEntityMetadataSupport; +import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBIdIsHashAndRangeKeyEntityInformation; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import javax.swing.text.html.Option; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @Configuration public class DynamoDBLocalResource extends ExternalResource { @@ -43,27 +47,31 @@ public AmazonDynamoDB amazonDynamoDB() { return ddb; } - public CreateTableResult createTable(Class domainType) { + public static CreateTableResult createTable(AmazonDynamoDB ddb, Class domainType) { DynamoDBEntityMetadataSupport support = new DynamoDBEntityMetadataSupport(domainType); + DynamoDBEntityInformation entityInfo = support.getEntityInformation(); - String tableName = support.getDynamoDBTableName(); - String hashKey = support.getHashKeyPropertyName(); - String rangeKey = support.getHashKeyPropertyName(); + String tableName = entityInfo.getDynamoDBTableName(); + String hashKey = entityInfo.getHashKeyPropertyName(); + Optional rangeKey = Optional.empty(); + if (entityInfo instanceof DynamoDBIdIsHashAndRangeKeyEntityInformation) { + rangeKey = Optional.of(((DynamoDBIdIsHashAndRangeKeyEntityInformation)entityInfo).getRangeKeyPropertyName()); + } - return createTable(tableName, hashKey, rangeKey); + return createTable(ddb, tableName, hashKey, rangeKey); } - private CreateTableResult createTable(String tableName, String hashKeyName, String rangeKeyName) { + private static CreateTableResult createTable(AmazonDynamoDB ddb, String tableName, String hashKeyName, Optional rangeKeyName) { List attributeDefinitions = new ArrayList<>(); attributeDefinitions.add(new AttributeDefinition(hashKeyName, ScalarAttributeType.S)); List ks = new ArrayList<>(); ks.add(new KeySchemaElement(hashKeyName, KeyType.HASH)); - if (rangeKeyName != null) { - attributeDefinitions.add(new AttributeDefinition(rangeKeyName, ScalarAttributeType.S)); + if (rangeKeyName.isPresent()) { + attributeDefinitions.add(new AttributeDefinition(rangeKeyName.get(), ScalarAttributeType.S)); - ks.add(new KeySchemaElement(rangeKeyName, KeyType.RANGE)); + ks.add(new KeySchemaElement(rangeKeyName.get(), KeyType.RANGE)); } ProvisionedThroughput provisionedthroughput = new ProvisionedThroughput(10L, 10L); From 184f2879e56654a4cb32f329199877974db56b9c Mon Sep 17 00:00:00 2001 From: Sebastian J Date: Thu, 25 Jan 2018 22:50:51 -0500 Subject: [PATCH 2/2] Hmmmmm --- .../spring/data/dynamodb/query/Query.java | 8 +- .../query/DynamoDBQueryCriteria.java | 4 + .../query/NullDynamoDBQueryCriteria.java | 96 +++++++++++++++++++ .../domain/sample/RepositoryFindTest.java | 7 +- .../domain/sample/UserRepository.java | 5 +- 5 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/NullDynamoDBQueryCriteria.java diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java b/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java index 603d4192..eb50d2ef 100644 --- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java +++ b/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java @@ -28,16 +28,16 @@ public interface Query { * @throws IllegalStateException if called for a Java * Persistence query language UPDATE or DELETE statement */ - public List getResultList(); + List getResultList(); /** * Execute a SELECT query that returns a single result. * @return the result */ - public T getSingleResult(); + T getSingleResult(); - public void setScanEnabled(boolean scanEnabled); - public void setScanCountEnabled(boolean scanCountEnabled); + void setScanEnabled(boolean scanEnabled); + void setScanCountEnabled(boolean scanCountEnabled); } diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java index 1fe0e183..3bab2be8 100644 --- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java +++ b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java @@ -25,6 +25,10 @@ */ public interface DynamoDBQueryCriteria { + default DynamoDBQueryCriteria NULL() { + return new NullDynamoDBQueryCriteria(); + } + DynamoDBQueryCriteria withSingleValueCriteria(String propertyName, ComparisonOperator comparisonOperator, Object value, Class type); diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/NullDynamoDBQueryCriteria.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/NullDynamoDBQueryCriteria.java new file mode 100644 index 00000000..e537c3d9 --- /dev/null +++ b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/NullDynamoDBQueryCriteria.java @@ -0,0 +1,96 @@ +package org.socialsignin.spring.data.dynamodb.repository.query; + +import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; +import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations; +import org.socialsignin.spring.data.dynamodb.query.Query; +import org.springframework.data.domain.Sort; + +import java.util.Collections; +import java.util.List; + +public class NullDynamoDBQueryCriteria implements DynamoDBQueryCriteria { + + private static final Query EMPTY_QUERY_RESULT = new Query() { + @Override + public List getResultList() { + return Collections.emptyList(); + } + + @Override + public Object getSingleResult() { + return null; + } + + @Override + public void setScanEnabled(boolean scanEnabled) { + } + + @Override + public void setScanCountEnabled(boolean scanCountEnabled) { + } + }; + + private static final Query ZERO_QUERY_RESULT = new Query() { + private final Long ZERO = Long.valueOf(0L); + private final List ZERO_LIST = Collections.singletonList(ZERO); + + @Override + public List getResultList() { + return ZERO_LIST; + } + + @Override + public Long getSingleResult() { + return ZERO; + } + + @Override + public void setScanEnabled(boolean scanEnabled) { + } + + @Override + public void setScanCountEnabled(boolean scanCountEnabled) { + } + }; + + + @Override + public DynamoDBQueryCriteria withSingleValueCriteria(String propertyName, ComparisonOperator comparisonOperator, Object value, Class type) { + return this; + } + + @Override + public DynamoDBQueryCriteria withNoValuedCriteria(String segment, ComparisonOperator null1) { + return this; + } + + @Override + public DynamoDBQueryCriteria withPropertyEquals(String segment, Object next, Class type) { + return this; + } + + @Override + public DynamoDBQueryCriteria withPropertyIn(String segment, Iterable o, Class type) { + return this; + } + + @Override + public DynamoDBQueryCriteria withPropertyBetween(String segment, Object value1, Object value2, Class type) { + return this; + } + + @Override + public DynamoDBQueryCriteria withSort(Sort sort) { + return this; + } + + @Override + public Query buildQuery(DynamoDBOperations dynamoDBOperations) { + return (Query)EMPTY_QUERY_RESULT; + } + + @Override + public Query buildCountQuery(DynamoDBOperations dynamoDBOperations, boolean pageQuery) { + return ZERO_QUERY_RESULT; + } +} diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java index a45e689c..eadffec9 100644 --- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java +++ b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/RepositoryFindTest.java @@ -28,6 +28,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import java.time.Instant; import java.util.List; @RunWith(SpringJUnit4ClassRunner.class) @@ -51,7 +52,11 @@ public void setUp() { @Test public void testFindAll() { - List actual = userRepository.findAllByOrderByName(); + //List actual1 = userRepository.findByLeaveDate(Instant.now()); + + List actual3 = userRepository.findByNameOrderByNameAsc("x"); + +// List actual = userRepository.findAllByOrderByName(); } } diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java index b787cb28..e9780a10 100644 --- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java +++ b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java @@ -31,7 +31,10 @@ public interface UserRepository extends Repository { List findByLeaveDate(Instant leaveDate); @EnableScan - List findAllByOrderByName(); + List findByNameOrderByNameAsc(String name); + + @EnableScan + List findAll(); @EnableScan Optional findByName(String name);