From 00fb01a08f8accd9ce0fea7e51c18fbbc0ac8d76 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Fri, 19 May 2017 13:04:20 -0400 Subject: [PATCH] [breaking] Cleanup API interfaces Move following classes from com.palantir.tritium.event to com.palantir.tritium.api.event * InstrumentationFilter * InvocationContext * InvocationEventHandler --- .../tritium/{ => api}/event/InstrumentationFilter.java | 2 +- .../palantir/tritium/{ => api}/event/InvocationContext.java | 4 ++-- .../tritium/{ => api}/event/InvocationEventHandler.java | 4 ++-- .../com/palantir/tritium/{ => api}/event/package-info.java | 4 ++-- .../brave/BraveLocalTracingInvocationEventHandler.java | 2 +- .../brave/BraveLocalTracingInvocationEventHandlerTest.java | 2 +- .../tritium/event/AbstractInvocationEventHandler.java | 2 ++ .../tritium/event/CompositeInvocationEventHandler.java | 2 ++ .../palantir/tritium/event/DefaultInvocationContext.java | 1 + .../com/palantir/tritium/event/InstrumentationFilters.java | 1 + .../palantir/tritium/event/NoOpInvocationEventHandler.java | 2 ++ .../tritium/event/CompositeInvocationEventHandlerTest.java | 2 ++ .../tritium/event/DefaultInvocationContextTest.java | 1 + .../palantir/tritium/event/InstrumentationFiltersTest.java | 1 + .../tritium/event/ThrowingInvocationEventHandler.java | 2 ++ .../java/com/palantir/tritium/proxy/Instrumentation.java | 6 +++--- .../com/palantir/tritium/proxy/InstrumentationProxy.java | 6 +++--- .../com/palantir/tritium/proxy/InvocationEventProxy.java | 6 +++--- .../com/palantir/tritium/proxy/InstrumentationTest.java | 6 +++--- .../palantir/tritium/proxy/InvocationEventProxyTest.java | 4 ++-- .../event/metrics/MetricsInvocationEventHandler.java | 5 +++-- .../event/metrics/MetricsInvocationEventHandlerTest.java | 2 +- .../tritium/event/log/LoggingInvocationEventHandler.java | 5 +++-- .../event/log/LoggingInvocationEventHandlerTest.java | 2 +- .../tritium/tracing/TracingInvocationEventHandler.java | 2 +- .../tritium/tracing/TracingInvocationEventHandlerTest.java | 2 +- 26 files changed, 47 insertions(+), 31 deletions(-) rename tritium-api/src/main/java/com/palantir/tritium/{ => api}/event/InstrumentationFilter.java (97%) rename tritium-api/src/main/java/com/palantir/tritium/{ => api}/event/InvocationContext.java (92%) rename tritium-api/src/main/java/com/palantir/tritium/{ => api}/event/InvocationEventHandler.java (96%) rename tritium-api/src/main/java/com/palantir/tritium/{ => api}/event/package-info.java (85%) diff --git a/tritium-api/src/main/java/com/palantir/tritium/event/InstrumentationFilter.java b/tritium-api/src/main/java/com/palantir/tritium/api/event/InstrumentationFilter.java similarity index 97% rename from tritium-api/src/main/java/com/palantir/tritium/event/InstrumentationFilter.java rename to tritium-api/src/main/java/com/palantir/tritium/api/event/InstrumentationFilter.java index e9f0c7770..630b71635 100644 --- a/tritium-api/src/main/java/com/palantir/tritium/event/InstrumentationFilter.java +++ b/tritium-api/src/main/java/com/palantir/tritium/api/event/InstrumentationFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.palantir.tritium.event; +package com.palantir.tritium.api.event; import java.lang.reflect.Method; import javax.annotation.Nonnull; diff --git a/tritium-api/src/main/java/com/palantir/tritium/event/InvocationContext.java b/tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationContext.java similarity index 92% rename from tritium-api/src/main/java/com/palantir/tritium/event/InvocationContext.java rename to tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationContext.java index c91ec8699..ceb590cc3 100644 --- a/tritium-api/src/main/java/com/palantir/tritium/event/InvocationContext.java +++ b/tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Palantir Technologies, Inc. All rights reserved. + * Copyright 2017 Palantir Technologies, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.palantir.tritium.event; +package com.palantir.tritium.api.event; import java.lang.reflect.Method; import javax.annotation.Nullable; diff --git a/tritium-api/src/main/java/com/palantir/tritium/event/InvocationEventHandler.java b/tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationEventHandler.java similarity index 96% rename from tritium-api/src/main/java/com/palantir/tritium/event/InvocationEventHandler.java rename to tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationEventHandler.java index 972511ff1..0b25008a5 100644 --- a/tritium-api/src/main/java/com/palantir/tritium/event/InvocationEventHandler.java +++ b/tritium-api/src/main/java/com/palantir/tritium/api/event/InvocationEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Palantir Technologies, Inc. All rights reserved. + * Copyright 2017 Palantir Technologies, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.palantir.tritium.event; +package com.palantir.tritium.api.event; import java.lang.reflect.Method; import javax.annotation.Nonnull; diff --git a/tritium-api/src/main/java/com/palantir/tritium/event/package-info.java b/tritium-api/src/main/java/com/palantir/tritium/api/event/package-info.java similarity index 85% rename from tritium-api/src/main/java/com/palantir/tritium/event/package-info.java rename to tritium-api/src/main/java/com/palantir/tritium/api/event/package-info.java index 24ba916ab..5a50a4308 100644 --- a/tritium-api/src/main/java/com/palantir/tritium/event/package-info.java +++ b/tritium-api/src/main/java/com/palantir/tritium/api/event/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Palantir Technologies, Inc. All rights reserved. + * Copyright 2017 Palantir Technologies, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,4 +15,4 @@ */ @com.palantir.tritium.commons.annotations.NonnullByDefault -package com.palantir.tritium.event; +package com.palantir.tritium.api.event; diff --git a/tritium-brave/src/main/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandler.java b/tritium-brave/src/main/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandler.java index 199449369..018d7a275 100644 --- a/tritium-brave/src/main/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandler.java +++ b/tritium-brave/src/main/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandler.java @@ -19,10 +19,10 @@ import com.github.kristofa.brave.Brave; import com.github.kristofa.brave.LocalTracer; import com.github.kristofa.brave.SpanId; +import com.palantir.tritium.api.event.InvocationContext; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.event.AbstractInvocationEventHandler; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; import java.lang.reflect.Method; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/tritium-brave/src/test/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandlerTest.java b/tritium-brave/src/test/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandlerTest.java index db3f9e720..630c9b0a2 100644 --- a/tritium-brave/src/test/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandlerTest.java +++ b/tritium-brave/src/test/java/com/palantir/tritium/brave/BraveLocalTracingInvocationEventHandlerTest.java @@ -33,7 +33,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.palantir.tritium.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationContext; import com.palantir.tritium.test.TestImplementation; import com.palantir.tritium.test.TestInterface; import com.twitter.zipkin.gen.BinaryAnnotation; diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/AbstractInvocationEventHandler.java b/tritium-core/src/main/java/com/palantir/tritium/event/AbstractInvocationEventHandler.java index 2db4f9e13..d67b534c3 100644 --- a/tritium-core/src/main/java/com/palantir/tritium/event/AbstractInvocationEventHandler.java +++ b/tritium-core/src/main/java/com/palantir/tritium/event/AbstractInvocationEventHandler.java @@ -20,6 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Strings; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.BooleanSupplier; import javax.annotation.Nullable; diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/CompositeInvocationEventHandler.java b/tritium-core/src/main/java/com/palantir/tritium/event/CompositeInvocationEventHandler.java index 9a1c3335a..4155973a7 100644 --- a/tritium-core/src/main/java/com/palantir/tritium/event/CompositeInvocationEventHandler.java +++ b/tritium-core/src/main/java/com/palantir/tritium/event/CompositeInvocationEventHandler.java @@ -20,6 +20,8 @@ import com.google.common.collect.ImmutableList; import com.palantir.logsafe.SafeArg; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java b/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java index f3a985206..ad6c06998 100644 --- a/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java +++ b/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; +import com.palantir.tritium.api.event.InvocationContext; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java b/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java index 01520f156..31a499c2a 100644 --- a/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java +++ b/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java @@ -16,6 +16,7 @@ package com.palantir.tritium.event; +import com.palantir.tritium.api.event.InstrumentationFilter; import com.palantir.tritium.api.functions.BooleanSupplier; import java.lang.reflect.Method; import javax.annotation.Nonnull; diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java b/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java index 854417f7a..147bdf150 100644 --- a/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java +++ b/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java @@ -16,6 +16,8 @@ package com.palantir.tritium.event; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import java.lang.reflect.Method; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/tritium-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java b/tritium-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java index 37a8304ea..0172ed6a5 100644 --- a/tritium-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java +++ b/tritium-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java @@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collections; diff --git a/tritium-core/src/test/java/com/palantir/tritium/event/DefaultInvocationContextTest.java b/tritium-core/src/test/java/com/palantir/tritium/event/DefaultInvocationContextTest.java index 33a8090d1..e31bcaa07 100644 --- a/tritium-core/src/test/java/com/palantir/tritium/event/DefaultInvocationContextTest.java +++ b/tritium-core/src/test/java/com/palantir/tritium/event/DefaultInvocationContextTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import com.palantir.tritium.api.event.InvocationContext; import org.junit.Test; public class DefaultInvocationContextTest { diff --git a/tritium-core/src/test/java/com/palantir/tritium/event/InstrumentationFiltersTest.java b/tritium-core/src/test/java/com/palantir/tritium/event/InstrumentationFiltersTest.java index a38e885c4..25401bf66 100644 --- a/tritium-core/src/test/java/com/palantir/tritium/event/InstrumentationFiltersTest.java +++ b/tritium-core/src/test/java/com/palantir/tritium/event/InstrumentationFiltersTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import com.palantir.tritium.api.event.InstrumentationFilter; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.test.TestImplementation; import com.palantir.tritium.test.TestInterface; diff --git a/tritium-core/src/test/java/com/palantir/tritium/event/ThrowingInvocationEventHandler.java b/tritium-core/src/test/java/com/palantir/tritium/event/ThrowingInvocationEventHandler.java index 931e6becc..945ad7e73 100644 --- a/tritium-core/src/test/java/com/palantir/tritium/event/ThrowingInvocationEventHandler.java +++ b/tritium-core/src/test/java/com/palantir/tritium/event/ThrowingInvocationEventHandler.java @@ -16,6 +16,8 @@ package com.palantir.tritium.event; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import java.lang.reflect.Method; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java b/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java index 0aa3e60f0..788f6cbcd 100644 --- a/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java +++ b/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java @@ -20,11 +20,11 @@ import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; +import com.palantir.tritium.api.event.InstrumentationFilter; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.LongPredicate; -import com.palantir.tritium.event.InstrumentationFilter; import com.palantir.tritium.event.InstrumentationFilters; -import com.palantir.tritium.event.InvocationContext; -import com.palantir.tritium.event.InvocationEventHandler; import com.palantir.tritium.event.log.LoggingInvocationEventHandler; import com.palantir.tritium.event.log.LoggingLevel; import com.palantir.tritium.event.metrics.MetricsInvocationEventHandler; diff --git a/tritium-lib/src/main/java/com/palantir/tritium/proxy/InstrumentationProxy.java b/tritium-lib/src/main/java/com/palantir/tritium/proxy/InstrumentationProxy.java index aab92bb9a..35d446afc 100644 --- a/tritium-lib/src/main/java/com/palantir/tritium/proxy/InstrumentationProxy.java +++ b/tritium-lib/src/main/java/com/palantir/tritium/proxy/InstrumentationProxy.java @@ -16,9 +16,9 @@ package com.palantir.tritium.proxy; -import com.palantir.tritium.event.InstrumentationFilter; -import com.palantir.tritium.event.InvocationContext; -import com.palantir.tritium.event.InvocationEventHandler; +import com.palantir.tritium.api.event.InstrumentationFilter; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import java.util.List; class InstrumentationProxy extends InvocationEventProxy { diff --git a/tritium-lib/src/main/java/com/palantir/tritium/proxy/InvocationEventProxy.java b/tritium-lib/src/main/java/com/palantir/tritium/proxy/InvocationEventProxy.java index 59c70c7e9..88ea03fc5 100644 --- a/tritium-lib/src/main/java/com/palantir/tritium/proxy/InvocationEventProxy.java +++ b/tritium-lib/src/main/java/com/palantir/tritium/proxy/InvocationEventProxy.java @@ -20,12 +20,12 @@ import com.google.common.reflect.AbstractInvocationHandler; import com.palantir.logsafe.SafeArg; +import com.palantir.tritium.api.event.InstrumentationFilter; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.event.CompositeInvocationEventHandler; -import com.palantir.tritium.event.InstrumentationFilter; import com.palantir.tritium.event.InstrumentationFilters; -import com.palantir.tritium.event.InvocationContext; -import com.palantir.tritium.event.InvocationEventHandler; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/tritium-lib/src/test/java/com/palantir/tritium/proxy/InstrumentationTest.java b/tritium-lib/src/test/java/com/palantir/tritium/proxy/InstrumentationTest.java index 625985f5d..5ba7c50ce 100644 --- a/tritium-lib/src/test/java/com/palantir/tritium/proxy/InstrumentationTest.java +++ b/tritium-lib/src/test/java/com/palantir/tritium/proxy/InstrumentationTest.java @@ -33,9 +33,9 @@ import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; -import com.palantir.tritium.event.InstrumentationFilter; -import com.palantir.tritium.event.InvocationContext; -import com.palantir.tritium.event.InvocationEventHandler; +import com.palantir.tritium.api.event.InstrumentationFilter; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.event.log.LoggingInvocationEventHandler; import com.palantir.tritium.metrics.MetricRegistries; import com.palantir.tritium.test.TestImplementation; diff --git a/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java b/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java index bb3abb6e3..2653200b3 100644 --- a/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java +++ b/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertThat; import com.google.common.collect.ImmutableList; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; -import com.palantir.tritium.event.InvocationEventHandler; import java.lang.reflect.Method; import java.util.Collections; import java.util.List; diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java b/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java index a1c0bbcd4..468fac175 100644 --- a/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java +++ b/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java @@ -19,10 +19,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.codahale.metrics.MetricRegistry; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.event.AbstractInvocationEventHandler; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; @@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory; /** - * {@link com.palantir.tritium.event.InvocationEventHandler} that records method timing and failures using Dropwizard + * {@link InvocationEventHandler} that records method timing and failures using Dropwizard * metrics. */ public final class MetricsInvocationEventHandler extends AbstractInvocationEventHandler { diff --git a/tritium-metrics/src/test/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandlerTest.java b/tritium-metrics/src/test/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandlerTest.java index 964148172..21189bdb6 100644 --- a/tritium-metrics/src/test/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandlerTest.java +++ b/tritium-metrics/src/test/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandlerTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import com.codahale.metrics.MetricRegistry; -import com.palantir.tritium.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationContext; import org.junit.Test; public class MetricsInvocationEventHandlerTest { diff --git a/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java b/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java index 5e342824e..d1e02054f 100644 --- a/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java +++ b/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java @@ -21,11 +21,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.palantir.logsafe.SafeArg; +import com.palantir.tritium.api.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationEventHandler; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.api.functions.LongPredicate; import com.palantir.tritium.event.AbstractInvocationEventHandler; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; import java.lang.reflect.Method; import java.util.Collection; import java.util.List; @@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory; /** - * {@link com.palantir.tritium.event.InvocationEventHandler} that times every method invocation and logs to specified + * {@link InvocationEventHandler} that times every method invocation and logs to specified * logger. */ public class LoggingInvocationEventHandler extends AbstractInvocationEventHandler { diff --git a/tritium-slf4j/src/test/java/com/palantir/tritium/event/log/LoggingInvocationEventHandlerTest.java b/tritium-slf4j/src/test/java/com/palantir/tritium/event/log/LoggingInvocationEventHandlerTest.java index e7bb8dbc3..4660af5f0 100644 --- a/tritium-slf4j/src/test/java/com/palantir/tritium/event/log/LoggingInvocationEventHandlerTest.java +++ b/tritium-slf4j/src/test/java/com/palantir/tritium/event/log/LoggingInvocationEventHandlerTest.java @@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.palantir.tritium.api.event.InvocationContext; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; import com.palantir.tritium.test.TestInterface; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; diff --git a/tritium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java b/tritium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java index ff9a80f4b..77815e214 100644 --- a/tritium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java +++ b/tritium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java @@ -18,10 +18,10 @@ import com.google.common.base.Strings; import com.palantir.remoting1.tracing.Tracer; +import com.palantir.tritium.api.event.InvocationContext; import com.palantir.tritium.api.functions.BooleanSupplier; import com.palantir.tritium.event.AbstractInvocationEventHandler; import com.palantir.tritium.event.DefaultInvocationContext; -import com.palantir.tritium.event.InvocationContext; import java.lang.reflect.Method; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/tritium-tracing/src/test/java/com/palantir/tritium/tracing/TracingInvocationEventHandlerTest.java b/tritium-tracing/src/test/java/com/palantir/tritium/tracing/TracingInvocationEventHandlerTest.java index 96b920928..9de193c18 100644 --- a/tritium-tracing/src/test/java/com/palantir/tritium/tracing/TracingInvocationEventHandlerTest.java +++ b/tritium-tracing/src/test/java/com/palantir/tritium/tracing/TracingInvocationEventHandlerTest.java @@ -27,7 +27,7 @@ import com.palantir.remoting1.tracing.Span; import com.palantir.remoting1.tracing.SpanObserver; import com.palantir.remoting1.tracing.Tracer; -import com.palantir.tritium.event.InvocationContext; +import com.palantir.tritium.api.event.InvocationContext; import com.palantir.tritium.test.TestImplementation; import com.palantir.tritium.test.TestInterface; import java.lang.reflect.Method;