From 0c55dc92a3bf889c67fac1ca855e6e33e1994904 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Oct 2023 09:44:29 +0200 Subject: Update copyright --- http-utils/README.md | 2 +- http-utils/pom.xml | 2 +- .../src/main/java/ai/vespa/util/http/AcceptAllHostnamesVerifier.java | 2 +- .../main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java | 2 +- .../src/main/java/ai/vespa/util/http/hc4/VespaHttpClientBuilder.java | 2 +- .../src/main/java/ai/vespa/util/http/hc4/retry/DelaySupplier.java | 2 +- .../vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java | 2 +- .../vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandler.java | 2 +- .../src/main/java/ai/vespa/util/http/hc4/retry/RetryConsumer.java | 2 +- .../main/java/ai/vespa/util/http/hc4/retry/RetryFailedConsumer.java | 2 +- .../src/main/java/ai/vespa/util/http/hc4/retry/RetryPredicate.java | 2 +- http-utils/src/main/java/ai/vespa/util/http/hc4/retry/Sleeper.java | 2 +- .../main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java | 1 + .../src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java | 2 +- .../main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java | 2 +- .../main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java | 2 +- .../src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java | 2 +- .../test/java/ai/vespa/util/http/hc4/VespaHttpClientBuilderTest.java | 4 ++-- .../util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java | 4 ++-- .../util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java | 2 +- .../test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java | 2 +- 21 files changed, 23 insertions(+), 22 deletions(-) (limited to 'http-utils') diff --git a/http-utils/README.md b/http-utils/README.md index 6d56ec7aa03..1002ffea60d 100644 --- a/http-utils/README.md +++ b/http-utils/README.md @@ -1,4 +1,4 @@ - + # Http utilities for Java NOTE: This must be built with JDK 8 because it's used by clients/utilities where JDK8 is still supported. diff --git a/http-utils/pom.xml b/http-utils/pom.xml index 6cb6cd018c8..5dc4947d32b 100644 --- a/http-utils/pom.xml +++ b/http-utils/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/http-utils/src/main/java/ai/vespa/util/http/AcceptAllHostnamesVerifier.java b/http-utils/src/main/java/ai/vespa/util/http/AcceptAllHostnamesVerifier.java index 77d718bccb3..dfd23731bea 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/AcceptAllHostnamesVerifier.java +++ b/http-utils/src/main/java/ai/vespa/util/http/AcceptAllHostnamesVerifier.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http; import javax.net.ssl.HostnameVerifier; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java index 16449a72524..91c5f6ec8f8 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4; import ai.vespa.util.http.AcceptAllHostnamesVerifier; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/VespaHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/VespaHttpClientBuilder.java index af01b123a27..733ccdce721 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/VespaHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/VespaHttpClientBuilder.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4; import com.yahoo.security.tls.MixedMode; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelaySupplier.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelaySupplier.java index 4920aa011f6..edf7a4d2093 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelaySupplier.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelaySupplier.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import java.time.Duration; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java index 84afc433be2..8e92dc5e13c 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandler.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.annotation.Contract; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandler.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandler.java index c7cd7575f96..b7d7aa5ca72 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandler.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandler.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.HttpResponse; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryConsumer.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryConsumer.java index a7c8464b9e9..610bfe7d41a 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryConsumer.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryConsumer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.client.protocol.HttpClientContext; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryFailedConsumer.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryFailedConsumer.java index ee173fdb90b..4d90829cf1e 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryFailedConsumer.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryFailedConsumer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.client.protocol.HttpClientContext; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryPredicate.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryPredicate.java index d912355986b..5737ef26384 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryPredicate.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/RetryPredicate.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.client.protocol.HttpClientContext; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/Sleeper.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/Sleeper.java index 0ca56746d4e..b26a7582275 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/Sleeper.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/retry/Sleeper.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import java.time.Duration; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java index 8575bc16ee8..e506daefa2a 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java @@ -1,3 +1,4 @@ +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java index 0c140ce236e..6ad0fc0e7e8 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlanner.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.HttpRoute; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java index 7ba408c260b..563d3e2a1c9 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import ai.vespa.util.http.AcceptAllHostnamesVerifier; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java index 91810b50778..8078ffdec96 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import com.yahoo.security.tls.MixedMode; diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java index c5ebafb2425..edd10f9297a 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.config.ConnectionConfig; diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc4/VespaHttpClientBuilderTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc4/VespaHttpClientBuilderTest.java index 27819ff0117..7df1ffaf9cf 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc4/VespaHttpClientBuilderTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc4/VespaHttpClientBuilderTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4; import org.apache.http.HttpException; @@ -39,4 +39,4 @@ public class VespaHttpClientBuilderTest { assertEquals(expectedHostString, target.toURI()); } -} \ No newline at end of file +} diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java index 0b83227d538..c843b77e359 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedConnectionLevelRetryHandlerTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.client.protocol.HttpClientContext; @@ -131,4 +131,4 @@ public class DelayedConnectionLevelRetryHandlerTest { assertFalse(handler.retryRequest(ioException, 1, ctx)); } -} \ No newline at end of file +} diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java index 374dee63019..b7d15f3cd12 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc4/retry/DelayedResponseLevelRetryHandlerTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc4.retry; import org.apache.http.HttpResponse; diff --git a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java index 9f56f7ebc09..fe0cb86dfcf 100644 --- a/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java +++ b/http-utils/src/test/java/ai/vespa/util/http/hc5/HttpToHttpsRoutePlannerTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.util.http.hc5; import org.apache.hc.client5.http.HttpRoute; -- cgit v1.2.3