From 4169b0044196aa1bb0e89f084a9c9804598a2fd5 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Mon, 18 Apr 2016 21:00:47 -0400
Subject: [PATCH] Remove (read|write)PhraseSuggestionSmoothingModel

---
 .../elasticsearch/common/io/stream/StreamInput.java    |  9 ---------
 .../elasticsearch/common/io/stream/StreamOutput.java   |  9 ---------
 .../search/suggest/phrase/PhraseSuggestionBuilder.java | 10 ++--------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
index fb26023cbce..f60f87f7c90 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
@@ -759,15 +759,6 @@ public abstract class StreamInput extends InputStream {
         return readNamedWriteable(ScoreFunctionBuilder.class);
     }
 
-    /**
-     * Reads a {@link SmoothingModel} from the current stream
-     * @deprecated prefer {@link #readNamedWriteable(Class)} passing {@link SmoothingModel}.
-     */
-    @Deprecated
-    public SmoothingModel readPhraseSuggestionSmoothingModel() throws IOException {
-        return readNamedWriteable(SmoothingModel.class);
-    }
-
     /**
      * Reads a list of objects
      */
diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
index ba2fffbce4f..468a47b83ab 100644
--- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
+++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
@@ -714,15 +714,6 @@ public abstract class StreamOutput extends OutputStream {
         writeNamedWriteable(scoreFunctionBuilder);
     }
 
-    /**
-     * Writes the given {@link SmoothingModel} to the stream
-     * @deprecated prefer {@link #writeNamedWriteable(NamedWriteable)}
-     */
-    @Deprecated
-    public void writePhraseSuggestionSmoothingModel(SmoothingModel smoothinModel) throws IOException {
-        writeNamedWriteable(smoothinModel);
-    }
-
     /**
      * Writes the given {@link GeoPoint} to the stream
      */
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
index 177e2b7d518..2d625e3e5de 100644
--- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
@@ -128,9 +128,7 @@ public class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSuggestionB
         realWordErrorLikelihood = in.readFloat();
         confidence = in.readFloat();
         gramSize = in.readOptionalVInt();
-        if (in.readBoolean()) {
-            model = in.readPhraseSuggestionSmoothingModel();
-        }
+        model = in.readOptionalNamedWriteable(SmoothingModel.class);
         forceUnigrams = in.readBoolean();
         tokenLimit = in.readVInt();
         preTag = in.readOptionalString();
@@ -160,11 +158,7 @@ public class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSuggestionB
         out.writeFloat(realWordErrorLikelihood);
         out.writeFloat(confidence);
         out.writeOptionalVInt(gramSize);
-        boolean hasModel = model != null;
-        out.writeBoolean(hasModel);
-        if (hasModel) {
-            out.writePhraseSuggestionSmoothingModel(model);
-        }
+        out.writeOptionalNamedWriteable(model);
         out.writeBoolean(forceUnigrams);
         out.writeVInt(tokenLimit);
         out.writeOptionalString(preTag);