Refactor factories and mappers

Author: ArtDu

src/main/java/io/tarantool/driver/core/space/ProxyTarantoolSpace.java

@@ -78,7 +78,7 @@ public ProxyTarantoolSpace(
 
     @Override
     public CompletableFuture<R> delete(Conditions conditions) throws TarantoolClientException {
-        return delete(conditions, tupleResultMapper(), ProxyDeleteOptions.create()
+        return delete(conditions, rowsMetadataTupleResultMapper(), ProxyDeleteOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -88,7 +88,7 @@ public CompletableFuture<R> delete(Conditions conditions, DeleteOptions options)
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return delete(conditions, tupleResultMapper(), options);
+        return delete(conditions, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> delete(
@@ -113,7 +113,7 @@ private CompletableFuture<R> delete(
 
     @Override
     public CompletableFuture<R> insert(T tuple) throws TarantoolClientException {
-        return insert(tuple, tupleResultMapper(), ProxyInsertOptions.create()
+        return insert(tuple, rowsMetadataTupleResultMapper(), ProxyInsertOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -123,7 +123,7 @@ public CompletableFuture<R> insert(T tuple, InsertOptions options) throws Tarant
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return insert(tuple, tupleResultMapper(), options);
+        return insert(tuple, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> insert(
@@ -146,7 +146,7 @@ private CompletableFuture<R> insert(
 
     @Override
     public CompletableFuture<R> insertMany(Collection<T> tuples) {
-        return insertMany(tuples, tupleResultMapper(), ProxyInsertManyOptions.create()
+        return insertMany(tuples, rowsMetadataTupleResultMapper(), ProxyInsertManyOptions.create()
             .withTimeout(config.getRequestTimeout())
             .withStopOnError(true)
             .withRollbackOnError(true)
@@ -159,7 +159,7 @@ public CompletableFuture<R> insertMany(Collection<T> tuples, InsertManyOptions o
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return insertMany(tuples, tupleResultMapper(), options);
+        return insertMany(tuples, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> insertMany(
@@ -182,7 +182,7 @@ private CompletableFuture<R> insertMany(
 
     @Override
     public CompletableFuture<R> replace(T tuple) throws TarantoolClientException {
-        return replace(tuple, tupleResultMapper(), ProxyReplaceOptions.create()
+        return replace(tuple, rowsMetadataTupleResultMapper(), ProxyReplaceOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -192,7 +192,7 @@ public CompletableFuture<R> replace(T tuple, ReplaceOptions options) throws Tara
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return replace(tuple, tupleResultMapper(), options);
+        return replace(tuple, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> replace(
@@ -215,7 +215,7 @@ private CompletableFuture<R> replace(
 
     @Override
     public CompletableFuture<R> replaceMany(Collection<T> tuples) throws TarantoolClientException {
-        return replaceMany(tuples, tupleResultMapper(), ProxyReplaceManyOptions.create()
+        return replaceMany(tuples, rowsMetadataTupleResultMapper(), ProxyReplaceManyOptions.create()
             .withTimeout(config.getRequestTimeout())
             .withStopOnError(true)
             .withRollbackOnError(true)
@@ -227,7 +227,7 @@ public CompletableFuture<R> replaceMany(Collection<T> tuples, ReplaceManyOptions
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return replaceMany(tuples, tupleResultMapper(), options);
+        return replaceMany(tuples, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> replaceMany(
@@ -250,7 +250,7 @@ private CompletableFuture<R> replaceMany(
 
     @Override
     public CompletableFuture<R> select(Conditions conditions) throws TarantoolClientException {
-        return select(conditions, tupleResultMapper(), ProxySelectOptions.create()
+        return select(conditions, rowsMetadataTupleResultMapper(), ProxySelectOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -262,7 +262,7 @@ public CompletableFuture<R> select(
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return select(conditions, tupleResultMapper(), options);
+        return select(conditions, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> select(
@@ -286,7 +286,7 @@ private CompletableFuture<R> select(
 
     @Override
     public CompletableFuture<R> update(Conditions conditions, T tuple) {
-        return update(conditions, makeOperationsFromTuple(tuple), tupleResultMapper(), ProxyUpdateOptions.create()
+        return update(conditions, makeOperationsFromTuple(tuple), rowsMetadataTupleResultMapper(), ProxyUpdateOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -296,7 +296,7 @@ public CompletableFuture<R> update(Conditions conditions, T tuple, UpdateOptions
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return update(conditions, makeOperationsFromTuple(tuple), tupleResultMapper(), options);
+        return update(conditions, makeOperationsFromTuple(tuple), rowsMetadataTupleResultMapper(), options);
     }
 
     /**
@@ -309,7 +309,7 @@ public CompletableFuture<R> update(Conditions conditions, T tuple, UpdateOptions
 
     @Override
     public CompletableFuture<R> update(Conditions conditions, TupleOperations operations) {
-        return update(conditions, operations, tupleResultMapper(), ProxyUpdateOptions.create()
+        return update(conditions, operations, rowsMetadataTupleResultMapper(), ProxyUpdateOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -319,7 +319,7 @@ public CompletableFuture<R> update(Conditions conditions, TupleOperations operat
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return update(conditions, operations, tupleResultMapper(), options);
+        return update(conditions, operations, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> update(
@@ -345,7 +345,7 @@ private CompletableFuture<R> update(
 
     @Override
     public CompletableFuture<R> upsert(Conditions conditions, T tuple, TupleOperations operations) {
-        return upsert(conditions, tuple, operations, tupleResultMapper(), ProxyUpsertOptions.create()
+        return upsert(conditions, tuple, operations, rowsMetadataTupleResultMapper(), ProxyUpsertOptions.create()
             .withTimeout(config.getRequestTimeout())
         );
     }
@@ -357,7 +357,7 @@ public CompletableFuture<R> upsert(
         if (options == null) {
             throw new IllegalArgumentException("Options should not be null");
         }
-        return upsert(conditions, tuple, operations, tupleResultMapper(), options);
+        return upsert(conditions, tuple, operations, rowsMetadataTupleResultMapper(), options);
     }
 
     private CompletableFuture<R> upsert(
@@ -404,7 +404,7 @@ public CompletableFuture<Void> truncate() throws TarantoolClientException {
      *
      * @return configured mapper with {@link ArrayValue} to {@code T} converter
      */
-    protected abstract CallResultMapper<R, SingleValueCallResult<R>> tupleResultMapper();
+    protected abstract CallResultMapper<R, SingleValueCallResult<R>> rowsMetadataTupleResultMapper();
 
     private CompletableFuture<R> executeOperation(ProxyOperation<R> operation) {
         return operation.execute();

src/main/java/io/tarantool/driver/core/space/ProxyTarantoolTupleSpace.java

@@ -52,9 +52,9 @@ protected TupleOperations makeOperationsFromTuple(TarantoolTuple tuple) {
 
     @Override
     protected CallResultMapper<TarantoolResult<TarantoolTuple>, SingleValueCallResult<TarantoolResult<TarantoolTuple>>>
-    tupleResultMapper() {
+    rowsMetadataTupleResultMapper() {
         return client.getResultMapperFactoryFactory().singleValueTupleResultMapperFactory()
-            .withSingleValueTarantoolTupleResultMapper(config.getMessagePackMapper(), getMetadata());
+            .withSingleValueRowsMetadataToTarantoolTupleResultMapper(config.getMessagePackMapper(), getMetadata());
     }
 
     @Override

src/main/java/io/tarantool/driver/core/space/TarantoolSpace.java

@@ -61,7 +61,7 @@ public TarantoolSpace(
 
     @Override
     public CompletableFuture<R> delete(Conditions conditions) throws TarantoolClientException {
-        return delete(conditions, tupleResultMapper());
+        return delete(conditions, arrayTupleResultMapper());
     }
 
     private CompletableFuture<R> delete(Conditions conditions, MessagePackValueMapper resultMapper)
@@ -83,7 +83,7 @@ private CompletableFuture<R> delete(Conditions conditions, MessagePackValueMappe
 
     @Override
     public CompletableFuture<R> insert(T tuple) throws TarantoolClientException {
-        return insert(tuple, tupleResultMapper());
+        return insert(tuple, arrayTupleResultMapper());
     }
 
     @Override
@@ -110,7 +110,7 @@ private CompletableFuture<R> insert(T tuple, MessagePackValueMapper resultMapper
 
     @Override
     public CompletableFuture<R> replace(T tuple) throws TarantoolClientException {
-        return replace(tuple, tupleResultMapper());
+        return replace(tuple, arrayTupleResultMapper());
     }
 
     @Override
@@ -137,7 +137,7 @@ private CompletableFuture<R> replace(T tuple, MessagePackValueMapper resultMappe
 
     @Override
     public CompletableFuture<R> select(Conditions conditions) throws TarantoolClientException {
-        return select(conditions, tupleResultMapper());
+        return select(conditions, arrayTupleResultMapper());
     }
 
     private CompletableFuture<R> select(Conditions conditions, MessagePackValueMapper resultMapper)
@@ -161,7 +161,7 @@ private CompletableFuture<R> select(Conditions conditions, MessagePackValueMappe
 
     @Override
     public CompletableFuture<R> update(Conditions conditions, T tuple) {
-        return update(conditions, makeOperationsFromTuple(tuple), tupleResultMapper());
+        return update(conditions, makeOperationsFromTuple(tuple), arrayTupleResultMapper());
     }
 
     /**
@@ -174,7 +174,7 @@ public CompletableFuture<R> update(Conditions conditions, T tuple) {
 
     @Override
     public CompletableFuture<R> update(Conditions conditions, TupleOperations operations) {
-        return update(conditions, operations, tupleResultMapper());
+        return update(conditions, operations, arrayTupleResultMapper());
     }
 
     private CompletableFuture<R> update(
@@ -207,7 +207,7 @@ private CompletableFuture<R> update(
 
     @Override
     public CompletableFuture<R> upsert(Conditions conditions, T tuple, TupleOperations operations) {
-        return upsert(conditions, tuple, operations, tupleResultMapper());
+        return upsert(conditions, tuple, operations, arrayTupleResultMapper());
     }
 
     private CompletableFuture<R> upsert(
@@ -234,7 +234,7 @@ private CompletableFuture<R> upsert(
 
     @Override
     public CompletableFuture<Void> truncate() throws TarantoolClientException {
-        return truncate(tupleResultMapper());
+        return truncate(arrayTupleResultMapper());
     }
 
     private CompletableFuture<Void> truncate(MessagePackValueMapper resultMapper)
@@ -257,7 +257,7 @@ private CompletableFuture<Void> truncate(MessagePackValueMapper resultMapper)
      *
      * @return configured mapper with {@link ArrayValue} to {@code T} converter
      */
-    protected abstract MessagePackValueMapper tupleResultMapper();
+    protected abstract MessagePackValueMapper arrayTupleResultMapper();
 
     private CompletableFuture<R> sendRequest(TarantoolRequest request, MessagePackValueMapper resultMapper) {
         return connectionManager.getConnection().thenCompose(c -> c.sendRequest(request, resultMapper));

src/main/java/io/tarantool/driver/core/space/TarantoolTupleSpace.java

@@ -50,9 +50,9 @@ protected TupleOperations makeOperationsFromTuple(TarantoolTuple tuple) {
     }
 
     @Override
-    protected MessagePackValueMapper tupleResultMapper() {
-        return client.getResultMapperFactoryFactory().tupleResultMapperFactory()
-            .withFlattenTupleMapper(config.getMessagePackMapper(), getMetadata());
+    protected MessagePackValueMapper arrayTupleResultMapper() {
+        return client.getResultMapperFactoryFactory().arrayTupleResultMapperFactory()
+            .withArrayValueToTarantoolTupleResultConverter(config.getMessagePackMapper(), getMetadata());
     }
 
     @Override

src/main/java/io/tarantool/driver/mappers/factories/RowsMetadataStructureToTarantoolResultMapperFactory.java renamed to src/main/java/io/tarantool/driver/mappers/factories/ArrayValueToTarantoolResultMapperFactory.java

@@ -15,14 +15,14 @@
  * @author Alexey Kuzin
  * @author Artyom Dubinin
  */
-public class RowsMetadataStructureToTarantoolResultMapperFactory<T> extends TarantoolResultMapperFactory<T> {
+public class ArrayValueToTarantoolResultMapperFactory<T> extends TarantoolResultMapperFactory<T> {
 
     private final MessagePackMapper messagePackMapper;
 
     /**
      * Basic constructor
      */
-    public RowsMetadataStructureToTarantoolResultMapperFactory() {
+    public ArrayValueToTarantoolResultMapperFactory() {
         this(DefaultMessagePackMapperFactory.getInstance().emptyMapper());
     }
 
@@ -31,7 +31,7 @@ public RowsMetadataStructureToTarantoolResultMapperFactory() {
      *
      * @param messagePackMapper MessagePack-to-object mapper for tuple contents
      */
-    public RowsMetadataStructureToTarantoolResultMapperFactory(MessagePackMapper messagePackMapper) {
+    public ArrayValueToTarantoolResultMapperFactory(MessagePackMapper messagePackMapper) {
         super();
         this.messagePackMapper = messagePackMapper;
     }

src/main/java/io/tarantool/driver/mappers/factories/ArrayValueToTarantoolTupleResultMapperFactory.java

@@ -0,0 +1,70 @@
+package io.tarantool.driver.mappers.factories;
+
+import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
+import io.tarantool.driver.api.tuple.TarantoolTuple;
+import io.tarantool.driver.mappers.MessagePackMapper;
+import io.tarantool.driver.mappers.MessagePackValueMapper;
+import io.tarantool.driver.mappers.TarantoolResultMapper;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleResultConverter;
+import org.msgpack.value.ValueType;
+
+/**
+ * Factory for {@link TarantoolResultMapper} instances used for handling results with tuples of array type
+ *
+ * @author Alexey Kuzin
+ * @author Artyom Dubinin
+ */
+public class ArrayValueToTarantoolTupleResultMapperFactory
+    extends ArrayValueToTarantoolResultMapperFactory<TarantoolTuple> {
+
+    private final MessagePackMapper messagePackMapper;
+
+    /**
+     * Basic constructor
+     */
+    public ArrayValueToTarantoolTupleResultMapperFactory() {
+        this(DefaultMessagePackMapperFactory.getInstance().emptyMapper());
+    }
+
+    /**
+     * Basic constructor with mapper
+     *
+     * @param messagePackMapper MessagePack-to-object mapper for tuple contents
+     */
+    public ArrayValueToTarantoolTupleResultMapperFactory(MessagePackMapper messagePackMapper) {
+        super();
+        this.messagePackMapper = messagePackMapper;
+    }
+
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
+        MessagePackMapper messagePackMapper) {
+        return withArrayValueToTarantoolTupleResultConverter(
+            new ArrayValueToTarantoolTupleConverter(messagePackMapper, null));
+    }
+
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
+        MessagePackMapper messagePackMapper, TarantoolSpaceMetadata spaceMetadata) {
+        return withArrayValueToTarantoolTupleResultConverter(
+            new ArrayValueToTarantoolTupleConverter(messagePackMapper, spaceMetadata));
+    }
+
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
+        ArrayValueToTarantoolTupleConverter tupleConverter) {
+        return withConverterWithoutTargetClass(
+            messagePackMapper.copy(),
+            ValueType.ARRAY,
+            new ArrayValueToTarantoolTupleResultConverter(tupleConverter)
+        );
+    }
+
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
+        MessagePackValueMapper valueMapper,
+        ArrayValueToTarantoolTupleConverter tupleConverter) {
+        return withConverterWithoutTargetClass(
+            valueMapper,
+            ValueType.ARRAY,
+            new ArrayValueToTarantoolTupleResultConverter(tupleConverter)
+        );
+    }
+}

src/main/java/io/tarantool/driver/mappers/factories/MultiValueWithTarantoolResultMapperFactory.java

@@ -19,14 +19,14 @@
 public class MultiValueWithTarantoolResultMapperFactory<T>
     extends MultiValueResultMapperFactory<T, TarantoolResult<T>> {
 
-    private final RowsMetadataStructureToTarantoolResultMapperFactory<T> tarantoolResultMapperFactory;
+    private final ArrayValueToTarantoolResultMapperFactory<T> tarantoolResultMapperFactory;
 
     /**
      * Basic constructor
      */
     public MultiValueWithTarantoolResultMapperFactory() {
         super();
-        tarantoolResultMapperFactory = new RowsMetadataStructureToTarantoolResultMapperFactory<>();
+        tarantoolResultMapperFactory = new ArrayValueToTarantoolResultMapperFactory<>();
     }
 
     /**
@@ -36,7 +36,7 @@ public MultiValueWithTarantoolResultMapperFactory() {
      */
     public MultiValueWithTarantoolResultMapperFactory(MessagePackMapper messagePackMapper) {
         super(messagePackMapper);
-        tarantoolResultMapperFactory = new RowsMetadataStructureToTarantoolResultMapperFactory<>();
+        tarantoolResultMapperFactory = new ArrayValueToTarantoolResultMapperFactory<>();
     }
 
     /**