diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 15:26:12 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 15:53:53 +0100 |
commit | 9ec1c0b9585e2c845d47c396f72229aad23abac7 (patch) | |
tree | b45cf2fc11cdc7bfc34c77d96f9e73b187679015 /container-core | |
parent | 48b902d4852bc63db8ec835a9dfccc2b1f8f89ec (diff) |
Upgrade apache 5.1 => 5.2 and add deprecation suppressions.
Diffstat (limited to 'container-core')
5 files changed, 26 insertions, 51 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java index b3a2205cc0a..4a74d841ce2 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java @@ -61,6 +61,7 @@ public class MetricsV2Handler extends HttpHandlerBase { } } + @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { return VespaHttpClientBuilder.create() .setUserAgent("application-metrics-retriever") diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java index 3333b3e3090..f830a55e940 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java @@ -62,6 +62,7 @@ public class PrometheusV1Handler extends HttpHandlerBase { } } + @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { return VespaHttpClientBuilder.create() .setUserAgent("application-prometheus-receiver") diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index f4db1c5085a..f7aea8abbd1 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -52,7 +52,7 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext private final Executor renderingExecutor; - private ChainRegistry<COMPONENT> chainRegistry; + private final ChainRegistry<COMPONENT> chainRegistry; private final ComponentRegistry<Renderer> renderers; @@ -109,7 +109,6 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext } @Override - @SuppressWarnings("unchecked") public HttpResponse handle(HttpRequest request, ContentChannel channel) { com.yahoo.processing.Request processingRequest = new com.yahoo.processing.Request(); populate("", request.propertyMap(), processingRequest.properties()); diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java index 298f0feb9e6..23f89962752 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java @@ -158,6 +158,7 @@ public class SimpleHttpClient implements AutoCloseable { return this; } + @SuppressWarnings("deprecation") public ResponseValidator execute() throws IOException { if (entity != null) { request.setEntity(entity); @@ -189,18 +190,16 @@ public class SimpleHttpClient implements AutoCloseable { return this; } - public ResponseValidator expectHeader(String headerName, Matcher<String> matcher) { + public void expectHeader(String headerName, Matcher<String> matcher) { Header firstHeader = response.getFirstHeader(headerName); String headerValue = firstHeader != null ? firstHeader.getValue() : null; assertThat(headerValue, matcher); assertNotNull(firstHeader); - return this; } - public ResponseValidator expectNoHeader(String headerName) { + public void expectNoHeader(String headerName) { Header firstHeader = response.getFirstHeader(headerName); assertThat(firstHeader, is(nullValue())); - return this; } public ResponseValidator expectContent(final Matcher<String> matcher) { diff --git a/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java b/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java index ee8dbd8dccb..5f5b7171923 100644 --- a/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java +++ b/container-core/src/test/java/com/yahoo/processing/test/ProcessorLibrary.java @@ -10,9 +10,18 @@ import com.yahoo.processing.execution.Execution; import com.yahoo.processing.execution.ExecutionWithResponse; import com.yahoo.processing.execution.RunnableExecution; import com.yahoo.processing.request.ErrorMessage; -import com.yahoo.processing.response.*; - -import java.util.*; +import com.yahoo.processing.response.AbstractData; +import com.yahoo.processing.response.ArrayDataList; +import com.yahoo.processing.response.Data; +import com.yahoo.processing.response.DataList; +import com.yahoo.processing.response.FutureResponse; +import com.yahoo.processing.response.IncomingData; +import com.yahoo.processing.response.Ordered; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -50,7 +59,7 @@ public class ProcessorLibrary { public static class MapData extends AbstractData { - private Map map = new LinkedHashMap(); + private final Map map = new LinkedHashMap(); public MapData(Request request) { super(request); @@ -157,7 +166,7 @@ public class ProcessorLibrary { @SafeVarargs @SuppressWarnings("varargs") public Federator(boolean ordered, Chain<? extends Processor>... chains) { - this.chains = Arrays.asList(chains); + this.chains = List.of(chains); this.ordered = ordered; } @@ -206,7 +215,7 @@ public class ProcessorLibrary { @SafeVarargs @SuppressWarnings("varargs") public EagerReturnFederator(boolean ordered, Chain<? extends Processor>... chains) { - this.chains = Arrays.asList(chains); + this.chains = List.of(chains); this.ordered = ordered; } @@ -312,21 +321,6 @@ public class ProcessorLibrary { } - /** Allows waiting for that request to happen. */ - public static class RequestCounter extends Processor { - - /** The incoming data this has created */ - public final CompletableFuture<IncomingData> incomingData = new CompletableFuture<>(); - - @Override - public Response process(Request request, Execution execution) { - ArrayDataList dataList = ArrayDataList.createAsync(request); - incomingData.complete(dataList.incoming()); - return new Response(dataList); - } - - } - /** * Multiples the amount of data returned by parallelism by performing parallel executions of the rest of the chain */ @@ -413,30 +407,11 @@ public class ProcessorLibrary { } /** - * A processor which on invocation prints the string given on construction - */ - public static class Echo extends Processor { - - private String s; - - public Echo(String s) { - this.s = s; - } - - @Override - public Response process(Request request, Execution execution) { - System.out.println(s); - return execution.process(request); - } - - } - - /** * A processor which adds a StringData item containing the string given in the constructor to every response */ public static class StringDataAdder extends Processor { - private String string; + private final String string; public StringDataAdder(String string) { this.string = string; @@ -458,7 +433,7 @@ public class ProcessorLibrary { */ public static class ErrorAdder extends Processor { - private ErrorMessage errorMessage; + private final ErrorMessage errorMessage; public ErrorAdder(ErrorMessage errorMessage) { this.errorMessage = errorMessage; @@ -478,7 +453,7 @@ public class ProcessorLibrary { */ public static class StringDataListAdder extends Processor { - private String[] strings; + private final String[] strings; public StringDataListAdder(String... strings) { this.strings = strings; @@ -502,8 +477,8 @@ public class ProcessorLibrary { */ public static class Trace extends Processor { - private String traceMessage; - private int traceLevel; + private final String traceMessage; + private final int traceLevel; public Trace(String traceMessage, int traceLevel) { this.traceMessage = traceMessage; |