Refactor mappers and split TResultConverters

Closes #301

Author: ArtDu

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Refactor mappers and split TarantoolResultConverter ([#301](https://github.com/tarantool/cartridge-java/pull/301))
+
 ## [0.9.2] - 2022-11-15
 
 - Adding default mapper for long arrays ([#290](https://github.com/tarantool/cartridge-java/pull/290))

src/main/java/io/tarantool/driver/api/TarantoolCallOperations.java

@@ -4,7 +4,7 @@
 import io.tarantool.driver.mappers.CallResultMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackObjectMapper;
-import io.tarantool.driver.mappers.ResultMapperFactoryFactory;
+import io.tarantool.driver.mappers.factories.ResultMapperFactoryFactory;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.Value;
 

src/main/java/io/tarantool/driver/api/TarantoolClientBuilder.java

@@ -7,6 +7,7 @@
 import io.tarantool.driver.auth.TarantoolCredentials;
 import io.tarantool.driver.mappers.DefaultMessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
+import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
 
 import java.net.InetSocketAddress;
 import java.util.List;
@@ -112,7 +113,7 @@ public interface TarantoolClientBuilder extends TarantoolClientConfigurator<Tara
      * <p>
      * This method takes a lambda as an argument, where the mapperBuilder is {@link DefaultMessagePackMapper.Builder}.
      * </p>
-     * see {@link io.tarantool.driver.mappers.DefaultMessagePackMapperFactory}.
+     * see {@link DefaultMessagePackMapperFactory}.
      *
      * @param mapperBuilder builder provider instance, e.g. a lambda function taking the builder
      *                      for {@link MessagePackMapper} instance
@@ -127,7 +128,7 @@ public interface TarantoolClientBuilder extends TarantoolClientConfigurator<Tara
      * The mapper contains converters for simple and complex tuple field types and for the entire tuples into custom
      * Java objects. This mapper is used by default if a custom mapper is not passed to a specific operation.
      * You may build and pass here your custom mapper or add some converters to a default one,
-     * see {@link io.tarantool.driver.mappers.DefaultMessagePackMapperFactory}.
+     * see {@link DefaultMessagePackMapperFactory}.
      *
      * @param mapper configured {@link MessagePackMapper} instance
      * @return this instance of builder {@link TarantoolClientBuilder}

src/main/java/io/tarantool/driver/api/TarantoolClientConfig.java

@@ -5,7 +5,7 @@
 import io.tarantool.driver.api.connection.TarantoolConnectionSelectionStrategies;
 import io.tarantool.driver.auth.SimpleTarantoolCredentials;
 import io.tarantool.driver.auth.TarantoolCredentials;
-import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory;
+import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.utils.Assert;
 

src/main/java/io/tarantool/driver/api/tuple/TarantoolTupleMultiResult.java renamed to src/main/java/io/tarantool/driver/api/tuple/TarantoolMultiTuplesResult.java

@@ -7,8 +7,8 @@
  * Shortcut for {@link MultiValueCallResult} with default tuple result
  *
  * @author Alexey Kuzin
- * @see TarantoolTupleResult
+ * @see TarantoolTuplesResult
  */
-public interface TarantoolTupleMultiResult
+public interface TarantoolMultiTuplesResult
         extends MultiValueCallResult<TarantoolTuple, TarantoolResult<TarantoolTuple>> {
 }

src/main/java/io/tarantool/driver/api/tuple/TarantoolTupleSingleResult.java renamed to src/main/java/io/tarantool/driver/api/tuple/TarantoolSingleTuplesResult.java

@@ -7,7 +7,7 @@
  * Shortcut for {@link SingleValueCallResult} with default tuple result
  *
  * @author Alexey Kuzin
- * @see TarantoolTupleResult
+ * @see TarantoolTuplesResult
  */
-public interface TarantoolTupleSingleResult extends SingleValueCallResult<TarantoolResult<TarantoolTuple>> {
+public interface TarantoolSingleTuplesResult extends SingleValueCallResult<TarantoolResult<TarantoolTuple>> {
 }

src/main/java/io/tarantool/driver/api/tuple/TarantoolTupleResult.java renamed to src/main/java/io/tarantool/driver/api/tuple/TarantoolTuplesResult.java

@@ -7,5 +7,5 @@
  *
  * @author Alexey Kuzin
  */
-public interface TarantoolTupleResult extends TarantoolResult<TarantoolTuple> {
+public interface TarantoolTuplesResult extends TarantoolResult<TarantoolTuple> {
 }

src/main/java/io/tarantool/driver/core/AbstractTarantoolClient.java

@@ -25,11 +25,11 @@
 import io.tarantool.driver.exceptions.TarantoolClientException;
 import io.tarantool.driver.exceptions.TarantoolSpaceNotFoundException;
 import io.tarantool.driver.mappers.CallResultMapper;
-import io.tarantool.driver.mappers.DefaultResultMapperFactoryFactory;
+import io.tarantool.driver.mappers.factories.DefaultResultMapperFactoryFactory;
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackObjectMapper;
 import io.tarantool.driver.mappers.MessagePackValueMapper;
-import io.tarantool.driver.mappers.ResultMapperFactoryFactory;
+import io.tarantool.driver.mappers.factories.ResultMapperFactoryFactory;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import io.tarantool.driver.protocol.Packable;
 import io.tarantool.driver.protocol.TarantoolProtocolException;

src/main/java/io/tarantool/driver/core/MultiValueCallResultImpl.java

@@ -3,6 +3,7 @@
 import io.tarantool.driver.api.MultiValueCallResult;
 import io.tarantool.driver.exceptions.TarantoolFunctionCallException;
 import io.tarantool.driver.exceptions.errors.TarantoolErrorsParser;
+import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.Value;
@@ -14,6 +15,7 @@
  * {@code null}, the second is treated as a formatted error or an error message.
  *
  * @author Alexey Kuzin
+ * @author Artyom Dubinin
  */
 public class MultiValueCallResultImpl<T, R extends List<T>> implements MultiValueCallResult<T, R> {
 
@@ -36,6 +38,23 @@ public MultiValueCallResultImpl(Value result, ValueConverter<ArrayValue, R> valu
         }
     }
 
+    public MultiValueCallResultImpl(Value result, MessagePackValueMapper valueMapper) {
+        if (result == null) {
+            throw new TarantoolFunctionCallException("Function call result is null");
+        }
+        if (!result.isArrayValue()) {
+            throw new TarantoolFunctionCallException("Function call result is not a MessagePack array");
+        }
+        ArrayValue resultArray = result.asArrayValue();
+        if (resultArray.size() == 2 && (resultArray.get(0).isNilValue() && !resultArray.get(1).isNilValue())) {
+            // [nil, "Error msg..."] or [nil, {str="Error msg...", stack="..."}]
+            throw TarantoolErrorsParser.parse(resultArray.get(1));
+        } else {
+            // result
+            this.value = valueMapper.fromValue(result.asArrayValue());
+        }
+    }
+
     @Override
     public R value() {
         return value;

src/main/java/io/tarantool/driver/core/ProxyTarantoolClient.java

@@ -23,7 +23,7 @@
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackObjectMapper;
 import io.tarantool.driver.mappers.MessagePackValueMapper;
-import io.tarantool.driver.mappers.ResultMapperFactoryFactory;
+import io.tarantool.driver.mappers.factories.ResultMapperFactoryFactory;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import io.tarantool.driver.protocol.Packable;
 import io.tarantool.driver.utils.Assert;