Fix date conversion (spring-attic#2070)

* fix date conversion; fixes spring-attic#2067

Author: dmitry-s

docs/src/main/asciidoc/spanner.adoc

@@ -441,6 +441,8 @@ Natively supported types:
 * `java.util.Date`
 * `java.util.Instant`
 * `java.sql.Date`
+* `java.time.LocalDate`
+* `java.time.LocalDateTime`
 
 
 ==== Lists

spring-cloud-gcp-data-spanner/src/main/java/org/springframework/cloud/gcp/data/spanner/core/convert/SpannerConverters.java

@@ -18,6 +18,8 @@
 
 import java.sql.Date;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
@@ -80,38 +82,91 @@ public java.sql.Date convert(com.google.cloud.Date date) {
 					};
 
 	/**
-	 * A converter from {@link java.util.Date} to the Spanner date type.
+	 * A converter from {@link LocalDate} to the Spanner date type.
 	 */
 	// @formatter:off
-	public static final Converter<java.util.Date, com.google.cloud.Date>
-					JAVA_TO_SPANNER_DATE_CONVERTER = new Converter<java.util.Date, com.google.cloud.Date>() {
+	public static final Converter<LocalDate, com.google.cloud.Date>
+					LOCAL_DATE_TIMESTAMP_CONVERTER = new Converter<LocalDate, com.google.cloud.Date>() {
 		// @formatter:on
 		@Nullable
 		@Override
-		public com.google.cloud.Date convert(java.util.Date date) {
-			Calendar cal = Calendar.getInstance();
-			cal.setTime(date);
-			return com.google.cloud.Date.fromYearMonthDay(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1,
-							cal.get(Calendar.DAY_OF_MONTH));
+		public com.google.cloud.Date convert(LocalDate date) {
+			return com.google.cloud.Date.fromYearMonthDay(date.getYear(), date.getMonthValue(), date.getDayOfMonth());
 		}
 	};
 
 	/**
-	 * A converter from the Spanner date type to {@link java.util.Date}.
+	 * A converter from the Spanner date type to {@link LocalDate}.
 	 */
 	// @formatter:off
-	public static final Converter<com.google.cloud.Date, java.util.Date> SPANNER_TO_JAVA_DATE_CONVERTER =
-					new Converter<com.google.cloud.Date, java.util.Date>() {
+	public static final Converter<com.google.cloud.Date, LocalDate> TIMESTAMP_LOCAL_DATE_CONVERTER =
+					new Converter<com.google.cloud.Date, LocalDate>() {
 						// @formatter:on
 						@Nullable
 						@Override
-						public java.util.Date convert(com.google.cloud.Date date) {
-							Calendar cal = Calendar.getInstance();
-							cal.set(date.getYear(), date.getMonth() - 1, date.getDayOfMonth());
-							return cal.getTime();
+						public LocalDate convert(com.google.cloud.Date date) {
+							return LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth());
 						}
 					};
 
+	/**
+	 * A converter from {@link LocalDateTime} to the Spanner timestamp type.
+	 */
+	// @formatter:off
+	public static final Converter<LocalDateTime, Timestamp>
+			LOCAL_DATE_TIME_TIMESTAMP_CONVERTER = new Converter<LocalDateTime, Timestamp>() {
+		// @formatter:on
+		@Nullable
+		@Override
+		public Timestamp convert(LocalDateTime dateTime) {
+			return JAVA_TO_SPANNER_TIMESTAMP_CONVERTER.convert(java.sql.Timestamp.valueOf(dateTime));
+		}
+	};
+
+	/**
+	 * A converter from the Spanner timestamp type to {@link LocalDateTime}.
+	 */
+	// @formatter:off
+	public static final Converter<Timestamp, LocalDateTime> TIMESTAMP_LOCAL_DATE_TIME_CONVERTER =
+			new Converter<Timestamp, LocalDateTime>() {
+				// @formatter:on
+				@Nullable
+				@Override
+				public LocalDateTime convert(Timestamp timestamp) {
+					return SPANNER_TO_JAVA_TIMESTAMP_CONVERTER.convert(timestamp).toLocalDateTime();
+				}
+			};
+
+	/**
+	 * A converter from {@link java.util.Date} to the Spanner timestamp type.
+	 */
+	// @formatter:off
+	public static final Converter<java.util.Date, Timestamp>
+			DATE_TIMESTAMP_CONVERTER = new Converter<java.util.Date, Timestamp>() {
+		// @formatter:on
+		@Nullable
+		@Override
+		public Timestamp convert(java.util.Date date) {
+			long time = date.getTime();
+			long secs = Math.floorDiv(time, 1000L);
+			int nanos = Math.toIntExact((time - secs * 1000L) * 1000000L);
+			return Timestamp.ofTimeSecondsAndNanos(secs, nanos);
+		}
+	};
+
+	/**
+	 * A converter from the Spanner timestamp type to {@link java.util.Date}.
+	 */
+	// @formatter:off
+	public static final Converter<Timestamp, java.util.Date> TIMESTAMP_DATE_CONVERTER =
+			new Converter<Timestamp, java.util.Date>() {
+				// @formatter:on
+				@Nullable
+				@Override
+				public java.util.Date convert(Timestamp timestamp) {
+					return timestamp.toDate();
+				}
+			};
 	/**
 	 * A converter from {@link Instant} to the Spanner instantaneous time type.
 	 */
@@ -151,8 +206,7 @@ public Instant convert(Timestamp timestamp) {
 						@Override
 						public Timestamp convert(java.sql.Timestamp timestamp) {
 							long secs = Math.floorDiv(timestamp.getTime(), 1000L);
-							int nanos = timestamp.getNanos();
-							return Timestamp.ofTimeSecondsAndNanos(secs, nanos);
+							return Timestamp.ofTimeSecondsAndNanos(secs, timestamp.getNanos());
 						}
 					};
 
@@ -201,18 +255,22 @@ public byte[] convert(ByteArray bytes) {
 	/** Converters from common types to those used by Spanner. */
 	public static final Collection<Converter> DEFAULT_SPANNER_WRITE_CONVERTERS = Collections.unmodifiableCollection(
 			Arrays.asList(
-					JAVA_TO_SPANNER_DATE_CONVERTER,
+					DATE_TIMESTAMP_CONVERTER,
 					INSTANT_TIMESTAMP_CONVERTER,
 					JAVA_TO_SPANNER_BYTE_ARRAY_CONVERTER,
 					JAVA_TO_SPANNER_TIMESTAMP_CONVERTER,
-					JAVA_SQL_TO_SPANNER_DATE_CONVERTER));
+					JAVA_SQL_TO_SPANNER_DATE_CONVERTER,
+					LOCAL_DATE_TIMESTAMP_CONVERTER,
+					LOCAL_DATE_TIME_TIMESTAMP_CONVERTER));
 
 	/** Converters from common types to those used by Spanner. */
 	public static final Collection<Converter> DEFAULT_SPANNER_READ_CONVERTERS = Collections.unmodifiableCollection(
 			Arrays.asList(
-					SPANNER_TO_JAVA_DATE_CONVERTER,
+					TIMESTAMP_DATE_CONVERTER,
 					TIMESTAMP_INSTANT_CONVERTER,
 					SPANNER_TO_JAVA_BYTE_ARRAY_CONVERTER,
 					SPANNER_TO_JAVA_TIMESTAMP_CONVERTER,
-					SPANNER_TO_JAVA_SQL_DATE_CONVERTER));
+					SPANNER_TO_JAVA_SQL_DATE_CONVERTER,
+					TIMESTAMP_LOCAL_DATE_CONVERTER,
+					TIMESTAMP_LOCAL_DATE_TIME_CONVERTER));
 }

spring-cloud-gcp-data-spanner/src/test/java/org/springframework/cloud/gcp/data/spanner/core/convert/ConverterAwareMappingSpannerEntityProcessorTests.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.gcp.data.spanner.core.convert;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -83,8 +84,9 @@ public void canConvertDefaultTypesNoCustomConverters() {
 		ConverterAwareMappingSpannerEntityProcessor converter = new ConverterAwareMappingSpannerEntityProcessor(
 				new SpannerMappingContext());
 
-		verifyCanConvert(converter, java.util.Date.class, Date.class);
+		verifyCanConvert(converter, java.util.Date.class, Timestamp.class);
 		verifyCanConvert(converter, Instant.class, Timestamp.class);
+		verifyCanConvert(converter, LocalDate.class, Date.class);
 	}
 
 	@Test
@@ -93,7 +95,8 @@ public void canConvertDefaultTypesCustomConverters() {
 				new SpannerMappingContext(), Arrays.asList(JAVA_TO_SPANNER),
 				Arrays.asList(SPANNER_TO_JAVA));
 
-		verifyCanConvert(converter, java.util.Date.class, Date.class);
+		verifyCanConvert(converter, java.util.Date.class, Timestamp.class);
+		verifyCanConvert(converter, LocalDate.class, Date.class);
 		verifyCanConvert(converter, Instant.class, Timestamp.class);
 		verifyCanConvert(converter, JavaType.class, SpannerType.class);
 	}

spring-cloud-gcp-data-spanner/src/test/java/org/springframework/cloud/gcp/data/spanner/core/mapping/SpannerConvertersTest.java

@@ -16,6 +16,10 @@
 
 package org.springframework.cloud.gcp.data.spanner.core.mapping;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
 import com.google.cloud.Timestamp;
@@ -32,11 +36,46 @@
  */
 public class SpannerConvertersTest {
 
+	@Test
+	public void localDateTimeConversionTest() {
+		LocalDateTime dateTime = LocalDateTime.now();
+		assertThat(SpannerConverters.TIMESTAMP_LOCAL_DATE_TIME_CONVERTER
+				.convert(SpannerConverters.LOCAL_DATE_TIME_TIMESTAMP_CONVERTER.convert(dateTime))).isEqualTo(dateTime);
+	}
+
+	@Test
+	public void localDateTimeConversionPreEpochTest() {
+		LocalDateTime dateTime = LocalDateTime.of(600, 12, 1, 2, 3, 4, 5);
+		assertThat(SpannerConverters.TIMESTAMP_LOCAL_DATE_TIME_CONVERTER
+				.convert(SpannerConverters.LOCAL_DATE_TIME_TIMESTAMP_CONVERTER.convert(dateTime))).isEqualTo(dateTime);
+	}
+
 	@Test
 	public void dateConversionTest() {
-		Date date = Date.fromYearMonthDay(2018, 3, 29);
-		assertThat(SpannerConverters.JAVA_TO_SPANNER_DATE_CONVERTER
-				.convert(SpannerConverters.SPANNER_TO_JAVA_DATE_CONVERTER.convert(date))).isEqualTo(date);
+		Timestamp timestamp = Timestamp.now();
+		assertThat(SpannerConverters.DATE_TIMESTAMP_CONVERTER
+				.convert(SpannerConverters.TIMESTAMP_DATE_CONVERTER.convert(timestamp))).isEqualTo(timestamp);
+	}
+
+	@Test
+	public void dateConversionPreEpochTest() {
+		java.util.Date timestamp = java.util.Date.from(Instant.ofEpochSecond(-12345678, -123));
+		assertThat(SpannerConverters.TIMESTAMP_DATE_CONVERTER
+				.convert(SpannerConverters.DATE_TIMESTAMP_CONVERTER.convert(timestamp))).isEqualTo(timestamp);
+	}
+
+	@Test
+	public void localDateConversionTest() {
+		LocalDate localDate = LocalDate.now();
+		assertThat(SpannerConverters.TIMESTAMP_LOCAL_DATE_CONVERTER
+				.convert(SpannerConverters.LOCAL_DATE_TIMESTAMP_CONVERTER.convert(localDate))).isEqualTo(localDate);
+	}
+
+	@Test
+	public void localDateConversionPreEpochTest() {
+		LocalDate localDate = LocalDate.of(600, 12, 1);
+		assertThat(SpannerConverters.TIMESTAMP_LOCAL_DATE_CONVERTER
+				.convert(SpannerConverters.LOCAL_DATE_TIMESTAMP_CONVERTER.convert(localDate))).isEqualTo(localDate);
 	}
 
 	@Test

spring-cloud-gcp-data-spanner/src/test/java/org/springframework/cloud/gcp/data/spanner/test/domain/Trade.java

@@ -17,14 +17,14 @@
 package org.springframework.cloud.gcp.data.spanner.test.domain;
 
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
-import org.assertj.core.util.DateUtil;
-
 import org.springframework.cloud.gcp.data.spanner.core.mapping.Column;
 import org.springframework.cloud.gcp.data.spanner.core.mapping.Embedded;
 import org.springframework.cloud.gcp.data.spanner.core.mapping.Interleaved;
@@ -48,6 +48,10 @@ public class Trade {
 
 	private Date tradeDate;
 
+	private LocalDate tradeLocalDate;
+
+	private LocalDateTime tradeLocalDateTime;
+
 	private String action;
 
 	private String symbol;
@@ -88,6 +92,9 @@ public static Trade aTrade() {
 		t.traderId = traderId;
 		t.tradeTime = Instant.ofEpochSecond(333);
 		t.tradeDate = Date.from(t.tradeTime);
+		t.tradeLocalDate = LocalDate.of(2015, 1, 1);
+		t.tradeLocalDateTime = LocalDateTime.of(2015, 1, 1, 2, 3, 4, 5);
+		t.subTrades = new ArrayList<>();
 		t.tradeDetail.price = 100.0;
 		t.tradeDetail.shares = 12345.6;
 		for (int i = 1; i <= 5; i++) {
@@ -105,26 +112,23 @@ public boolean equals(Object o) {
 			return false;
 		}
 		Trade trade = (Trade) o;
-		return Objects.equals(this.tradeDetail.id, trade.tradeDetail.id)
-				&& Objects.equals(this.age, trade.age)
-				&& Objects.equals(this.action, trade.action)
-				&& Objects.equals(this.tradeDetail.price, trade.tradeDetail.price)
-				&& Objects.equals(this.tradeDetail.shares, trade.tradeDetail.shares)
-				&& Objects.equals(this.symbol, trade.symbol)
-				&& Objects.equals(this.tradeTime, trade.tradeTime)
-				&& Objects.equals(this.traderId, trade.traderId)
-				// java Date contains the time of day, but Cloud Spanner Date is only specific
-				// to the day.
-				&& Objects.equals(DateUtil.truncateTime(this.tradeDate),
-						DateUtil.truncateTime(trade.tradeDate));
+		return getAge() == trade.getAge() &&
+				Objects.equals(getTradeTime(), trade.getTradeTime()) &&
+				Objects.equals(getTradeDate(), trade.getTradeDate()) &&
+				Objects.equals(this.tradeLocalDate, trade.tradeLocalDate) &&
+				Objects.equals(this.tradeLocalDateTime, trade.tradeLocalDateTime) &&
+				Objects.equals(getAction(), trade.getAction()) &&
+				Objects.equals(getSymbol(), trade.getSymbol()) &&
+				Objects.equals(getTradeDetail(), trade.getTradeDetail()) &&
+				Objects.equals(getTraderId(), trade.getTraderId()) &&
+				Objects.equals(getExecutionTimes(), trade.getExecutionTimes()) &&
+				Objects.equals(getSubTrades(), trade.getSubTrades());
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(this.tradeDetail.id, this.age, this.action,
-				this.tradeDetail.price, this.tradeDetail.shares, this.symbol,
-				this.tradeTime, DateUtil.truncateTime(this.tradeDate),
-				this.traderId, this.executionTimes);
+		return Objects.hash(getAge(), getTradeTime(), getTradeDate(), this.tradeLocalDate, this.tradeLocalDateTime,
+				getAction(), getSymbol(), getTradeDetail(), getTraderId(), getExecutionTimes(), getSubTrades());
 	}
 
 	public String getId() {
@@ -209,12 +213,19 @@ public void setTradeDetail(TradeDetail tradeDetail) {
 
 	@Override
 	public String toString() {
-		return "Trade{" + "id='" + this.tradeDetail.id + '\'' + ", action='" + this.action
-				+ '\'' + ", age=" + this.age + ", price=" + this.tradeDetail.price
-				+ ", shares=" + this.tradeDetail.shares + ", symbol='"
-				+ this.symbol + ", tradeTime="
-				+ this.tradeTime + ", tradeDate='" + DateUtil.truncateTime(this.tradeDate)
-				+ '\'' + ", traderId='" + this.traderId + '\'' + '}';
+		return "Trade{" +
+				"age=" + this.age +
+				", tradeTime=" + this.tradeTime +
+				", tradeDate=" + this.tradeDate +
+				", tradeLocalDate=" + this.tradeLocalDate +
+				", tradeLocalDateTime=" + this.tradeLocalDateTime +
+				", action='" + this.action + '\'' +
+				", symbol='" + this.symbol + '\'' +
+				", tradeDetail=" + this.tradeDetail +
+				", traderId='" + this.traderId + '\'' +
+				", executionTimes=" + this.executionTimes +
+				", subTrades=" + this.subTrades +
+				'}';
 	}
 
 	public Date getTradeDate() {

spring-cloud-gcp-data-spanner/src/test/java/org/springframework/cloud/gcp/data/spanner/test/domain/TradeDetail.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.gcp.data.spanner.test.domain;
 
+import java.util.Objects;
+
 import org.springframework.cloud.gcp.data.spanner.core.mapping.PrimaryKey;
 
 /**
@@ -56,4 +58,22 @@ public void setShares(Double shares) {
 		this.shares = shares;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		TradeDetail that = (TradeDetail) o;
+		return Objects.equals(getId(), that.getId()) &&
+				Objects.equals(getPrice(), that.getPrice()) &&
+				Objects.equals(getShares(), that.getShares());
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(getId(), getPrice(), getShares());
+	}
 }