add serialVersion, changelog, tests

Author: anatennis

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+## [0.9.1] - 2022-10-26
+- Support Datetime type ([#293](https://github.com/tarantool/cartridge-java/pull/293))
+
 ## [0.9.1] - 2022-10-13
 
 - Changed TarantoolNullField class to singleton ([#195](https://github.com/tarantool/cartridge-java/pull/275))

src/main/java/io/tarantool/driver/api/tuple/TarantoolTuple.java

@@ -3,6 +3,7 @@
 import io.tarantool.driver.protocol.Packable;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -16,7 +17,7 @@
 public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get a tuple field by its position
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return field or empty optional if the field position is out of tuple length
      */
     Optional<TarantoolField> getField(int fieldPosition);
@@ -38,7 +39,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
 
     /**
      * Get a tuple field value by its position specifying the target value type
-     * @param fieldPosition field position from the the tuple start, starting from 0
+     * @param fieldPosition field position from the tuple start, starting from 0
      * @param objectClass target value type class
      * @param <O> target value type
      * @return nullable value of a field wrapped in Optional, possibly converted to a Java type
@@ -47,7 +48,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
 
     /**
      * Check if a tuple field exists and can be converted to the target value type
-     * @param fieldPosition field position from the the tuple start, starting from 0
+     * @param fieldPosition field position from the tuple start, starting from 0
      * @param objectClass target value type class
      * @return true, if the field exists and can be converted to the given type, false otherwise
      */
@@ -72,7 +73,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
 
     /**
      * Get a tuple field value as a raw object
-     * @param fieldPosition field position from the the tuple start, starting from 0
+     * @param fieldPosition field position from the tuple start, starting from 0
      * @return nullable value of a field wrapped in Optional
      */
     Optional<?> getObject(int fieldPosition);
@@ -94,7 +95,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Set a tuple field by field position
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @param field new field
      */
     void setField(int fieldPosition, TarantoolField field);
@@ -110,7 +111,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Set a tuple field value from an object by field position
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @param value new field value
      */
      void putObject(int fieldPosition, Object value);
@@ -126,7 +127,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code byte[]}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     byte[] getByteArray(int fieldPosition);
@@ -142,7 +143,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Boolean}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Boolean getBoolean(int fieldPosition);
@@ -158,7 +159,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Double}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Double getDouble(int fieldPosition);
@@ -174,7 +175,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Float}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Float getFloat(int fieldPosition);
@@ -190,7 +191,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Integer}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Integer getInteger(int fieldPosition);
@@ -206,7 +207,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Long}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Long getLong(int fieldPosition);
@@ -222,7 +223,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code String}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     String getString(int fieldPosition);
@@ -238,7 +239,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@code Character}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Character getCharacter(int fieldPosition);
@@ -254,7 +255,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@link UUID}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     UUID getUUID(int fieldPosition);
@@ -267,10 +268,26 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
      */
     UUID getUUID(String fieldName);
 
+    /**
+     * Get the field value converted to {@link Instant}
+     *
+     * @param fieldPosition the field position from the tuple start, starting from 0
+     * @return value
+     */
+    Instant getInstant(int fieldPosition);
+
+    /**
+     * Get the field value converted to {@link Instant}
+     *
+     * @param fieldName the field name, must not be null
+     * @return value
+     */
+    Instant getInstant(String fieldName);
+
     /**
      * Get the field value converted to {@link BigDecimal}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     BigDecimal getDecimal(int fieldPosition);
@@ -286,7 +303,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@link List}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     List<?> getList(int fieldPosition);
@@ -302,7 +319,7 @@ public interface TarantoolTuple extends Iterable<TarantoolField>, Packable {
     /**
      * Get the field value converted to {@link Map}
      *
-     * @param fieldPosition the field position from the the tuple start, starting from 0
+     * @param fieldPosition the field position from the tuple start, starting from 0
      * @return value
      */
     Map<?, ?> getMap(int fieldPosition);

src/main/java/io/tarantool/driver/mappers/converters/object/DefaultInstantToExtensionValueConverter.java

@@ -14,12 +14,12 @@
  */
 public class DefaultInstantToExtensionValueConverter implements ObjectConverter<Instant, ExtensionValue> {
 
-    private static final long serialVersionUID = 20220418L;
+    private static final long serialVersionUID = 20221025L;
 
     private static final byte DATETIME_TYPE = 0x04;
 
     private byte[] toBytes(Instant value) {
-        ByteBuffer buffer = ByteBuffer.wrap(new byte[16]);
+        ByteBuffer buffer = ByteBuffer.wrap(new byte[8]);
         buffer.putLong(0, value.getEpochSecond());
         return buffer.array();
     }

src/main/java/io/tarantool/driver/mappers/converters/value/DefaultExtensionValueToInstantConverter.java

@@ -12,6 +12,8 @@
  * @author Anastasiia Romanova
  */
 public class DefaultExtensionValueToInstantConverter implements ValueConverter<ExtensionValue, Instant> {
+
+    private static final long serialVersionUID = 20221025L;
     private static final byte DATETIME_TYPE = 0x04;
 
     private Instant fromBytes(byte[] bytes) {

src/test/java/io/tarantool/driver/TarantoolUtils.java

@@ -31,6 +31,10 @@ public static boolean versionWithUUID() {
         return versionGreaterThen("2.4");
     }
 
+    public static boolean versionWithInstant() {
+        return versionGreaterThen("2.10");
+    }
+
     public static boolean versionWithVarbinary() {
         return versionGreaterThen("2.2.1");
     }

src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java

@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
 
+import java.time.Instant;
 import java.util.UUID;
 import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils;
 
@@ -65,6 +66,23 @@ public void test_boxSelect_shouldReturnTupleWithUUID() throws Exception {
         Assertions.assertEquals(uuid, fields.getUUID("uuid_field"));
     }
 
+    @Test
+    @EnabledIf("io.tarantool.driver.TarantoolUtils#versionWithInstant")
+    public void test_boxSelect_shouldReturnTupleWithInstant() throws Exception {
+        //given
+        Instant instant = Instant.now();
+        client.space("space_with_instant")
+                .insert(tupleFactory.create(1, instant)).get();
+
+        //when
+        TarantoolTuple fields = client
+                .space("space_with_instant")
+                .select(Conditions.equals("id", 1)).get().get(0);
+
+        //then
+        Assertions.assertEquals(instant, fields.getInstant("instant_field"));
+    }
+
     @Test
     @EnabledIf("io.tarantool.driver.TarantoolUtils#versionWithVarbinary")
     public void test_boxOperations_shouldWorkWithVarbinary() throws Exception {

src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java

@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
 
+import java.time.Instant;
 import java.util.UUID;
 import org.junit.jupiter.api.Disabled;
 import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils;
@@ -65,6 +66,23 @@ public void test_crudSelect_shouldReturnTupleWithUUID() throws Exception {
         Assertions.assertEquals(uuid, fields.getUUID("uuid_field"));
     }
 
+    @Test
+    @EnabledIf("io.tarantool.driver.TarantoolUtils#versionWithInstant")
+    public void test_crudSelect_shouldReturnTupleWithInstant() throws Exception {
+        //given
+        Instant instant = Instant.now();
+        client.space("space_with_instant")
+                .insert(tupleFactory.create(1, instant)).get();
+
+        //when
+        TarantoolTuple fields = client
+                .space("space_with_instant")
+                .select(Conditions.equals("id", 1)).get().get(0);
+
+        //then
+        Assertions.assertEquals(instant, fields.getInstant("instant_field"));
+    }
+
     @Test
     @Disabled("Until https://github.com/tarantool/tarantool/issues/1629 is fixed")
     @EnabledIf("io.tarantool.driver.TarantoolUtils#versionWithVarbinary")

src/test/java/io/tarantool/driver/mappers/DefaultInstantConverterTest.java

@@ -32,15 +32,15 @@ void toValue() throws IOException {
         Base64.Encoder encoder = Base64.getEncoder();
         Instant instant = LocalDateTime.parse("2022-10-25T12:03:58").toInstant(ZoneOffset.UTC);
         byte[] result = ((MessageBufferPacker) packer.packValue(converter.toValue(instant))).toByteArray();
-        assertEquals("2AQAAAAAY1fQrgAAAAAAAAAA", encoder.encodeToString(result));
+        assertEquals("1wQAAAAAY1fQrg==", encoder.encodeToString(result));
     }
 
     @Test
     void fromValue() throws IOException {
         DefaultExtensionValueToInstantConverter converter = new DefaultExtensionValueToInstantConverter();
         Base64.Decoder base64decoder = Base64.getDecoder();
         Instant instant = LocalDateTime.parse("2022-10-25T12:03:58").toInstant(ZoneOffset.UTC);
-        byte[] packed = base64decoder.decode("2AQAAAAAY1fQrgAAAAAAAAAA");
+        byte[] packed = base64decoder.decode("1wQAAAAAY1fQrg==");
         ExtensionValue value = MessagePack.newDefaultUnpacker(packed).unpackValue().asExtensionValue();
         assertEquals(instant, converter.fromValue(value));
     }