Refactor mappers packages again

ArtDu · ArtDu · commit d58ac9223a84 · 2022-12-05T17:05:45.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - **[breaking change]** `TarantoolTupleMultiResult` was renamed to `MultiValueTarantoolTupleResult` ([#301](https://github.com/tarantool/cartridge-java/pull/301))
 - **[breaking change]** `TarantoolTupleSingleResult` was renamed to `SingleValueTarantoolTupleResult` ([#301](https://github.com/tarantool/cartridge-java/pull/301))
 - **[breaking change]** `*MapperFactory` methods were renamed ([#301](https://github.com/tarantool/cartridge-java/pull/301))
+- **[breaking change]** `*DefaultConverter` converters moved into `mappers.converters.value.defaults` package ([#301](https://github.com/tarantool/cartridge-java/pull/301))
+- **[breaking change]** All converters from `mappers.converters.value.custom` moved into `mappers.converters.value` package ([#301](https://github.com/tarantool/cartridge-java/pull/301))
 
 ## [0.9.2] - 2022-11-15
 
diff --git a/src/main/java/io/tarantool/driver/mappers/DefaultMessagePackMapper.java b/src/main/java/io/tarantool/driver/mappers/DefaultMessagePackMapper.java
@@ -7,9 +7,9 @@
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import io.tarantool.driver.mappers.converters.object.DefaultListToArrayValueConverter;
 import io.tarantool.driver.mappers.converters.object.DefaultMapToMapValueConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultArrayValueToListConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultMapValueToMapConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultNullToNilValueConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultArrayValueToListConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultMapValueToMapConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultNullToNilValueConverter;
 import org.msgpack.value.NilValue;
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueType;
diff --git a/src/main/java/io/tarantool/driver/mappers/DefaultMultiValueResultMapper.java b/src/main/java/io/tarantool/driver/mappers/DefaultMultiValueResultMapper.java
@@ -2,7 +2,7 @@
 
 import io.tarantool.driver.api.MultiValueCallResult;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToMultiValueCallResultSimpleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToMultiValueCallResultSimpleConverter;
 import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
 import org.msgpack.value.ArrayValue;
 
diff --git a/src/main/java/io/tarantool/driver/mappers/DefaultSingleValueResultMapper.java b/src/main/java/io/tarantool/driver/mappers/DefaultSingleValueResultMapper.java
@@ -2,7 +2,7 @@
 
 import io.tarantool.driver.api.SingleValueCallResult;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToSingleValueCallResultSimpleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToSingleValueCallResultSimpleConverter;
 import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
 import org.msgpack.value.ArrayValue;
 
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueCallResultConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueCallResultConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.MultiValueCallResult;
 import io.tarantool.driver.core.MultiValueCallResultImpl;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueCallResultSimpleConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueCallResultSimpleConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.MultiValueCallResult;
 import io.tarantool.driver.core.MultiValueCallResultImpl;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueListConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToMultiValueListConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ArrayValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToSingleValueCallResultConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToSingleValueCallResultConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.SingleValueCallResult;
 import io.tarantool.driver.core.SingleValueCallResultImpl;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToSingleValueCallResultSimpleConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToSingleValueCallResultSimpleConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.SingleValueCallResult;
 import io.tarantool.driver.core.SingleValueCallResultImpl;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolResultConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolResultConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.core.TarantoolResultImpl;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolTupleConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolTupleConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolTupleResultConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolTupleResultConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/MapValueToTarantoolTupleResultConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/MapValueToTarantoolTupleResultConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value.custom;
+package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/custom/package-info.java b/src/main/java/io/tarantool/driver/mappers/converters/value/custom/package-info.java
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultArrayValueToListConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultArrayValueToListConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultArrayValueToLongArrayConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultArrayValueToLongArrayConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ArrayValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultBinaryValueToByteArrayConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultBinaryValueToByteArrayConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.BinaryValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultBooleanValueToBooleanConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultBooleanValueToBooleanConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.BooleanValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultExtensionValueToBigDecimalConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultExtensionValueToBigDecimalConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.MessagePackValueMapperException;
 import io.tarantool.driver.mappers.converters.ValueConverter;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultExtensionValueToUUIDConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultExtensionValueToUUIDConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ExtensionValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToDoubleConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToDoubleConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.FloatValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToFloatConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToFloatConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.FloatValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToIntegerConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToIntegerConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.FloatValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToLongConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToLongConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.FloatValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToShortConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultFloatValueToShortConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.FloatValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToDoubleConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToDoubleConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.IntegerValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToFloatConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToFloatConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.IntegerValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToIntegerConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToIntegerConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.IntegerValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToLongConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToLongConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.IntegerValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToShortConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultIntegerValueToShortConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.IntegerValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultMapValueToMapConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultMapValueToMapConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultNullToNilValueConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultNullToNilValueConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ObjectConverter;
 import org.msgpack.value.NilValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToByteArrayConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToByteArrayConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.StringValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToCharacterConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToCharacterConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.StringValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToStringConverter.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToStringConverter.java
@@ -1,4 +1,4 @@
-package io.tarantool.driver.mappers.converters.value;
+package io.tarantool.driver.mappers.converters.value.defaults;
 
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.StringValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/package-info.java b/src/main/java/io/tarantool/driver/mappers/converters/value/defaults/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Contains default converters that map MessagePack values to Java Objects
+ *
+ * @author Alexey Kuzin
+ * @author Artyom Dubinin
+ */
+package io.tarantool.driver.mappers.converters.value.defaults;
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/DefaultMessagePackMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/DefaultMessagePackMapperFactory.java
@@ -15,24 +15,24 @@
 import io.tarantool.driver.mappers.converters.object.DefaultShortToIntegerValueConverter;
 import io.tarantool.driver.mappers.converters.object.DefaultStringToStringValueConverter;
 import io.tarantool.driver.mappers.converters.object.DefaultUUIDToExtensionValueConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultArrayValueToLongArrayConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultBinaryValueToByteArrayConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultBooleanValueToBooleanConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultExtensionValueToBigDecimalConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultExtensionValueToUUIDConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToDoubleConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToFloatConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToIntegerConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToLongConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToShortConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultIntegerValueToDoubleConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultIntegerValueToFloatConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultIntegerValueToIntegerConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultIntegerValueToLongConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultIntegerValueToShortConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultStringValueToByteArrayConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultStringValueToCharacterConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultStringValueToStringConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultArrayValueToLongArrayConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultBinaryValueToByteArrayConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultBooleanValueToBooleanConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultExtensionValueToBigDecimalConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultExtensionValueToUUIDConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToDoubleConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToFloatConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToIntegerConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToLongConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToShortConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultIntegerValueToDoubleConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultIntegerValueToFloatConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultIntegerValueToIntegerConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultIntegerValueToLongConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultIntegerValueToShortConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultStringValueToByteArrayConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultStringValueToCharacterConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultStringValueToStringConverter;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.BinaryValue;
 import org.msgpack.value.BooleanValue;
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/MultiValueResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/MultiValueResultMapperFactory.java
@@ -5,8 +5,8 @@
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToMultiValueCallResultConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToMultiValueCallResultSimpleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToMultiValueCallResultConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToMultiValueCallResultSimpleConverter;
 import org.msgpack.value.ArrayValue;
 
 import java.util.List;
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/MultiValueWithTarantoolTupleResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/MultiValueWithTarantoolTupleResultMapperFactory.java
@@ -7,7 +7,7 @@
 import io.tarantool.driver.api.tuple.TarantoolTuple;
 import io.tarantool.driver.mappers.CallResultMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToTarantoolTupleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
 
 /**
  * Factory for {@link CallResultMapper} instances used for handling results with {@link TarantoolTuple}s as
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/ResultMapperFactoryFactoryImpl.java b/src/main/java/io/tarantool/driver/mappers/factories/ResultMapperFactoryFactoryImpl.java
@@ -9,7 +9,7 @@
 import io.tarantool.driver.mappers.DefaultSingleValueResultMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToMultiValueListConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToMultiValueListConverter;
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueType;
 
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/SingleValueResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/SingleValueResultMapperFactory.java
@@ -5,8 +5,8 @@
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToSingleValueCallResultConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToSingleValueCallResultSimpleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToSingleValueCallResultConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToSingleValueCallResultSimpleConverter;
 import org.msgpack.value.Value;
 
 /**
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/SingleValueWithTarantoolTupleResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/SingleValueWithTarantoolTupleResultMapperFactory.java
@@ -7,7 +7,7 @@
 import io.tarantool.driver.api.tuple.TarantoolTuple;
 import io.tarantool.driver.mappers.CallResultMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToTarantoolTupleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
 
 /**
  * Factory for {@link CallResultMapper} instances used for handling results with {@link TarantoolTuple}s
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/StoringStructureToTarantoolResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/StoringStructureToTarantoolResultMapperFactory.java
@@ -5,7 +5,7 @@
 import io.tarantool.driver.mappers.MessagePackValueMapper;
 import io.tarantool.driver.mappers.TarantoolResultMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToTarantoolResultConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolResultConverter;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.ValueType;
 
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/StoringStructureToTarantoolTupleResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/StoringStructureToTarantoolTupleResultMapperFactory.java
@@ -7,9 +7,9 @@
 import io.tarantool.driver.mappers.TarantoolResultMapper;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import io.tarantool.driver.mappers.converters.ValueConverterWithInputTypeWrapper;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToTarantoolTupleResultConverter;
-import io.tarantool.driver.mappers.converters.value.custom.MapValueToTarantoolTupleResultConverter;
-import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToTarantoolTupleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleResultConverter;
+import io.tarantool.driver.mappers.converters.value.MapValueToTarantoolTupleResultConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.MapValue;
 import org.msgpack.value.ValueType;
diff --git a/src/main/java/io/tarantool/driver/mappers/factories/TarantoolTupleResultMapperFactory.java b/src/main/java/io/tarantool/driver/mappers/factories/TarantoolTupleResultMapperFactory.java
@@ -6,7 +6,7 @@
 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.custom.ArrayValueToTarantoolTupleConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
 
 /**
  * Factory for {@link TarantoolResultMapper} instances used for handling results with {@link TarantoolTuple}s
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultBigDecimalConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultBigDecimalConverterTest.java
@@ -1,7 +1,7 @@
 package io.tarantool.driver.mappers;
 
 import io.tarantool.driver.mappers.converters.object.DefaultBigDecimalToExtensionValueConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultExtensionValueToBigDecimalConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultExtensionValueToBigDecimalConverter;
 import org.junit.jupiter.api.Test;
 import org.msgpack.core.MessageBufferPacker;
 import org.msgpack.core.MessagePack;
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java
@@ -4,7 +4,7 @@
 import io.tarantool.driver.api.tuple.TarantoolTuple;
 import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
 import io.tarantool.driver.mappers.converters.object.DefaultCharacterToStringValueConverter;
-import io.tarantool.driver.mappers.converters.value.DefaultStringValueToCharacterConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultStringValueToCharacterConverter;
 import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
 import org.junit.jupiter.api.Test;
 import org.msgpack.value.StringValue;
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToFloatConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToFloatConverterTest.java
@@ -1,6 +1,6 @@
 package io.tarantool.driver.mappers;
 
-import io.tarantool.driver.mappers.converters.value.DefaultFloatValueToFloatConverter;
+import io.tarantool.driver.mappers.converters.value.defaults.DefaultFloatValueToFloatConverter;
 import org.junit.jupiter.api.Test;
 import org.msgpack.value.ValueFactory;
 
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToIntegerConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToIntegerConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToLongConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToLongConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToShortConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultFloatValueToShortConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultIntegerValueToShortConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultIntegerValueToShortConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultLongArrayConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultLongArrayConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultStringValueToByteArrayConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultStringValueToByteArrayConverterTest.java
diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultUUIDConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultUUIDConverterTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.tarantool.driver.mappers.converters.value.custom;`
	`1`	`+package io.tarantool.driver.mappers.converters.value;`
`2`	`2`
`3`	`3`	`import io.tarantool.driver.api.MultiValueCallResult;`
`4`	`4`	`import io.tarantool.driver.core.MultiValueCallResultImpl;`