Return back TupleResult name

Author: ArtDu

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

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

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

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

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

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

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

@@ -52,8 +52,8 @@ protected TupleOperations makeOperationsFromTuple(TarantoolTuple tuple) {
     @Override
     protected CallResultMapper<TarantoolResult<TarantoolTuple>, SingleValueCallResult<TarantoolResult<TarantoolTuple>>>
     tuplesResultMapper() {
-        return client.getResultMapperFactoryFactory().defaultSingleTuplesResultMapperFactory()
-                .withSingleValueTarantoolTuplesResultMapper(config.getMessagePackMapper(), getMetadata());
+        return client.getResultMapperFactoryFactory().defaultSingleTupleResultMapperFactory()
+                .withSingleValueTarantoolTupleResultMapper(config.getMessagePackMapper(), getMetadata());
     }
 
     @Override

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

@@ -49,8 +49,8 @@ protected TupleOperations makeOperationsFromTuple(TarantoolTuple tuple) {
 
     @Override
     protected MessagePackValueMapper tuplesResultMapper() {
-        return client.getResultMapperFactoryFactory().defaultTuplesResultMapperFactory()
-                .withFlattenTuplesMapper(config.getMessagePackMapper(), getMetadata());
+        return client.getResultMapperFactoryFactory().defaultTupleResultMapperFactory()
+                .withFlattenTupleMapper(config.getMessagePackMapper(), getMetadata());
     }
 
     @Override

src/main/java/io/tarantool/driver/mappers/converters/value/custom/DefaultArrayValueToTarantoolTuplesResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/DefaultArrayValueToTarantoolTupleResultConverter.java

@@ -9,14 +9,14 @@
 /**
  * @author Artyom Dubinin
  */
-public class DefaultArrayValueToTarantoolTuplesResultConverter
+public class DefaultArrayValueToTarantoolTupleResultConverter
     implements ValueConverter<ArrayValue, TarantoolResult<TarantoolTuple>> {
 
     private static final long serialVersionUID = -1348387430063097175L;
 
     private final ValueConverter<ArrayValue, TarantoolTuple> tupleConverter;
 
-    public DefaultArrayValueToTarantoolTuplesResultConverter(
+    public DefaultArrayValueToTarantoolTupleResultConverter(
         ValueConverter<ArrayValue, TarantoolTuple> tupleConverter) {
         super();
         this.tupleConverter = tupleConverter;

src/main/java/io/tarantool/driver/mappers/converters/value/custom/DefaultMapValueToTarantoolTuplesResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/DefaultMapValueToTarantoolTupleResultConverter.java

@@ -15,7 +15,7 @@
 /**
  * @author Artyom Dubinin
  */
-public class DefaultMapValueToTarantoolTuplesResultConverter
+public class DefaultMapValueToTarantoolTupleResultConverter
     implements ValueConverter<MapValue, TarantoolResult<TarantoolTuple>> {
 
     private static final long serialVersionUID = -5228606294087295535L;
@@ -25,7 +25,7 @@ public class DefaultMapValueToTarantoolTuplesResultConverter
 
     private final TarantoolTupleConverter tupleConverter;
 
-    public DefaultMapValueToTarantoolTuplesResultConverter(TarantoolTupleConverter tupleConverter) {
+    public DefaultMapValueToTarantoolTupleResultConverter(TarantoolTupleConverter tupleConverter) {
         super();
         this.tupleConverter = tupleConverter;
     }

src/main/java/io/tarantool/driver/mappers/factories/CustomValueToTarantoolTuplesResultMapperFactory.java renamed to src/main/java/io/tarantool/driver/mappers/factories/CustomValueToTarantoolTupleResultMapperFactory.java

@@ -7,8 +7,8 @@
 import io.tarantool.driver.mappers.TarantoolResultMapper;
 import io.tarantool.driver.mappers.converters.ValueConverterWithInputTypeWrapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.DefaultArrayValueToTarantoolTuplesResultConverter;
-import io.tarantool.driver.mappers.converters.value.custom.DefaultMapValueToTarantoolTuplesResultConverter;
+import io.tarantool.driver.mappers.converters.value.custom.DefaultArrayValueToTarantoolTupleResultConverter;
+import io.tarantool.driver.mappers.converters.value.custom.DefaultMapValueToTarantoolTupleResultConverter;
 import io.tarantool.driver.mappers.converters.value.custom.TarantoolTupleConverter;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.MapValue;
@@ -22,15 +22,15 @@
  * @author Alexey Kuzin
  * @author Artyom Dubinin
  */
-public class CustomValueToTarantoolTuplesResultMapperFactory
+public class CustomValueToTarantoolTupleResultMapperFactory
     extends CustomValueToTarantoolResultMapperFactory<TarantoolTuple> {
 
     private final MessagePackMapper messagePackMapper;
 
     /**
      * Basic constructor
      */
-    public CustomValueToTarantoolTuplesResultMapperFactory() {
+    public CustomValueToTarantoolTupleResultMapperFactory() {
         this(DefaultMessagePackMapperFactory.getInstance().emptyMapper());
     }
 
@@ -39,56 +39,56 @@ public CustomValueToTarantoolTuplesResultMapperFactory() {
      *
      * @param messagePackMapper MessagePack-to-object mapper for tuple contents
      */
-    public CustomValueToTarantoolTuplesResultMapperFactory(MessagePackMapper messagePackMapper) {
+    public CustomValueToTarantoolTupleResultMapperFactory(MessagePackMapper messagePackMapper) {
         super();
         this.messagePackMapper = messagePackMapper;
     }
 
-    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTuplesResultConverter(
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
         TarantoolTupleConverter tupleConverter) {
         return withConverterWithoutTargetClass(
             messagePackMapper.copy(),
             ValueType.ARRAY,
-            new DefaultArrayValueToTarantoolTuplesResultConverter(tupleConverter)
+            new DefaultArrayValueToTarantoolTupleResultConverter(tupleConverter)
         );
     }
 
-    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTuplesResultConverter(
+    public TarantoolResultMapper<TarantoolTuple> withArrayValueToTarantoolTupleResultConverter(
         MessagePackValueMapper valueMapper,
         TarantoolTupleConverter tupleConverter) {
         return withConverterWithoutTargetClass(
             valueMapper,
             ValueType.ARRAY,
-            new DefaultArrayValueToTarantoolTuplesResultConverter(tupleConverter)
+            new DefaultArrayValueToTarantoolTupleResultConverter(tupleConverter)
         );
     }
 
-    public TarantoolResultMapper<TarantoolTuple> withMapValueToTarantoolTuplesResultConverter(
+    public TarantoolResultMapper<TarantoolTuple> withMapValueToTarantoolTupleResultConverter(
         TarantoolTupleConverter tupleConverter) {
         return withConverterWithoutTargetClass(
             messagePackMapper.copy(),
             ValueType.MAP,
-            new DefaultMapValueToTarantoolTuplesResultConverter(tupleConverter)
+            new DefaultMapValueToTarantoolTupleResultConverter(tupleConverter)
         );
     }
 
-    public TarantoolResultMapper<TarantoolTuple> withMapValueToTarantoolTuplesResultConverter(
+    public TarantoolResultMapper<TarantoolTuple> withMapValueToTarantoolTupleResultConverter(
         MessagePackValueMapper valueMapper,
         TarantoolTupleConverter tupleConverter) {
         return withConverterWithoutTargetClass(
             valueMapper,
             ValueType.MAP,
-            new DefaultMapValueToTarantoolTuplesResultConverter(tupleConverter)
+            new DefaultMapValueToTarantoolTupleResultConverter(tupleConverter)
         );
     }
 
-    public TarantoolResultMapper<TarantoolTuple> withTarantoolTuplesResultMapper(
+    public TarantoolResultMapper<TarantoolTuple> withTarantoolTupleResultMapper(
         TarantoolTupleConverter tupleConverter,
         Class<? extends TarantoolResult<TarantoolTuple>> resultClass) {
         ValueConverter<ArrayValue, TarantoolResult<TarantoolTuple>> arrayConverter =
-            new DefaultArrayValueToTarantoolTuplesResultConverter(tupleConverter);
+            new DefaultArrayValueToTarantoolTupleResultConverter(tupleConverter);
         ValueConverter<MapValue, TarantoolResult<TarantoolTuple>> mapValueConverter =
-            new DefaultMapValueToTarantoolTuplesResultConverter(tupleConverter);
+            new DefaultMapValueToTarantoolTupleResultConverter(tupleConverter);
         return withConverterWithoutTargetClass(
             messagePackMapper.copy(),
             Arrays.asList(

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

@@ -32,18 +32,18 @@ public DefaultResultMapperFactoryFactory() {
     }
 
     @Override
-    public TarantoolTuplesResultMapperFactory defaultTuplesResultMapperFactory() {
-        return new TarantoolTuplesResultMapperFactory();
+    public TarantoolTupleResultMapperFactory defaultTupleResultMapperFactory() {
+        return new TarantoolTupleResultMapperFactory();
     }
 
     @Override
-    public TarantoolSingleTuplesResultMapperFactory defaultSingleTuplesResultMapperFactory() {
-        return new TarantoolSingleTuplesResultMapperFactory();
+    public TarantoolSingleTupleResultMapperFactory defaultSingleTupleResultMapperFactory() {
+        return new TarantoolSingleTupleResultMapperFactory();
     }
 
     @Override
-    public TarantoolMultiTuplesResultMapperFactory defaultMultiTuplesResultMapperFactory() {
-        return new TarantoolMultiTuplesResultMapperFactory();
+    public TarantoolMultiTupleResultMapperFactory defaultMultiTupleResultMapperFactory() {
+        return new TarantoolMultiTupleResultMapperFactory();
     }
 
     @Override

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

@@ -21,23 +21,23 @@ public interface ResultMapperFactoryFactory {
      *
      * @return default factory for list of tuples results
      */
-    TarantoolTuplesResultMapperFactory defaultTuplesResultMapperFactory();
+    TarantoolTupleResultMapperFactory defaultTupleResultMapperFactory();
 
     /**
      * Default factory for single value stored function call result with a list of tuples.
      * You can obtain data from list of tuples and/or tarantool/crud responses.
      *
      * @return default factory for single value call result with a list of tuples
      */
-    TarantoolSingleTuplesResultMapperFactory defaultSingleTuplesResultMapperFactory();
+    TarantoolSingleTupleResultMapperFactory defaultSingleTupleResultMapperFactory();
 
     /**
      * Default factory for multi value stored function call result, where each return item is a tuple.
      * Use this factory for handling proxy function call results which return tuples as a multi-return result.
      *
      * @return default factory for multi value call result, where each item is a tuple
      */
-    TarantoolMultiTuplesResultMapperFactory defaultMultiTuplesResultMapperFactory();
+    TarantoolMultiTupleResultMapperFactory defaultMultiTupleResultMapperFactory();
 
     /**
      * Create a factory for mapping Tarantool server protocol result to a list of tuples as {@link TarantoolResult}