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

DATACOUCH-90 - Add commons Jsr310 converters to support Java 8 date/time

Browse Source 
Original pull request: #139.
This commit is contained in:
Subhashni Balakrishnan
2017-04-10 03:38:55 -07:00
parent 4cca923c59
commit de4e02cedb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java
View File

@@ -36,6 +36,7 @@ import org.springframework.data.convert.ReadingConverter;
import org.springframework.data.convert.WritingConverter; import org.springframework.data.convert.WritingConverter;
import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.mapping.model.SimpleTypeHolder;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.data.convert.Jsr310Converters;
/** /**
* Value object to capture custom conversion. * Value object to capture custom conversion.
@@ -46,6 +47,7 @@ import org.springframework.util.Assert;
* @author Michael Nitschinger * @author Michael Nitschinger
* @author Oliver Gierke * @author Oliver Gierke
* @author Mark Paluch * @author Mark Paluch
* @author Subhashni Balakrishnan
*/ */
public class CustomConversions { public class CustomConversions {
@@ -88,6 +90,7 @@ public class CustomConversions {
this.converters = new ArrayList<Object>(); this.converters = new ArrayList<Object>();
this.converters.addAll(converters); this.converters.addAll(converters);
this.converters.addAll(DateConverters.getConvertersToRegister()); this.converters.addAll(DateConverters.getConvertersToRegister());
this.converters.addAll(Jsr310Converters.getConvertersToRegister());
for (Object converter : this.converters) { for (Object converter : this.converters) {
registerConversion(converter); registerConversion(converter);

12
src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2013 the original author or authors. * Copyright 2013-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -33,7 +33,9 @@ import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.TreeSet; import java.util.TreeSet;
import org.joda.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.data.convert.Jsr310Converters.LocalDateTimeToDateConverter;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +55,7 @@ import com.couchbase.client.java.repository.annotation.Field;
/** /**
* @author Michael Nitschinger * @author Michael Nitschinger
* @author Geoffrey Mina * @author Geoffrey Mina
* @author Subhashni Balakrishnan
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = UnitTestApplicationConfig.class) @ContextConfiguration(classes = UnitTestApplicationConfig.class)
@@ -477,12 +480,13 @@ public class MappingCouchbaseConverterTests {
converter.write(entity, converted); converter.write(entity, converted);
assertEquals(created.getTime(), converted.getPayload().get("created")); assertEquals(created.getTime(), converted.getPayload().get("created"));
assertEquals(modified.getTimeInMillis() / 1000, converted.getPayload().get("modified")); assertEquals(modified.getTimeInMillis() / 1000, converted.getPayload().get("modified"));
assertEquals(deleted.toDate().getTime(), converted.getPayload().get("deleted")); LocalDateTimeToDateConverter localDateTimeToDateconverter = LocalDateTimeToDateConverter.INSTANCE;
assertEquals(localDateTimeToDateconverter.convert(deleted), converted.getPayload().get("deleted"));
DateEntity read = converter.read(DateEntity.class, converted); DateEntity read = converter.read(DateEntity.class, converted);
assertEquals(created.getTime(), read.created.getTime()); assertEquals(created.getTime(), read.created.getTime());
assertEquals(modified.getTimeInMillis() / 1000, read.modified.getTimeInMillis() / 1000); assertEquals(modified.getTimeInMillis() / 1000, read.modified.getTimeInMillis() / 1000);
assertEquals(deleted.toDate().getTime(), read.deleted.toDate().getTime()); assertTrue(deleted.isEqual(read.deleted));
} }
@Test @Test