From fee427e46c958452390bdc33245c4e9754fe595a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 3 May 2017 08:32:28 +0200 Subject: [PATCH] DATACASS-440 - Remove support for JodaTime's deprecated DateMidnight. Related ticket: DATACMNS-1014. --- .../convert/CassandraJodaTimeConverters.java | 38 ------------------- .../CassandraTypeMappingIntegrationTest.java | 12 ------ .../cassandra/domain/AllPossibleTypes.java | 1 - ...BasicCassandraMappingContextUnitTests.java | 1 - ...RepositoryReturnTypesIntegrationTests.java | 2 +- src/main/asciidoc/reference/mapping.adoc | 3 -- 6 files changed, 1 insertion(+), 56 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java index dd946ba79..b9d1d1516 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraJodaTimeConverters.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.joda.time.DateMidnight; import org.joda.time.LocalDate; import org.springframework.core.convert.converter.Converter; import org.springframework.util.ClassUtils; @@ -54,8 +53,6 @@ public abstract class CassandraJodaTimeConverters { converters.add(CassandraLocalDateToLocalDateConverter.INSTANCE); converters.add(LocalDateToCassandraLocalDateConverter.INSTANCE); - converters.add(CassandraLocalDateToDateMidnightConverter.INSTANCE); - converters.add(DateMidnightToCassandraLocalDateConverter.INSTANCE); return converters; } @@ -92,39 +89,4 @@ public abstract class CassandraJodaTimeConverters { source.getDayOfMonth()); } } - - /** - * Simple singleton to convert {@link com.datastax.driver.core.LocalDate}s to their {@link DateMidnight} - * representation. - * - * @author Mark Paluch - */ - public enum CassandraLocalDateToDateMidnightConverter - implements Converter { - - INSTANCE; - - @Override - public DateMidnight convert(com.datastax.driver.core.LocalDate source) { - return new DateMidnight(source.getYear(), source.getMonth(), source.getDay()); - } - } - - /** - * Simple singleton to convert {@link DateMidnight}s to their {@link com.datastax.driver.core.LocalDate} - * representation. - * - * @author Mark Paluch - */ - public enum DateMidnightToCassandraLocalDateConverter - implements Converter { - - INSTANCE; - - @Override - public com.datastax.driver.core.LocalDate convert(DateMidnight source) { - return com.datastax.driver.core.LocalDate.fromYearMonthDay(source.getYear(), source.getMonthOfYear(), - source.getDayOfMonth()); - } - } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java index 39898ab6f..1939180f6 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CassandraTypeMappingIntegrationTest.java @@ -533,18 +533,6 @@ public class CassandraTypeMappingIntegrationTest extends AbstractKeyspaceCreatin assertThat(loaded.getJodaLocalDate()).isEqualTo(entity.getJodaLocalDate()); } - @Test // DATACASS-296 - public void shouldReadAndWriteJodaDateMidnight() { - - AllPossibleTypes entity = new AllPossibleTypes("1"); - entity.setJodaDateMidnight(new org.joda.time.DateMidnight(2010, 7, 4)); - - operations.insert(entity); - AllPossibleTypes loaded = load(entity); - - assertThat(loaded.getJodaDateMidnight()).isEqualTo(entity.getJodaDateMidnight()); - } - @Test // DATACASS-296 public void shouldReadAndWriteJodaDateTime() { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java index 79891d617..41702c2d3 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java @@ -101,7 +101,6 @@ public class AllPossibleTypes { org.joda.time.LocalDate jodaLocalDate; org.joda.time.LocalDateTime jodaLocalDateTime; org.joda.time.DateTime jodaDateTime; - org.joda.time.DateMidnight jodaDateMidnight; org.threeten.bp.LocalDate bpLocalDate; org.threeten.bp.LocalDateTime bpLocalDateTime; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java index 80aaefb15..f882a7476 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java @@ -210,7 +210,6 @@ public class CreateTableSpecificationBasicCassandraMappingContextUnitTests { assertThat(getColumnType("date", specification)).isEqualTo(DataType.date()); assertThat(getColumnType("localDate", specification)).isEqualTo(DataType.date()); assertThat(getColumnType("jodaLocalDate", specification)).isEqualTo(DataType.date()); - assertThat(getColumnType("jodaDateMidnight", specification)).isEqualTo(DataType.date()); assertThat(getColumnType("bpLocalDate", specification)).isEqualTo(DataType.date()); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java index 79750e1f2..871135ec1 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/isolated/RepositoryReturnTypesIntegrationTests.java @@ -262,7 +262,7 @@ public class RepositoryReturnTypesIntegrationTests extends AbstractSpringDataEmb allPossibleTypesRepository.save(entity); Map result = allPossibleTypesRepository.findEntityAsMapById(entity.getId()); - assertThat(result).hasSize(43); + assertThat(result).hasSize(42); assertThat(result.get("primitiveinteger")).isEqualTo((Object) Integer.valueOf(123)); assertThat(result.get("biginteger")).isEqualTo((Object) BigInteger.ONE); } diff --git a/src/main/asciidoc/reference/mapping.adoc b/src/main/asciidoc/reference/mapping.adoc index 1a71d462d..f145ac20e 100644 --- a/src/main/asciidoc/reference/mapping.adoc +++ b/src/main/asciidoc/reference/mapping.adoc @@ -106,9 +106,6 @@ for further details. (Joda, Java 8, JSR310-BackPort) | `timestamp` -| `DateMidnight` (Joda) -| `date` - | `ZoneId` (Java 8, JSR310-BackPort) | `text`