Access Changed from public to protected for TarantoolResultImpl and TarantoolTupleResultImpl #326

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
 ## [Unreleased]
-
+- Close public access to TarantoolResult*Impl ([#326](https://github.com/tarantool/cartridge-java/issues/326))
 ## [0.10.1] - 2023-01-13
 
 ### Internal and API changes

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

@@ -0,0 +1,36 @@
+package io.tarantool.driver.core;
+
+import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
+import io.tarantool.driver.mappers.converters.ValueConverter;
+import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
+import org.msgpack.value.ArrayValue;
+import org.msgpack.value.Value;
+
+/**
+ * Singleton Factory implementation to provide instance of TarantoolResultImpl objects.
+ *
+ * @author Rishal Dev Singh
+ */
+public class TarantoolResultFactory {
+    private static final TarantoolResultFactory INSTANCE = new TarantoolResultFactory();
+
+    public static TarantoolResultFactory getInstance() {
+        return INSTANCE;
+    }
+
+    public <T> TarantoolResultImpl<T> createTarantoolResultImpl(ArrayValue value,
+            ValueConverter<ArrayValue, T> valueConverter) {
+        return new TarantoolResultImpl<>(value, valueConverter);
+    }
+
+    public TarantoolTupleResultImpl createTarantoolTupleResultImpl(Value value,
+            ArrayValueToTarantoolTupleConverter tupleConverter) {
+        return new TarantoolTupleResultImpl(value, tupleConverter);
+    }
+
+    public TarantoolTupleResultImpl createTarantoolTupleResultImpl(ArrayValue rawTuples,
+            TarantoolSpaceMetadata metadata,
+            ArrayValueToTarantoolTupleConverter tupleConverter) {
+        return new TarantoolTupleResultImpl(rawTuples, metadata, tupleConverter);
+    }
+}

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

@@ -27,7 +27,7 @@ public class TarantoolResultImpl<T> implements TarantoolResult<T> {
     protected TarantoolResultImpl() {
     }
 
-    public TarantoolResultImpl(ArrayValue value, ValueConverter<ArrayValue, T> valueConverter) {
+    protected TarantoolResultImpl(ArrayValue value, ValueConverter<ArrayValue, T> valueConverter) {
         // [[[],...]]
         setItems(value, valueConverter);
     }

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

@@ -17,13 +17,13 @@
  */
 public class TarantoolTupleResultImpl extends TarantoolResultImpl<TarantoolTuple> {
 
-    public TarantoolTupleResultImpl(
+    protected TarantoolTupleResultImpl(
         ArrayValue rawTuples, TarantoolSpaceMetadata metadata,
         ArrayValueToTarantoolTupleConverter tupleConverter) {
         setItems(rawTuples, metadata, tupleConverter);
     }
 
-    public TarantoolTupleResultImpl(Value value, ArrayValueToTarantoolTupleConverter tupleConverter) {
+    protected TarantoolTupleResultImpl(Value value, ArrayValueToTarantoolTupleConverter tupleConverter) {
         setItems(value.asArrayValue(), tupleConverter);
     }
 

src/main/java/io/tarantool/driver/core/metadata/RowsMetadataToTarantoolTupleResultConverter.java

@@ -1,9 +1,11 @@
 package io.tarantool.driver.core.metadata;
 
+import java.util.Map;
+
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
-import io.tarantool.driver.core.TarantoolTupleResultImpl;
+import io.tarantool.driver.core.TarantoolResultFactory;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import io.tarantool.driver.mappers.converters.value.ArrayValueToTarantoolTupleConverter;
 import org.msgpack.value.ArrayValue;
@@ -12,7 +14,7 @@
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueFactory;
 
-import java.util.Map;
+import static io.tarantool.driver.core.TarantoolResultFactory.getInstance;
 
 /**
  * @author Artyom Dubinin
@@ -29,10 +31,12 @@ public class RowsMetadataToTarantoolTupleResultConverter
         CRUDResponseToTarantoolSpaceMetadataConverter.getInstance();
 
     private final ArrayValueToTarantoolTupleConverter tupleConverter;
+    private final TarantoolResultFactory tarantoolResultFactory;
 
     public RowsMetadataToTarantoolTupleResultConverter(ArrayValueToTarantoolTupleConverter tupleConverter) {
         super();
         this.tupleConverter = tupleConverter;
+        this.tarantoolResultFactory = getInstance();
     }
 
     @Override
@@ -42,7 +46,7 @@ public TarantoolResult<TarantoolTuple> fromValue(MapValue value) {
         ArrayValue rawMetadata = tupleMap.get(RESULT_META).asArrayValue();
         TarantoolSpaceMetadata parsedMetadata = spaceMetadataConverter.fromValue(rawMetadata);
 
-        return new TarantoolTupleResultImpl(rawTuples, parsedMetadata, tupleConverter);
+        return tarantoolResultFactory.createTarantoolTupleResultImpl(rawTuples, parsedMetadata, tupleConverter);
     }
 
     @Override

src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolResultConverter.java

@@ -1,6 +1,7 @@
 package io.tarantool.driver.mappers.converters.value;
 
 import io.tarantool.driver.api.TarantoolResult;
+import io.tarantool.driver.core.TarantoolResultFactory;
 import io.tarantool.driver.core.TarantoolResultImpl;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ArrayValue;
@@ -14,16 +15,19 @@ public class ArrayValueToTarantoolResultConverter<T>
     private static final long serialVersionUID = -1348387430063097175L;
 
     private ValueConverter<ArrayValue, T> valueConverter;
+    private final TarantoolResultFactory tarantoolResultFactory;
 
     public ArrayValueToTarantoolResultConverter() {
+        this.tarantoolResultFactory = TarantoolResultFactory.getInstance();
     }
 
     public ArrayValueToTarantoolResultConverter(ValueConverter<ArrayValue, T> valueConverter) {
         this.valueConverter = valueConverter;
+        this.tarantoolResultFactory = new TarantoolResultFactory();
     }
 
     @Override
     public TarantoolResult<T> fromValue(ArrayValue value) {
-        return new TarantoolResultImpl<>(value, valueConverter);
+        return tarantoolResultFactory.<T>createTarantoolResultImpl(value, valueConverter);
     }
 }

src/main/java/io/tarantool/driver/mappers/converters/value/ArrayValueToTarantoolTupleResultConverter.java

@@ -2,10 +2,12 @@
 
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
-import io.tarantool.driver.core.TarantoolTupleResultImpl;
+import io.tarantool.driver.core.TarantoolResultFactory;
 import io.tarantool.driver.mappers.converters.ValueConverter;
 import org.msgpack.value.ArrayValue;
 
+import static io.tarantool.driver.core.TarantoolResultFactory.getInstance;
+
 /**
  * @author Artyom Dubinin
  */
@@ -15,15 +17,17 @@ public class ArrayValueToTarantoolTupleResultConverter
     private static final long serialVersionUID = -1348387430063097175L;
 
     private final ArrayValueToTarantoolTupleConverter tupleConverter;
+    private final TarantoolResultFactory tarantoolResultFactory;
 
     public ArrayValueToTarantoolTupleResultConverter(
         ArrayValueToTarantoolTupleConverter tupleConverter) {
         super();
         this.tupleConverter = tupleConverter;
+        this.tarantoolResultFactory = getInstance();
     }
 
     @Override
     public TarantoolResult<TarantoolTuple> fromValue(ArrayValue value) {
-        return new TarantoolTupleResultImpl(value, tupleConverter);
+        return tarantoolResultFactory.createTarantoolTupleResultImpl(value, tupleConverter);
     }
 }