New implementation of coordination service

coordination/pom.xml

@@ -35,6 +35,11 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

coordination/src/main/java/tech/ydb/coordination/CoordinationClient.java

@@ -4,89 +4,124 @@
 
 import javax.annotation.WillNotClose;
 
-import tech.ydb.coordination.impl.CoordinationClientImpl;
-import tech.ydb.coordination.rpc.grpc.GrpcCoordinationRpc;
+import tech.ydb.coordination.description.NodeConfig;
+import tech.ydb.coordination.impl.CoordinationServiceImpl;
 import tech.ydb.coordination.settings.CoordinationNodeSettings;
+import tech.ydb.coordination.settings.CoordinationSessionSettings;
 import tech.ydb.coordination.settings.DescribeCoordinationNodeSettings;
 import tech.ydb.coordination.settings.DropCoordinationNodeSettings;
+import tech.ydb.core.Result;
 import tech.ydb.core.Status;
 import tech.ydb.core.grpc.GrpcTransport;
 
 /**
  * @author Kirill Kurdyukov
+ * @author Alexandr Gorshein
  */
 public interface CoordinationClient {
 
     static CoordinationClient newClient(@WillNotClose GrpcTransport transport) {
-        return new CoordinationClientImpl(GrpcCoordinationRpc.useTransport(transport));
+        return CoordinationServiceImpl.newClient(transport);
     }
 
     /**
-     * Bidirectional stream used to establish a session with a coordination node
-     * <p>
-     * Relevant APIs for managing semaphores, distributed locking, creating or
-     * restoring a previously established session are described using nested
-     * messages in SessionRequest and SessionResponse. Session is established
-     * with a specific coordination node (previously created using CreateNode
-     * below) and semaphores are local to that coordination node.
+     * Database path
+     * Used for creating coordination node path
+     *
+     * @return path to database
+     */
+    String getDatabase();
+
+    /**
+     * Creates a new coordination session.
+     * The coordination session establishes bidirectional grpc stream with a specific coordination node and uses this
+     * stream for exchanging messages with the coordination service.
      *
-     * @return coordination node session
+     * @param path full path to coordination node
+     * @param settings coordination session settings
+     * @return new instance of coordination session
      */
-    CoordinationSession createSession();
+    CoordinationSession createSession(String path, CoordinationSessionSettings settings);
 
     /**
      * Creates a new coordination node.
      *
      * @param path full path to coordination node
-     * @param coordinationNodeSettings coordination node settings
-     * @return status of request
+     * @param settings coordination node settings
+     * @return future with status of operation
      */
-    CompletableFuture<Status> createNode(
-            String path,
-            CoordinationNodeSettings coordinationNodeSettings
-    );
+    CompletableFuture<Status> createNode(String path, CoordinationNodeSettings settings);
 
     /**
      * Modifies settings of a coordination node
      *
      * @param path full path to coordination node
-     * @param coordinationNodeSettings coordination node settings
-     * @return status of request
+     * @param settings coordination node settings
+     * @return future with status of operation
      */
-    CompletableFuture<Status> alterNode(
-            String path,
-            CoordinationNodeSettings coordinationNodeSettings
-    );
+    CompletableFuture<Status> alterNode(String path, CoordinationNodeSettings settings);
 
     /**
      * Drops a coordination node
      *
      * @param path full path to coordination node
-     * @param dropCoordinationNodeSettings drop coordination node settings
-     * @return request of status
+     * @param settings drop coordination node settings
+     * @return future with status of operation
      */
-    CompletableFuture<Status> dropNode(
-            String path,
-            DropCoordinationNodeSettings dropCoordinationNodeSettings
-    );
+    CompletableFuture<Status> dropNode(String path, DropCoordinationNodeSettings settings);
 
     /**
      * Describes a coordination node
      *
      * @param path full path to coordination node
-     * @param describeCoordinationNodeSettings describe coordination node settings
-     * @return request of status
+     * @param settings describe coordination node settings
+     * @return future with node configuration
      */
-    CompletableFuture<Status> describeNode(
-            String path,
-            DescribeCoordinationNodeSettings describeCoordinationNodeSettings
-    );
+    CompletableFuture<Result<NodeConfig>> describeNode(String path, DescribeCoordinationNodeSettings settings);
+
+
+
+    // --------------- default methods ------------------------------
 
     /**
-     * Database path
-     * Using for creating coordination node path
+     * Creates a new coordination session with default settings.
+     * The coordination session establishes bidirectional grpc stream with a specific coordination node and uses this
+     * stream for exchanging messages with the coordination service.
      *
-     * @return path to database
+     * @param path full path to coordination node
+     * @return new instance of coordination session
      */
-    String getDatabase();
+    default CoordinationSession createSession(String path) {
+        return createSession(path, CoordinationSessionSettings.newBuilder().build());
+    }
+
+    /**
+     * Creates a new coordination node.
+     *
+     * @param path full path to coordination node
+     * @return future with status of operation
+     */
+    default CompletableFuture<Status> createNode(String path) {
+        return createNode(path, CoordinationNodeSettings.newBuilder().build());
+    }
+
+    /**
+     * Drops a coordination node
+     *
+     * @param path full path to coordination node
+     * @return future with status of operation
+     */
+    default CompletableFuture<Status> dropNode(String path) {
+        return dropNode(path, DropCoordinationNodeSettings.newBuilder().build());
+    }
+
+    /**
+     * Describes a coordination node
+     *
+     * @param path full path to coordination node
+     * @return future with result of operation
+     */
+    default CompletableFuture<Result<NodeConfig>> describeNode(String path) {
+        return describeNode(path, DescribeCoordinationNodeSettings.newBuilder().build());
+    }
 }