Skip to content

Commit 7711634

Browse files
ArtDuArtDu
committed
Rename java converters
1 parent 7e64c00 commit 7711634

26 files changed

Lines changed: 103 additions & 94 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import io.tarantool.driver.mappers.MessagePackObjectMapper;
3030
import io.tarantool.driver.mappers.MessagePackValueMapper;
3131
import io.tarantool.driver.mappers.converters.ValueConverter;
32-
import io.tarantool.driver.mappers.factories.DefaultResultMapperFactoryFactory;
32+
import io.tarantool.driver.mappers.factories.ResultMapperFactoryFactoryImpl;
3333
import io.tarantool.driver.mappers.factories.ResultMapperFactoryFactory;
3434
import io.tarantool.driver.protocol.Packable;
3535
import io.tarantool.driver.protocol.TarantoolProtocolException;
@@ -66,7 +66,7 @@ public abstract class AbstractTarantoolClient<T extends Packable, R extends Coll
6666
private final TarantoolConnectionFactory connectionFactory;
6767
private final TarantoolConnectionListeners listeners;
6868
private final AtomicReference<TarantoolMetadata> metadataHolder = new AtomicReference<>();
69-
private final DefaultResultMapperFactoryFactory mapperFactoryFactory;
69+
private final ResultMapperFactoryFactoryImpl mapperFactoryFactory;
7070
private final SpacesMetadataProvider metadataProvider;
7171
private final ScheduledExecutorService timeoutScheduler;
7272
private TarantoolConnectionManager connectionManager;
@@ -110,7 +110,7 @@ public AbstractTarantoolClient(TarantoolClientConfig config, TarantoolConnection
110110
Assert.notNull(listeners, "Tarantool connection listeners must not be null");
111111

112112
this.config = config;
113-
this.mapperFactoryFactory = new DefaultResultMapperFactoryFactory();
113+
this.mapperFactoryFactory = new ResultMapperFactoryFactoryImpl();
114114
this.eventLoopGroup = new NioEventLoopGroup(config.getEventLoopThreadsNumber());
115115
this.bootstrap = new Bootstrap()
116116
.group(eventLoopGroup)

‎src/main/java/io/tarantool/driver/mappers/DefaultMultiValueResultMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.tarantool.driver.api.MultiValueCallResult;
44
import io.tarantool.driver.mappers.converters.ValueConverter;
5-
import io.tarantool.driver.mappers.converters.value.custom.SimpleMultiValueCallResultConverter;
5+
import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToMultiValueCallResultSimpleConverter;
66
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
77
import org.msgpack.value.ArrayValue;
88

@@ -35,6 +35,6 @@ private static <T, R extends List<T>> Class<MultiValueCallResult<T, R>> getResul
3535

3636
private static <T, R extends List<T>> ValueConverter<ArrayValue, ? extends MultiValueCallResult<T, R>>
3737
defaultValueConverter(MessagePackValueMapper valueMapper) {
38-
return new SimpleMultiValueCallResultConverter<>(valueMapper::fromValue);
38+
return new ArrayValueToMultiValueCallResultSimpleConverter<>(valueMapper::fromValue);
3939
}
4040
}

‎src/main/java/io/tarantool/driver/mappers/DefaultSingleValueResultMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.tarantool.driver.api.SingleValueCallResult;
44
import io.tarantool.driver.mappers.converters.ValueConverter;
5-
import io.tarantool.driver.mappers.converters.value.custom.SimpleSingleValueCallResultConverter;
5+
import io.tarantool.driver.mappers.converters.value.custom.ArrayValueToSingleValueCallResultSimpleConverter;
66
import io.tarantool.driver.mappers.factories.DefaultMessagePackMapperFactory;
77
import org.msgpack.value.ArrayValue;
88

@@ -32,6 +32,6 @@ private static <T> Class<SingleValueCallResult<T>> getResultClass(Class<T> conte
3232

3333
private static <T> ValueConverter<ArrayValue, ? extends SingleValueCallResult<T>> defaultValueConverter(
3434
MessagePackValueMapper valueMapper) {
35-
return new SimpleSingleValueCallResultConverter<>(valueMapper::fromValue);
35+
return new ArrayValueToSingleValueCallResultSimpleConverter<>(valueMapper::fromValue);
3636
}
3737
}

src/main/java/io/tarantool/driver/mappers/converters/value/custom/MultiValueCallResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToMultiValueCallResultConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Alexey Kuzin
1515
* @author Artyom Dubinin
1616
*/
17-
public class MultiValueCallResultConverter<T, R extends List<T>>
17+
public class ArrayValueToMultiValueCallResultConverter<T, R extends List<T>>
1818
implements ValueConverter<ArrayValue, MultiValueCallResult<T, R>> {
1919

2020
private static final long serialVersionUID = 20200708L;
@@ -26,7 +26,7 @@ public class MultiValueCallResultConverter<T, R extends List<T>>
2626
*
2727
* @param valueMapper converter of multi-return result items to list
2828
*/
29-
public MultiValueCallResultConverter(MessagePackValueMapper valueMapper) {
29+
public ArrayValueToMultiValueCallResultConverter(MessagePackValueMapper valueMapper) {
3030
this.valueMapper = valueMapper;
3131
}
3232

src/main/java/io/tarantool/driver/mappers/converters/value/custom/SimpleMultiValueCallResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToMultiValueCallResultSimpleConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @author Alexey Kuzin
1414
* @author Artyom Dubinin
1515
*/
16-
public class SimpleMultiValueCallResultConverter<T, R extends List<T>>
16+
public class ArrayValueToMultiValueCallResultSimpleConverter<T, R extends List<T>>
1717
implements ValueConverter<ArrayValue, MultiValueCallResult<T, R>> {
1818

1919
private static final long serialVersionUID = -5298829576218240572L;
@@ -25,7 +25,7 @@ public class SimpleMultiValueCallResultConverter<T, R extends List<T>>
2525
*
2626
* @param valueConverter converter of multi-return result items to list
2727
*/
28-
public SimpleMultiValueCallResultConverter(ValueConverter<ArrayValue, R> valueConverter) {
28+
public ArrayValueToMultiValueCallResultSimpleConverter(ValueConverter<ArrayValue, R> valueConverter) {
2929
this.valueConverter = valueConverter;
3030
}
3131

src/main/java/io/tarantool/driver/mappers/converters/value/custom/MultiValueListConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToMultiValueListConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
*
1414
* @author Alexey Kuzin
1515
*/
16-
public class MultiValueListConverter<T, R extends List<T>, V extends Value> implements ValueConverter<ArrayValue, R> {
16+
public class ArrayValueToMultiValueListConverter<T, R extends List<T>, V extends Value>
17+
implements ValueConverter<ArrayValue, R> {
1718

1819
private static final long serialVersionUID = 20200708L;
1920

@@ -26,7 +27,7 @@ public class MultiValueListConverter<T, R extends List<T>, V extends Value> impl
2627
* @param valueConverter converter for result items
2728
* @param containerSupplier supplier for an empty collection of the result type
2829
*/
29-
public MultiValueListConverter(ValueConverter<V, T> valueConverter, Supplier<R> containerSupplier) {
30+
public ArrayValueToMultiValueListConverter(ValueConverter<V, T> valueConverter, Supplier<R> containerSupplier) {
3031
this.valueConverter = valueConverter;
3132
this.containerSupplier = containerSupplier;
3233
}

src/main/java/io/tarantool/driver/mappers/converters/value/custom/SingleValueCallResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToSingleValueCallResultConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
* @author Alexey Kuzin
1313
* @author Artyom Dubinin
1414
*/
15-
public class SingleValueCallResultConverter<T>
15+
public class ArrayValueToSingleValueCallResultConverter<T>
1616
implements ValueConverter<ArrayValue, SingleValueCallResult<T>> {
1717

1818
private static final long serialVersionUID = 7218783308373068532L;
1919

2020
private final MessagePackValueMapper valueMapper;
2121

22-
public SingleValueCallResultConverter(MessagePackValueMapper valueMapper) {
22+
public ArrayValueToSingleValueCallResultConverter(MessagePackValueMapper valueMapper) {
2323
this.valueMapper = valueMapper;
2424
}
2525

src/main/java/io/tarantool/driver/mappers/converters/value/custom/SimpleSingleValueCallResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToSingleValueCallResultSimpleConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
* @author Alexey Kuzin
1313
* @author Artyom Dubinin
1414
*/
15-
public class SimpleSingleValueCallResultConverter<T> implements ValueConverter<ArrayValue, SingleValueCallResult<T>> {
15+
public class ArrayValueToSingleValueCallResultSimpleConverter<T>
16+
implements ValueConverter<ArrayValue, SingleValueCallResult<T>> {
1617

1718
private static final long serialVersionUID = 5062622344994604532L;
1819

1920
private final ValueConverter<Value, T> valueConverter;
2021

21-
public SimpleSingleValueCallResultConverter(ValueConverter<Value, T> valueConverter) {
22+
public ArrayValueToSingleValueCallResultSimpleConverter(ValueConverter<Value, T> valueConverter) {
2223
this.valueConverter = valueConverter;
2324
}
2425

src/main/java/io/tarantool/driver/mappers/converters/value/custom/DefaultArrayValueToTarantoolResultConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToTarantoolResultConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
/**
99
* @author Artyom Dubinin
1010
*/
11-
public class DefaultArrayValueToTarantoolResultConverter<T>
11+
public class ArrayValueToTarantoolResultConverter<T>
1212
implements ValueConverter<ArrayValue, TarantoolResult<T>> {
1313

1414
private static final long serialVersionUID = -1348387430063097175L;
1515

1616
private ValueConverter<ArrayValue, T> valueConverter;
1717

18-
public DefaultArrayValueToTarantoolResultConverter() {
18+
public ArrayValueToTarantoolResultConverter() {
1919
}
2020

21-
public DefaultArrayValueToTarantoolResultConverter(ValueConverter<ArrayValue, T> valueConverter) {
21+
public ArrayValueToTarantoolResultConverter(ValueConverter<ArrayValue, T> valueConverter) {
2222
this.valueConverter = valueConverter;
2323
}
2424

src/main/java/io/tarantool/driver/mappers/converters/value/custom/TarantoolTupleConverter.java renamed to src/main/java/io/tarantool/driver/mappers/converters/value/custom/ArrayValueToTarantoolTupleConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
*
1313
* @author Sergey Volgin
1414
*/
15-
public class TarantoolTupleConverter implements ValueConverter<ArrayValue, TarantoolTuple> {
15+
public class ArrayValueToTarantoolTupleConverter implements ValueConverter<ArrayValue, TarantoolTuple> {
1616

1717
private static final long serialVersionUID = 20220418L;
1818

1919
private final MessagePackMapper mapper;
2020
private final TarantoolSpaceMetadata spaceMetadata;
2121

22-
public TarantoolTupleConverter(MessagePackMapper mapper, TarantoolSpaceMetadata spaceMetadata) {
22+
public ArrayValueToTarantoolTupleConverter(MessagePackMapper mapper, TarantoolSpaceMetadata spaceMetadata) {
2323
this.mapper = mapper;
2424
this.spaceMetadata = spaceMetadata;
2525
}

0 commit comments

Comments
 (0)