From 0cd340dc4646b397d84cfab38a8337bc7bdcaa4f Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 3 Dec 2021 13:54:35 +0100 Subject: Add custom `@Beta` annotation Replace use of Guava's `com.google.common.annotations.Beta` with custom annotation. --- container-core/src/main/java/com/yahoo/container/handler/Coverage.java | 2 +- .../src/main/java/com/yahoo/container/handler/test/MockService.java | 2 +- .../main/java/com/yahoo/container/handler/test/MockServiceHandler.java | 2 +- .../main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java | 2 +- container-core/src/main/java/com/yahoo/metrics/simple/Counter.java | 2 +- container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java | 2 +- .../src/main/java/com/yahoo/metrics/simple/MetricReceiver.java | 2 +- .../src/main/java/com/yahoo/metrics/simple/MetricSettings.java | 2 +- container-core/src/main/java/com/yahoo/metrics/simple/Point.java | 2 +- container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java | 2 +- .../main/java/com/yahoo/processing/handler/ProcessingTestDriver.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java index ef088a1685a..00c3a1d1aae 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java @@ -2,7 +2,7 @@ package com.yahoo.container.handler; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; /** * The coverage report for a result set. diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java index 8f24e2e64a2..b8175802ff7 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java +++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler.test; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java index c417eb6516e..a06422a1bf4 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler.test; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.container.jdisc.HttpRequest; /** diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java index de877bc413d..04780c81be4 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.application.ContainerBuilder; diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java b/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java index d726486c195..a119902aac7 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Counter.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics.simple; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.metrics.simple.UntypedMetric.AssumedType; /** diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java b/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java index ab250526bd5..684bf4b5db1 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Gauge.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics.simple; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.metrics.simple.UntypedMetric.AssumedType; /** diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java b/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java index 94be443d9bb..c2ef8afd279 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.google.common.collect.ImmutableMap; import com.yahoo.concurrent.ThreadLocalDirectory; diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/MetricSettings.java b/container-core/src/main/java/com/yahoo/metrics/simple/MetricSettings.java index 39403703e71..5f4b66275a9 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/MetricSettings.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/MetricSettings.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.metrics.simple; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; /** * All information needed for creating any extra data structures associated with diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Point.java b/container-core/src/main/java/com/yahoo/metrics/simple/Point.java index af0a1207072..f9ea3849ddc 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Point.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Point.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.google.common.collect.ImmutableList; import com.yahoo.collections.Tuple2; import com.yahoo.jdisc.Metric.Context; diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java b/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java index 9ca1198e8ea..47061eba10b 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/PointBuilder.java @@ -4,7 +4,7 @@ package com.yahoo.metrics.simple; import java.util.ArrayList; import java.util.Collections; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; /** * Single-use builder for the immutable Point instances used to set dimensions diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java index 12a226dd50e..99675e3fef5 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.handler; -import com.google.common.annotations.Beta; +import com.yahoo.api.annotations.Beta; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.component.provider.ComponentRegistry; -- cgit v1.2.3