From b973d1068542177769a7f0647d1ecaef88a191fc Mon Sep 17 00:00:00 2001
From: Daniel Mitterdorfer <daniel@mitterdorfer.name>
Date: Wed, 21 Dec 2016 16:43:55 +0100
Subject: [PATCH] Improve BWC

Original commit: elastic/x-pack-elasticsearch@f84cb5b1fabfc8405966d9c80823d517a811cd7f
---
 .../support/xcontent/WatcherXContentParser.java      | 12 ++++++++++++
 ...ldXPackIndicesBackwardsCompatibilityTestCase.java |  2 --
 .../authc/esnative/ESNativeMigrateToolTests.java     |  4 ----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java
index 00a20c262e8..b8c7cae702b 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/xcontent/WatcherXContentParser.java
@@ -250,6 +250,18 @@ public class WatcherXContentParser implements XContentParser {
         return parser.booleanValue();
     }
 
+    @Override
+    @SuppressWarnings("deprecated")
+    public boolean isBooleanValueLenient() throws IOException {
+        return parser.isBooleanValueLenient();
+    }
+
+    @Override
+    @SuppressWarnings("deprecated")
+    public boolean booleanValueLenient() throws IOException {
+        return parser.booleanValueLenient();
+    }
+
     @Override
     public byte[] binaryValue() throws IOException {
         return parser.binaryValue();
diff --git a/elasticsearch/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java b/elasticsearch/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java
index 4bc13fd5aa7..33405a4c1ea 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/AbstractOldXPackIndicesBackwardsCompatibilityTestCase.java
@@ -116,8 +116,6 @@ public abstract class AbstractOldXPackIndicesBackwardsCompatibilityTestCase exte
         }
     }
 
-    //TODO dm: fix me
-    @AwaitsFix(bugUrl = "We need to fix BWC first")
     public void testOldIndexes() throws Exception {
         Collections.shuffle(dataFiles, random());
         for (String dataFile : dataFiles) {
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java
index 5344b4d7b39..a06db65a590 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/esnative/ESNativeMigrateToolTests.java
@@ -58,8 +58,6 @@ public class ESNativeMigrateToolTests extends NativeRealmIntegTestCase {
         return internalCluster().getInstances(Environment.class).iterator().next();
     }
 
-    //TODO dm: fix me
-    @AwaitsFix(bugUrl = "We need to fix BWC first")
     public void testRetrieveUsers() throws Exception {
         final Environment nodeEnvironment = nodeEnvironment();
         String home = Environment.PATH_HOME_SETTING.get(nodeEnvironment.settings());
@@ -100,8 +98,6 @@ public class ESNativeMigrateToolTests extends NativeRealmIntegTestCase {
         }
     }
 
-    //TODO dm: fix me
-    @AwaitsFix(bugUrl = "We need to fix BWC first")
     public void testRetrieveRoles() throws Exception {
         final Environment nodeEnvironment = nodeEnvironment();
         String home = Environment.PATH_HOME_SETTING.get(nodeEnvironment.settings());