make condition avaiable be default

elastic · Nov 4, 2017 · c33d4b3 · c33d4b3
1 parent 6fa4abf
commit c33d4b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java
@@ -58,7 +58,9 @@ protected Condition(String name) {
      * Checks if this condition is available in a specific version.
      * This makes sure BWC when introducing a new condition which is not recognized by older versions.
      */
-    abstract boolean includedInVersion(Version version);
+    boolean includedInVersion(Version version) {
+        return true;
+    }
 
     @Override
     public final String toString() {

diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.indices.rollover;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.TimeValue;
@@ -49,11 +48,6 @@ public Result evaluate(final Stats stats) {
         return new Result(this, this.value.getMillis() <= indexAge);
     }
 
-    @Override
-    boolean includedInVersion(Version version) {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;

diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.indices.rollover;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -47,11 +46,6 @@ public Result evaluate(final Stats stats) {
         return new Result(this, this.value <= stats.numDocs);
     }
 
-    @Override
-    boolean includedInVersion(Version version) {
-        return true;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;