Merge remote-tracking branch 'origin/dev' into feature/jackson-mapper

rainbowdashlabs · May 25, 2024 · 88cf440 · 88cf440
2 parents c9a6c33 + a0fcb4e
commit 88cf440
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/sadu-mapper/src/main/java/de/chojo/sadu/mapper/DefaultMapper.java b/sadu-mapper/src/main/java/de/chojo/sadu/mapper/DefaultMapper.java
@@ -16,7 +16,6 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -25,7 +24,6 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static de.chojo.sadu.mapper.reader.StandardReader.INSTANT_FROM_TIMESTAMP;
 import static de.chojo.sadu.mapper.reader.StandardReader.UUID_FROM_BYTES;
 import static de.chojo.sadu.mapper.reader.StandardReader.UUID_FROM_STRING;
 

diff --git a/sadu-queries/src/main/java/de/chojo/sadu/queries/converter/ValueConverter.java b/sadu-queries/src/main/java/de/chojo/sadu/queries/converter/ValueConverter.java
@@ -19,6 +19,7 @@
 
 /**
  * A value converter that serves as an {@link AdapterMapping} and {@link ValueReader}
+ *
  * @param <T> The Java type that is handled
  * @param <V> The intermediate SQL type that is sent to the database
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
     /**
      * A value converter that serves as an {@link AdapterMapping} and {@link ValueReader}
+     *
      * @param <T> The Java type that is handled
      * @param <V> The intermediate SQL type that is sent to the database
      */
@@ Expand Down @@