Refactor CRUDOperationOptions to a hierarchy of classes

.gitignore

@@ -6,3 +6,5 @@ tmp/
 .DS_Store
 *.swp
 *.swo
+.bloop/
+.metals/

src/main/java/io/tarantool/driver/core/proxy/CRUDAbstractOperationOptions.java

@@ -0,0 +1,53 @@
+package io.tarantool.driver.core.proxy;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class is not part of the public API.
+ *
+ * An abstract class necessary for implementing CRT (curiously recurring template)
+ * pattern for the cluster proxy operation options builders.
+ *
+ * @author Alexey Kuzin
+ */
+abstract class CRUDAbstractOperationOptions {
+
+    private final Map<String, Object> resultMap = new HashMap<>();
+
+    /**
+     * Inheritable Builder for select cluster proxy operation options.
+     * <p>
+     * This abstract class is necessary for implementing fluent builder inheritance.
+     * The solution with {@code self()} method allows to avoid weird java
+     * compiler errors when you cannot call the inherited methods from derived
+     * concrete {@code Builder} classes because their type erasure doesn't
+     * correspond to the {@code AbstractBuilder} type.
+     * <p>
+     * The {@code self()} method must be implemented only in the derived concrete
+     * classes. These concrete classes are used to work with the operation
+     * options in the calling code. They doesn't require to specify the generic
+     * types and therefore are more convenient. Also they ensure that the right
+     * combination of generic types will be used to avoid potential inheritance
+     * flaws.
+     */
+    protected abstract static
+    class AbstractBuilder<O extends CRUDAbstractOperationOptions, B extends AbstractBuilder<O, B>> {
+        abstract B self();
+
+        public abstract O build();
+    }
+
+    protected void addOption(String option, Object value) {
+        resultMap.put(option, value);
+    }
+
+    /**
+     * Return serializable options representation.
+     *
+     * @return a map
+     */
+    public Map<String, Object> asMap() {
+        return resultMap;
+    }
+}

src/main/java/io/tarantool/driver/core/proxy/CRUDBaseOptions.java

@@ -0,0 +1,54 @@
+package io.tarantool.driver.core.proxy;
+
+/**
+ * This class is not part of the public API.
+ *
+ * Represent basic options for all cluster operations
+ *
+ * @author Alexey Kuzin
+ */
+public class CRUDBaseOptions extends CRUDAbstractOperationOptions {
+
+    public static final String TIMEOUT = "timeout";
+
+    protected
+    <O extends CRUDBaseOptions, T extends AbstractBuilder<O, T>>
+    CRUDBaseOptions(AbstractBuilder<O, T> builder) {
+        if (builder.timeout != null) {
+            addOption(TIMEOUT, builder.timeout);
+        }
+    }
+
+    /**
+     * Inheritable Builder for basic cluster proxy operation options.
+     *
+     * @see CRUDAbstractOperationOptions.AbstractBuilder
+     */
+    protected abstract static
+    class AbstractBuilder<O extends CRUDBaseOptions, T extends AbstractBuilder<O, T>>
+        extends CRUDAbstractOperationOptions.AbstractBuilder<O, T> {
+        protected Integer timeout;
+
+        public T withTimeout(int timeout) {
+            this.timeout = timeout;
+            return self();
+        }
+    }
+
+    /**
+     * Concrete Builder implementation for basic cluster proxy operation options.
+     */
+    protected static final class Builder
+        extends AbstractBuilder<CRUDBaseOptions, Builder> {
+
+        @Override
+        Builder self() {
+            return this;
+        }
+
+        @Override
+        public CRUDBaseOptions build() {
+            return new CRUDBaseOptions(this);
+        }
+    }
+}

src/main/java/io/tarantool/driver/core/proxy/CRUDSelectOptions.java

@@ -0,0 +1,81 @@
+package io.tarantool.driver.core.proxy;
+
+import io.tarantool.driver.protocol.Packable;
+
+/**
+ * This class is not part of the public API.
+ *
+ * Represent options for select cluster proxy operations
+ *
+ * @author Sergey Volgin
+ * @author Alexey Kuzin
+ */
+public final class CRUDSelectOptions extends CRUDBaseOptions {
+
+    public static final String SELECT_LIMIT = "first";
+    public static final String SELECT_AFTER = "after";
+    public static final String SELECT_BATCH_SIZE = "batch_size";
+
+    protected
+    <O extends CRUDSelectOptions, T extends AbstractBuilder<O, T>>
+    CRUDSelectOptions(AbstractBuilder<O, T> builder) {
+        super(builder);
+
+        if (builder.selectLimit != null) {
+            addOption(SELECT_LIMIT, builder.selectLimit);
+        }
+
+        if (builder.after != null) {
+            addOption(SELECT_AFTER, builder.after);
+        }
+
+        if (builder.selectBatchSize != null) {
+            addOption(SELECT_BATCH_SIZE, builder.selectBatchSize);
+        }
+    }
+
+    /**
+     * Inheritable Builder for select cluster proxy operation options.
+     *
+     * @see CRUDAbstractOperationOptions.AbstractBuilder
+     */
+    protected abstract static
+    class AbstractBuilder<O extends CRUDSelectOptions, T extends AbstractBuilder<O, T>>
+        extends CRUDBaseOptions.AbstractBuilder<O, T> {
+        private Long selectLimit;
+        private Packable after;
+        private Long selectBatchSize;
+
+        public T withSelectLimit(long selectLimit) {
+            this.selectLimit = selectLimit;
+            return self();
+        }
+
+        public T withSelectBatchSize(long selectBatchSize) {
+            this.selectBatchSize = selectBatchSize;
+            return self();
+        }
+
+        public T withSelectAfter(Packable startTuple) {
+            this.after = startTuple;
+            return self();
+        }
+    }
+
+    /**
+     * Concrete Builder implementation for select cluster proxy operation options.
+     */
+    protected static final class Builder
+        extends AbstractBuilder<CRUDSelectOptions, Builder> {
+
+        @Override
+        Builder self() {
+            return this;
+        }
+
+        @Override
+        public CRUDSelectOptions build() {
+            return new CRUDSelectOptions(this);
+        }
+    }
+}

src/main/java/io/tarantool/driver/core/proxy/DeleteProxyOperation.java

@@ -46,7 +46,7 @@ public Builder<T> withIndexQuery(TarantoolIndexQuery indexQuery) {
         }
 
         public DeleteProxyOperation<T> build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();
 

src/main/java/io/tarantool/driver/core/proxy/InsertProxyOperation.java

@@ -49,7 +49,7 @@ public Builder<T, R> withTuple(T tuple) {
         }
 
         public InsertProxyOperation<T, R> build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();
 

src/main/java/io/tarantool/driver/core/proxy/ReplaceProxyOperation.java

@@ -50,7 +50,7 @@ public Builder<T, R> withTuple(T tuple) {
         }
 
         public ReplaceProxyOperation<T, R> build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();
 

src/main/java/io/tarantool/driver/core/proxy/SelectProxyOperation.java

@@ -52,7 +52,7 @@ public Builder<T> withConditions(Conditions conditions) {
         }
 
         public SelectProxyOperation<T> build() {
-            CRUDOperationOptions.Builder requestOptions = CRUDOperationOptions.builder()
+            CRUDSelectOptions.Builder requestOptions = new CRUDSelectOptions.Builder()
                     .withTimeout(requestTimeout)
                     .withSelectBatchSize(conditions.getLimit())
                     .withSelectLimit(conditions.getLimit())

src/main/java/io/tarantool/driver/core/proxy/TruncateProxyOperation.java

@@ -68,7 +68,7 @@ Builder self() {
          * @return TruncateProxyOperation instance
          */
         public TruncateProxyOperation build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();
 

src/main/java/io/tarantool/driver/core/proxy/UpdateProxyOperation.java

@@ -53,7 +53,7 @@ public Builder<T> withTupleOperation(TupleOperations operations) {
         }
 
         public UpdateProxyOperation<T> build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();
 

src/main/java/io/tarantool/driver/core/proxy/UpsertProxyOperation.java

@@ -56,7 +56,7 @@ public Builder<T, R> withTupleOperation(TupleOperations operations) {
         }
 
         public UpsertProxyOperation<T, R> build() {
-            CRUDOperationOptions options = CRUDOperationOptions.builder()
+            CRUDBaseOptions options = new CRUDBaseOptions.Builder()
                     .withTimeout(requestTimeout)
                     .build();