aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-12 13:02:21 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-12 13:02:21 +0200
commitf50c15ae1e6fbba607977e938c0967394c3abca7 (patch)
treeacf3dca3687a0d676563992e1be7ea0dfccdf24a /vespaclient-container-plugin
parent8b75677b527deffe2b4852418ab498c2bc3e3d95 (diff)
Simplify and correct isFilled
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java3
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
index 61ff84cfdaa..52d999f1a52 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java
@@ -43,7 +43,6 @@ import java.util.zip.GZIPInputStream;
* Accept feeds from outside of the Vespa cluster.
*
* @author Steinar Knutsen
- * @since 5.1
*/
public class FeedHandler extends LoggingRequestHandler {
@@ -131,7 +130,7 @@ public class FeedHandler extends LoggingRequestHandler {
int version;
if (washedClientVersions.contains("3")) {
version = 3;
- } else if (washedClientVersions.contains("2")) {
+ } else if (washedClientVersions.contains("2")) { // TODO: Vespa 7: Remove support for Version 2
version = 2;
} else {
return new Tuple2<>(new ErrorHttpResponse(
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java
index 060cd6ca0a6..874509dd2f8 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeederSettings.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.http.client.core.Headers;
/**
* Wrapper for the feed feederSettings read from HTTP request.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public class FeederSettings {