Remove support for vespa http client protocol v2. Always use protocol v3.

2 files changed, 0 insertions, 8 deletions

diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
index 600658067cb..e5810c4e7b2 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
@@ -100,7 +100,6 @@ public class VespaRecordWriter extends RecordWriter {
         ConnectionParams.Builder connParamsBuilder = new ConnectionParams.Builder();
         connParamsBuilder.setDryRun(configuration.dryrun());
         connParamsBuilder.setUseCompression(configuration.useCompression());
-        connParamsBuilder.setEnableV3Protocol(configuration.useV3Protocol());
         connParamsBuilder.setNumPersistentConnectionsPerEndpoint(configuration.numConnections());
         connParamsBuilder.setMaxRetries(configuration.numRetries());
         if (configuration.proxyHost() != null) {
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
index 99928fd80fb..2a1179dbec6 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
@@ -19,7 +19,6 @@ public class VespaConfiguration {
     public static final String USE_COMPRESSION = "vespa.feed.usecompression";
     public static final String DATA_FORMAT = "vespa.feed.data.format";
     public static final String PROGRESS_REPORT = "vespa.feed.progress.interval";
-    public static final String V3_PROTOCOL = "vespa.feed.v3.protocol";
     public static final String CONNECTIONS = "vespa.feed.connections";
     public static final String THROTTLER_MIN_SIZE = "vespa.feed.throttler.min.size";
     public static final String QUERY_CONNECTION_TIMEOUT = "vespa.query.connection.timeout";
@@ -78,11 +77,6 @@ public class VespaConfiguration {
     }
 
 
-    public boolean useV3Protocol() {
-        return getBoolean(V3_PROTOCOL, true);
-    }
-
-
     public int numConnections() {
         return getInt(CONNECTIONS, 1);
     }
@@ -187,7 +181,6 @@ public class VespaConfiguration {
         sb.append(USE_COMPRESSION + ": " +  useCompression() +"\n");
         sb.append(DATA_FORMAT + ": " +  dataFormat() +"\n");
         sb.append(PROGRESS_REPORT + ": " +  progressInterval() +"\n");
-        sb.append(V3_PROTOCOL + ": " +  useV3Protocol() +"\n");
         sb.append(CONNECTIONS + ": " +  numConnections() +"\n");
         sb.append(THROTTLER_MIN_SIZE + ": " +  throttlerMinSize() +"\n");
         sb.append(QUERY_CONNECTION_TIMEOUT + ": " +  queryConnectionTimeout() +"\n");