Fix unintended timestamp converting

Author: IAM20

spring-jdbc-plus-support/src/main/java/com/navercorp/spring/jdbc/plus/support/parametersource/converter/Jsr310TimestampBasedConverters.java

@@ -23,6 +23,7 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -41,20 +42,20 @@
 abstract class Jsr310TimestampBasedConverters {
 
 	static Collection<Converter<?, ?>> getConvertersToRegister() {
-		List<Converter<?, ?>> converters = new ArrayList(8);
+		List<Converter<?, ?>> converters = new ArrayList<>(4);
 
 		converters.add(LocalDateToTimestampConverter.INSTANCE);
 		converters.add(LocalTimeToTimestampConverter.INSTANCE);
-		converters.add(TimestampToInstantConverter.INSTANCE);
 		converters.add(InstantToTimestampConverter.INSTANCE);
+		converters.add(ZonedDateTimeToTimestampConverter.INSTANCE);
 
 		return converters;
 	}
 
 	enum LocalDateToTimestampConverter implements Converter<LocalDate, Timestamp> {
 		INSTANCE;
 
-		private LocalDateToTimestampConverter() {
+		LocalDateToTimestampConverter() {
 		}
 
 		@NonNull
@@ -66,7 +67,7 @@ public Timestamp convert(LocalDate source) {
 	enum LocalTimeToTimestampConverter implements Converter<LocalTime, Timestamp> {
 		INSTANCE;
 
-		private LocalTimeToTimestampConverter() {
+		LocalTimeToTimestampConverter() {
 		}
 
 		@NonNull
@@ -75,27 +76,27 @@ public Timestamp convert(LocalTime source) {
 		}
 	}
 
-	enum TimestampToInstantConverter implements Converter<Timestamp, Instant> {
+	enum InstantToTimestampConverter implements Converter<Instant, Timestamp> {
 		INSTANCE;
 
-		private TimestampToInstantConverter() {
+		InstantToTimestampConverter() {
 		}
 
 		@NonNull
-		public Instant convert(Timestamp source) {
-			return source.toInstant();
+		public Timestamp convert(Instant source) {
+			return Timestamp.from(source);
 		}
 	}
 
-	enum InstantToTimestampConverter implements Converter<Instant, Timestamp> {
+	enum ZonedDateTimeToTimestampConverter implements Converter<ZonedDateTime, Timestamp> {
 		INSTANCE;
 
-		private InstantToTimestampConverter() {
+		ZonedDateTimeToTimestampConverter() {
 		}
 
 		@NonNull
-		public Timestamp convert(Instant source) {
-			return Timestamp.from(source);
+		public Timestamp convert(ZonedDateTime source) {
+			return Timestamp.from(source.toInstant());
 		}
 	}
 }