[ignite-3] branch ignite-19093 updated: WIP. minor.

[amashenkov]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-19093
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/ignite-19093 by this push:
     new 77ed030e57 WIP. minor.
77ed030e57 is described below

commit 77ed030e578998ab52091edcbfb55288651dbb67
Author: amashenkov <andrey.mashen...@gmail.com>
AuthorDate: Wed Mar 22 13:49:24 2023 +0300

    WIP. minor.
---
 .../metastorage/impl/MetaStorageManagerImpl.java   |  2 +-
 .../impl/StandaloneMetastorageManager.java         | 41 +++++++++-------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git 
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
 
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
index ea8f5418f0..23452efed6 100644
--- 
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
+++ 
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
@@ -127,7 +127,7 @@ public class MetaStorageManagerImpl implements 
MetaStorageManager {
         this.storage = storage;
     }
 
-    protected CompletableFuture<MetaStorageServiceImpl> 
initializeMetaStorage(Set<String> metaStorageNodes) {
+    private CompletableFuture<MetaStorageServiceImpl> 
initializeMetaStorage(Set<String> metaStorageNodes) {
         ClusterNode thisNode = clusterService.topologyService().localMember();
 
         String thisNodeName = thisNode.name();
diff --git 
a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetastorageManager.java
 
b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetastorageManager.java
index 3e9f9adf29..16ebe4789a 100644
--- 
a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetastorageManager.java
+++ 
b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetastorageManager.java
@@ -39,48 +39,35 @@ import 
org.apache.ignite.internal.raft.service.CommandClosure;
 import org.apache.ignite.internal.raft.service.RaftGroupService;
 import org.apache.ignite.internal.util.IgniteSpinBusyLock;
 import org.apache.ignite.internal.vault.VaultManager;
-import org.apache.ignite.internal.vault.inmemory.InMemoryVaultService;
 import org.apache.ignite.network.ClusterNode;
 import org.apache.ignite.network.ClusterService;
 import org.apache.ignite.network.NetworkAddress;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
 /**
  * MetaStorageManager dummy implementation.
  */
+@TestOnly
 public class StandaloneMetastorageManager extends MetaStorageManagerImpl {
     private static final String TEST_NODE_NAME = "test";
-    private final MetaStorageServiceImpl metaStorageService;
 
     /**
      * Creates standalone MetaStorage manager.
      */
-    public static MetaStorageManager create() {
-        VaultManager vaultMgr = new VaultManager(new InMemoryVaultService());
+    public static MetaStorageManager create(VaultManager vaultMgr) {
         SimpleInMemoryKeyValueStorage storage = new 
SimpleInMemoryKeyValueStorage(TEST_NODE_NAME);
 
         ClusterManagementGroupManager cmgMgr = 
Mockito.mock(ClusterManagementGroupManager.class);
         
Mockito.when(cmgMgr.metaStorageNodes()).thenReturn(completedFuture(Set.of())).getMock();
 
-        return new StandaloneMetastorageManager(vaultMgr, cmgMgr, storage) {
-            @Override
-            public void start() {
-                vaultMgr.start();
-                storage.start();
-
-                super.start();
-            }
-
-            @Override
-            public void stop() throws Exception {
-                super.stop();
-                vaultMgr.stop();
-            }
-        };
+        return new StandaloneMetastorageManager(vaultMgr, cmgMgr, storage);
     }
 
+    private final KeyValueStorage keyValueStorage;
+
     /**
      * The constructor.
      *
@@ -96,7 +83,14 @@ public class StandaloneMetastorageManager extends 
MetaStorageManagerImpl {
         super(vaultMgr, Mockito.mock(ClusterService.class), cmgMgr, 
Mockito.mock(LogicalTopologyService.class),
                 Mockito.mock(RaftManager.class), storage);
 
-        MetaStorageListener metaStorageListener = new 
MetaStorageListener(storage);
+        keyValueStorage = storage;
+    }
+
+    @Override
+    public void start() {
+        keyValueStorage.start();
+
+        MetaStorageListener metaStorageListener = new 
MetaStorageListener(keyValueStorage);
 
         RaftGroupService raftGroupService = 
Mockito.mock(RaftGroupService.class);
         Mockito.when(raftGroupService.run(ArgumentMatchers.any()))
@@ -104,12 +98,9 @@ public class StandaloneMetastorageManager extends 
MetaStorageManagerImpl {
 
         var localNode = new ClusterNode(TEST_NODE_NAME, TEST_NODE_NAME, new 
NetworkAddress("localhost", 10000));
 
-        this.metaStorageService = new MetaStorageServiceImpl(raftGroupService, 
new IgniteSpinBusyLock(), localNode);
-    }
+        MetaStorageServiceImpl service = new 
MetaStorageServiceImpl(raftGroupService, new IgniteSpinBusyLock(), localNode);
 
-    @Override
-    protected CompletableFuture<MetaStorageServiceImpl> 
initializeMetaStorage(Set<String> metaStorageNodes) {
-        return completedFuture(metaStorageService);
+        metaStorageServiceFuture().complete(service);
     }
 
     private static CompletableFuture<Serializable> runCommand(Command command, 
MetaStorageListener listener) {