From bc544e2d1bf15faba1400eff0d7ba24258f62399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Wed, 23 Aug 2017 12:05:52 +0200
Subject: [PATCH] Adapt branch to changes on master

---
 .../java/org/elasticsearch/index/rankeval/DocumentKey.java    | 4 ++--
 .../java/org/elasticsearch/index/rankeval/RankEvalSpec.java   | 4 ++--
 .../java/org/elasticsearch/index/rankeval/RatedDocument.java  | 4 ++--
 .../java/org/elasticsearch/index/rankeval/RatedRequest.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DocumentKey.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DocumentKey.java
index 44b0aa21359..bb032871e48 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DocumentKey.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DocumentKey.java
@@ -19,17 +19,17 @@
 
 package org.elasticsearch.index.rankeval;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class DocumentKey extends ToXContentToBytes implements Writeable {
+public class DocumentKey implements Writeable, ToXContentObject {
 
     private String docId;
     private String type;
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java
index 5c7a713f23b..a9f8bed08a0 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.index.rankeval;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.script.Script;
@@ -47,7 +47,7 @@ import java.util.Objects;
  * search queries.
  */
 
-public class RankEvalSpec extends ToXContentToBytes implements Writeable {
+public class RankEvalSpec implements Writeable, ToXContentObject {
     /**
      * Collection of query specifications, that is e.g. search request templates
      * to use for query translation.
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedDocument.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedDocument.java
index 0102de14436..5b1d24ff3d7 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedDocument.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedDocument.java
@@ -19,12 +19,12 @@
 
 package org.elasticsearch.index.rankeval;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 
@@ -34,7 +34,7 @@ import java.util.Objects;
 /**
  * A document ID and its rating for the query QA use case.
  * */
-public class RatedDocument extends ToXContentToBytes implements Writeable {
+public class RatedDocument implements Writeable, ToXContentObject {
 
     public static final ParseField RATING_FIELD = new ParseField("rating");
     public static final ParseField DOC_ID_FIELD = new ParseField("_id");
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java
index 6d8bfd6485e..85350c1dc04 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.index.rankeval;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -50,7 +50,7 @@ import java.util.Set;
  * in the set of rated documents as part of a QAQuery.
  */
 @SuppressWarnings("unchecked")
-public class RatedRequest extends ToXContentToBytes implements Writeable {
+public class RatedRequest implements Writeable, ToXContentObject {
     private String id;
     private List<String> indices = new ArrayList<>();
     private List<String> types = new ArrayList<>();