diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-12-01 19:22:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 19:22:13 +0100 |
commit | eb8cd5f40955ea584ad2bb90aea8d518436608d5 (patch) | |
tree | 28a2a9d6d7d20e220a2c5aeac4f6dc3062093d18 /jdisc_http_service | |
parent | 655706c9d4e25871a42e7920dfee92250414ebf6 (diff) | |
parent | 26429fb170a455760a20e2a9b8a20371c4962f54 (diff) |
Merge pull request #15574 from vespa-engine/bjorncs/cluster-controller-reindexing-status
Bjorncs/cluster controller reindexing status
Diffstat (limited to 'jdisc_http_service')
4 files changed, 8 insertions, 32 deletions
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 7333db96b91..094ca7baa25 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -78,6 +78,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>yolean</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> <!-- TEST SCOPE --> <dependency> diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/Exceptions.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/Exceptions.java deleted file mode 100644 index 0806f352ae9..00000000000 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/Exceptions.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.http.server.jetty; - -/** - * Utility methods for exceptions - * - * @author Tony Vaagenes - */ -public class Exceptions { - - /** - * Allows treating checked exceptions as unchecked. - * Usage: - * throw throwUnchecked(e); - * The reason for the return type is to allow writing throw at the call site - * instead of just calling throwUnchecked. Just calling throwUnchecked - * means that the java compiler won't know that the statement will throw an exception, - * and will therefore complain on things such e.g. missing return value. - */ - public static RuntimeException throwUnchecked(Throwable e) { - throwUncheckedImpl(e); - return null; - } - - @SuppressWarnings("unchecked") - private static <T extends Throwable> void throwUncheckedImpl(Throwable t) throws T { - throw (T)t; - } - -} diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java index 940009e7520..84c47f5a342 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java @@ -35,8 +35,8 @@ import java.util.logging.Logger; import static com.yahoo.jdisc.http.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URLENCODED; import static com.yahoo.jdisc.http.core.HttpServletRequestUtils.getConnection; -import static com.yahoo.jdisc.http.server.jetty.Exceptions.throwUnchecked; import static com.yahoo.jdisc.http.server.jetty.JDiscHttpServlet.getConnector; +import static com.yahoo.yolean.Exceptions.throwUnchecked; /** * @author Simon Thoresen Hult diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java index e4dbccf1bcb..a89c115a1c2 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import static com.yahoo.jdisc.http.server.jetty.Exceptions.throwUnchecked; import static com.yahoo.jdisc.http.server.jetty.JDiscHttpServlet.getConnector; +import static com.yahoo.yolean.Exceptions.throwUnchecked; /** * Runs JDisc security filters for Servlets |