From adcb1d4d55e71d78c662f798b033d3abea0d4b9e Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 31 Aug 2022 22:50:14 +0200 Subject: Add 'model' config type --- .../com/yahoo/vespa/config/server/http/SessionContentListResponse.java | 1 - .../main/java/com/yahoo/vespa/config/server/http/SessionHandler.java | 2 +- .../com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java index b8d998a5b3d..0a9d6e36767 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentListResponse.java @@ -11,7 +11,6 @@ import java.util.List; * Represents a request for listing files within an application package. * * @author Ulf Lilleengen - * @since 5.1 */ class SessionContentListResponse extends SlimeJsonResponse { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java index d0c4f43359a..d63dc714b9d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java @@ -29,7 +29,7 @@ public class SessionHandler extends HttpHandler { * Set to make sure that timeout for the handler is higher than any timeouts used inside the handler (e.g. zookeeper barrier timeout) * Setting this too low will lead to a response with status code 504 and empty response body. */ - @Override + @Override public Duration getTimeout() { return Duration.ofSeconds(applicationRepository.configserverConfig().zookeeper().barrierTimeout()).plus(Duration.ofSeconds(30)); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java index 95196abf16d..4656834d033 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandler.java @@ -25,8 +25,7 @@ public class SessionContentHandler extends SessionHandler { private final ContentHandler contentHandler = new ContentHandler(); @Inject - public SessionContentHandler(Context ctx, - ApplicationRepository applicationRepository) { + public SessionContentHandler(Context ctx, ApplicationRepository applicationRepository) { super(ctx, applicationRepository); } -- cgit v1.2.3