diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-23 13:56:54 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-23 14:28:53 +0200 |
commit | fc7f77270eaca41d85d7d2499b5ff10f6afaa68e (patch) | |
tree | ad7bc70e8975ccb5d478a8de2e3d5f1ef8d4f97f /vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java | |
parent | 979a2980aeaf89cc111f9dec74fa46cf191a8d8f (diff) |
Some more cleanup.
Diffstat (limited to 'vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java')
-rwxr-xr-x | vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java index ec2b7202f09..532f10663b9 100755 --- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerBase.java @@ -1,10 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.feedhandler; -import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.jdisc.HttpRequest; -import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; -import com.yahoo.docproc.DocprocService; import com.yahoo.document.DocumentTypeManager; import com.yahoo.feedapi.FeedContext; import com.yahoo.feedapi.MessagePropertyProcessor; @@ -12,22 +9,18 @@ import com.yahoo.feedapi.SharedSender; import com.yahoo.search.query.ParameterParser; -import java.io.IOException; import java.io.InputStream; -import java.util.concurrent.Executor; -import java.util.zip.GZIPInputStream; -public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler { +public abstract class VespaFeedHandlerBase { protected FeedContext context; private final long defaultTimeoutMillis; - VespaFeedHandlerBase(FeedContext context, Executor executor) { - this(context, executor, context.getPropertyProcessor().getDefaultTimeoutMillis()); + VespaFeedHandlerBase(FeedContext context) { + this(context, context.getPropertyProcessor().getDefaultTimeoutMillis()); } - private VespaFeedHandlerBase(FeedContext context, Executor executor, long defaultTimeoutMillis) { - super(executor, context.getMetricAPI()); + private VespaFeedHandlerBase(FeedContext context, long defaultTimeoutMillis) { this.context = context; this.defaultTimeoutMillis = defaultTimeoutMillis; } @@ -36,14 +29,6 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler { return context.getSharedSender(route); } - DocprocService getDocprocChain(HttpRequest request) { - return context.getPropertyProcessor().getDocprocChain(request); - } - - ComponentRegistry<DocprocService> getDocprocServiceRegistry(HttpRequest request) { - return context.getPropertyProcessor().getDocprocServiceRegistry(request); - } - MessagePropertyProcessor getPropertyProcessor() { return context.getPropertyProcessor(); } @@ -55,15 +40,7 @@ public abstract class VespaFeedHandlerBase extends ThreadedHttpRequestHandler { * @throws IllegalArgumentException if GZIP stream creation failed */ InputStream getRequestInputStream(HttpRequest request) { - if ("gzip".equals(request.getHeader("Content-Encoding"))) { - try { - return new GZIPInputStream(request.getData()); - } catch (IOException e) { - throw new IllegalArgumentException("Failed to create GZIP input stream from content", e); - } - } else { - return request.getData(); - } + return request.getData(); } protected DocumentTypeManager getDocumentTypeManager() { |