From bbb84555acd2911de0fc94f56cd696ee222c3e91 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Wed, 15 Dec 2021 11:43:23 +0100
Subject: Deprecate vespa-http-client

---
 .../hadoop/mapreduce/LegacyVespaRecordWriter.java     | 19 +++++++++----------
 .../vespa/hadoop/mapreduce/VespaOutputFormat.java     |  1 +
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'vespa-hadoop')

diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java
index 19e98e8373d..89e48a16909 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java
@@ -8,9 +8,6 @@ import com.fasterxml.jackson.core.JsonToken;
 import com.yahoo.vespa.hadoop.mapreduce.util.VespaConfiguration;
 import com.yahoo.vespa.hadoop.mapreduce.util.VespaCounters;
 import com.yahoo.vespa.hadoop.pig.VespaDocumentOperation;
-import com.yahoo.vespa.http.client.FeedClient;
-import com.yahoo.vespa.http.client.FeedClientFactory;
-import com.yahoo.vespa.http.client.Result;
 import com.yahoo.vespa.http.client.config.Cluster;
 import com.yahoo.vespa.http.client.config.ConnectionParams;
 import com.yahoo.vespa.http.client.config.Endpoint;
@@ -39,14 +36,16 @@ import java.util.logging.Logger;
  * {@link LegacyVespaRecordWriter} sends the output &lt;key, value&gt; to one or more Vespa endpoints using vespa-http-client.
  *
  * @author lesters
+ * @deprecated Replaced by {@link VespaRecordWriter}
  */
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"rawtypes", "deprecation"})
+@Deprecated
 public class LegacyVespaRecordWriter extends RecordWriter {
 
     private final static Logger log = Logger.getLogger(LegacyVespaRecordWriter.class.getCanonicalName());
 
     private boolean initialized = false;
-    private FeedClient feedClient;
+    private com.yahoo.vespa.http.client.FeedClient feedClient;
     private final VespaCounters counters;
     private final int progressInterval;
 
@@ -154,7 +153,7 @@ public class LegacyVespaRecordWriter extends RecordWriter {
         }
 
         ResultCallback resultCallback = new ResultCallback(counters);
-        feedClient = FeedClientFactory.create(sessionParams.build(), resultCallback);
+        feedClient = com.yahoo.vespa.http.client.FeedClientFactory.create(sessionParams.build(), resultCallback);
 
         initialized = true;
         log.info("VespaStorage configuration:\n" + configuration.toString());
@@ -204,7 +203,7 @@ public class LegacyVespaRecordWriter extends RecordWriter {
     }
 
 
-    static class ResultCallback implements FeedClient.ResultCallback {
+    static class ResultCallback implements com.yahoo.vespa.http.client.FeedClient.ResultCallback {
         final VespaCounters counters;
 
         public ResultCallback(VespaCounters counters) {
@@ -212,15 +211,15 @@ public class LegacyVespaRecordWriter extends RecordWriter {
         }
 
         @Override
-        public void onCompletion(String docId, Result documentResult) {
+        public void onCompletion(String docId, com.yahoo.vespa.http.client.Result documentResult) {
             if (!documentResult.isSuccess()) {
                 counters.incrementDocumentsFailed(1);
                 StringBuilder sb = new StringBuilder();
                 sb.append("Problems with docid ");
                 sb.append(docId);
                 sb.append(": ");
-                List<Result.Detail> details = documentResult.getDetails();
-                for (Result.Detail detail : details) {
+                List<com.yahoo.vespa.http.client.Result.Detail> details = documentResult.getDetails();
+                for (com.yahoo.vespa.http.client.Result.Detail detail : details) {
                     sb.append(detail.toString());
                     sb.append(" ");
                 }
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
index 9dd21aee557..00ce396fd09 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
@@ -32,6 +32,7 @@ public class VespaOutputFormat extends OutputFormat {
 
 
     @Override
+    @SuppressWarnings("deprecation")
     public RecordWriter getRecordWriter(TaskAttemptContext context) throws IOException, InterruptedException {
         VespaCounters counters = VespaCounters.get(context);
         VespaConfiguration configuration = VespaConfiguration.get(context.getConfiguration(), configOverride);
-- 
cgit v1.2.3