Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-384 - Apply converters to string based query parameters

Browse Source 
Apply the converters registered to serialize the positional and
named parameters to match the database representation

Original Pull Request: #172.
This commit is contained in:
Subhashni Balakrishnan
2018-11-07 16:24:01 -08:00
parent cb29b4362f
commit 5cb9eca443
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/integration/java/org/springframework/data/couchbase/repository/N1qlCouchbaseRepositoryTests.java
View File

@@ -38,6 +38,8 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/**
@@ -125,7 +127,7 @@ public class N1qlCouchbaseRepositoryTests {
Pageable pageable = new PageRequest(0, 8);
Page<Party> page1 = repository.findAll(pageable);
assertEquals(16, page1.getTotalElements()); //12 generated parties + 4 specifically crafted party
assertEquals(17, page1.getTotalElements()); //12 generated parties + 5 specifically crafted party
assertEquals(8, page1.getNumberOfElements());
}
@@ -134,7 +136,7 @@ public class N1qlCouchbaseRepositoryTests {
Pageable pageable = new PageRequest(0, 8, Sort.Direction.DESC, "attendees");
Page<Party> page1 = repository.findAll(pageable);
assertEquals(16, page1.getTotalElements()); //12 generated parties + 4 specifically crafted party
assertEquals(17, page1.getTotalElements()); //12 generated parties + 5 specifically crafted party
assertEquals(8, page1.getNumberOfElements());
List<Party> parties = page1.getContent();
@@ -160,4 +162,16 @@ public class N1qlCouchbaseRepositoryTests {
assertTrue(partyList.size() == 1);
}
@Test
public void testSpelDateConvertion() {
final String key = "testSpelDateConvertion";
Calendar cal = Calendar.getInstance();
cal.clear();
cal.set(2018, Calendar.SEPTEMBER, 10);
Date date = cal.getTime();
partyRepository.save(new Party(key, "", "", date, 0, null));
List<Party> partyList = partyRepository.getByEventDate(date);
assertTrue(partyList.size() == 1);
assertEquals("Key mismatch", partyList.get(0).getKey(), key);
}
}

3
src/integration/java/org/springframework/data/couchbase/repository/PartyRepository.java
View File

@@ -78,4 +78,7 @@ public interface PartyRepository extends CouchbaseRepository<Party, String> {
List<Party> findByDescriptionOrName(String description, String name);
List<Party> removeByDescriptionOrName(String description, String name);
@Query("#{#n1ql.selectEntity} where #{#n1ql.filter} and eventDate = $1")
List<Party> getByEventDate(Date eventDate);
}

4
src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlBasedQuery.java
View File

@@ -266,7 +266,7 @@ public class StringN1qlBasedQuery extends AbstractN1qlBasedQuery {
private JsonValue getPositionalPlaceholderValues(ParameterAccessor accessor) {
JsonArray posValues = JsonArray.create();
for (Parameter parameter : getQueryMethod().getParameters().getBindableParameters()) {
posValues.add(accessor.getBindableValue(parameter.getIndex()));
posValues.add(getCouchbaseOperations().getConverter().convertForWriteIfNeeded(accessor.getBindableValue(parameter.getIndex())));
}
return posValues;
}
@@ -276,7 +276,7 @@ public class StringN1qlBasedQuery extends AbstractN1qlBasedQuery {
for (Parameter parameter : getQueryMethod().getParameters().getBindableParameters()) {
String placeholder = parameter.getPlaceholder();
Object value = accessor.getBindableValue(parameter.getIndex());
Object value = getCouchbaseOperations().getConverter().convertForWriteIfNeeded(accessor.getBindableValue(parameter.getIndex()));
if (placeholder != null && placeholder.charAt(0) == ':') {
placeholder = placeholder.replaceFirst(":", "");