[core] Simplify IndexStore and friends

Related to #10773

Closes #81.

Author: dadoonet

src/main/java/org/elasticsearch/index/store/smbmmapfs/SmbMmapFsDirectoryService.java

@@ -26,18 +26,18 @@
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.settings.IndexSettings;
-import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.index.shard.ShardPath;
+import org.elasticsearch.index.store.FsDirectoryService;
 import org.elasticsearch.index.store.IndexStore;
-import org.elasticsearch.index.store.fs.FsDirectoryService;
 
 import java.io.IOException;
 import java.nio.file.Path;
 
 public class SmbMmapFsDirectoryService extends FsDirectoryService {
 
     @Inject
-    public SmbMmapFsDirectoryService(ShardId shardId, @IndexSettings Settings indexSettings, IndexStore indexStore) {
-        super(shardId, indexSettings, indexStore);
+    public SmbMmapFsDirectoryService(@IndexSettings Settings indexSettings, IndexStore indexStore, ShardPath path) {
+        super(indexSettings, indexStore, path);
     }
 
     @Override

src/main/java/org/elasticsearch/index/store/smbmmapfs/SmbMmapFsIndexStore.java

@@ -21,19 +21,19 @@
 
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.settings.IndexSettings;
+import org.elasticsearch.index.settings.IndexSettingsService;
 import org.elasticsearch.index.store.DirectoryService;
-import org.elasticsearch.index.store.support.AbstractIndexStore;
+import org.elasticsearch.index.store.IndexStore;
 import org.elasticsearch.indices.store.IndicesStore;
 
-public class SmbMmapFsIndexStore extends AbstractIndexStore {
+public class SmbMmapFsIndexStore extends IndexStore {
 
     @Inject
-    public SmbMmapFsIndexStore(Index index, @IndexSettings Settings indexSettings, IndexService indexService, IndicesStore indicesStore, NodeEnvironment nodeEnv) {
-        super(index, indexSettings, indexService, indicesStore, nodeEnv);
+    public SmbMmapFsIndexStore(Index index, @IndexSettings Settings indexSettings,
+                               IndexSettingsService indexSettingsService, IndicesStore indicesStore) {
+        super(index, indexSettings, indexSettingsService, indicesStore);
     }
 
     @Override

src/main/java/org/elasticsearch/index/store/smbsimplefs/SmbSimpleFsDirectoryService.java

@@ -26,18 +26,18 @@
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.settings.IndexSettings;
-import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.index.shard.ShardPath;
+import org.elasticsearch.index.store.FsDirectoryService;
 import org.elasticsearch.index.store.IndexStore;
-import org.elasticsearch.index.store.fs.FsDirectoryService;
 
 import java.io.IOException;
 import java.nio.file.Path;
 
 public class SmbSimpleFsDirectoryService extends FsDirectoryService {
 
     @Inject
-    public SmbSimpleFsDirectoryService(ShardId shardId, @IndexSettings Settings indexSettings, IndexStore indexStore) {
-        super(shardId, indexSettings, indexStore);
+    public SmbSimpleFsDirectoryService(@IndexSettings Settings indexSettings, IndexStore indexStore, ShardPath path) {
+        super(indexSettings, indexStore, path);
     }
 
     @Override

src/main/java/org/elasticsearch/index/store/smbsimplefs/SmbSimpleFsIndexStore.java

@@ -21,19 +21,19 @@
 
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.settings.IndexSettings;
+import org.elasticsearch.index.settings.IndexSettingsService;
 import org.elasticsearch.index.store.DirectoryService;
-import org.elasticsearch.index.store.support.AbstractIndexStore;
+import org.elasticsearch.index.store.IndexStore;
 import org.elasticsearch.indices.store.IndicesStore;
 
-public class SmbSimpleFsIndexStore extends AbstractIndexStore {
+public class SmbSimpleFsIndexStore extends IndexStore {
 
     @Inject
-    public SmbSimpleFsIndexStore(Index index, @IndexSettings Settings indexSettings, IndexService indexService, IndicesStore indicesStore, NodeEnvironment nodeEnv) {
-        super(index, indexSettings, indexService, indicesStore, nodeEnv);
+    public SmbSimpleFsIndexStore(Index index, @IndexSettings Settings indexSettings,
+                                 IndexSettingsService indexSettingsService, IndicesStore indicesStore) {
+        super(index, indexSettings, indexSettingsService, indicesStore);
     }
 
     @Override