Remove maybe

jasontedor · Oct 6, 2017 · 0ba19c6 · 0ba19c6
1 parent 8f8b384
commit 0ba19c6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -476,7 +476,7 @@ private EngineFactory getEngineFactory(final IndexSettings idxSettings) {
         final List<Tuple<EnginePlugin, Optional<EngineFactory>>> engineFactories =
                 enginePlugins
                         .stream()
-                        .map(p -> Tuple.tuple(p, p.getMaybeEngineFactory(idxSettings)))
+                        .map(p -> Tuple.tuple(p, p.getEngineFactory(idxSettings)))
                         .filter(t -> Objects.requireNonNull(t.v2()).isPresent())
                         .collect(Collectors.toList());
         if (engineFactories.isEmpty()) {

diff --git a/core/src/main/java/org/elasticsearch/plugins/EnginePlugin.java b/core/src/main/java/org/elasticsearch/plugins/EnginePlugin.java
@@ -37,6 +37,6 @@ public interface EnginePlugin {
      *
      * @return an optional engine factory
      */
-    Optional<EngineFactory> getMaybeEngineFactory(IndexSettings indexSettings);
+    Optional<EngineFactory> getEngineFactory(IndexSettings indexSettings);
 
 }
diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java
@@ -126,7 +126,7 @@ public List<Setting<?>> getSettings() {
         }
 
         @Override
-        public Optional<EngineFactory> getMaybeEngineFactory(final IndexSettings indexSettings) {
+        public Optional<EngineFactory> getEngineFactory(final IndexSettings indexSettings) {
             if (FOO_INDEX_SETTING.get(indexSettings.getSettings())) {
                 return Optional.of(new FooEngineFactory());
             } else {
@@ -156,7 +156,7 @@ public List<Setting<?>> getSettings() {
         }
 
         @Override
-        public Optional<EngineFactory> getMaybeEngineFactory(final IndexSettings indexSettings) {
+        public Optional<EngineFactory> getEngineFactory(final IndexSettings indexSettings) {
             if (BAR_INDEX_SETTING.get(indexSettings.getSettings())) {
                 return Optional.of(new BarEngineFactory());
             } else {

diff --git a/test/framework/src/main/java/org/elasticsearch/index/MockEngineFactoryPlugin.java b/test/framework/src/main/java/org/elasticsearch/index/MockEngineFactoryPlugin.java
@@ -44,7 +44,7 @@ public List<Setting<?>> getSettings() {
     }
 
     @Override
-    public Optional<EngineFactory> getMaybeEngineFactory(final IndexSettings indexSettings) {
+    public Optional<EngineFactory> getEngineFactory(final IndexSettings indexSettings) {
         return Optional.of(new MockEngineFactory(getReaderWrapperClass()));
     }