From 7115096779d5b2367ed171632a44c5d50c57489c Mon Sep 17 00:00:00 2001 From: Sergei Malafeev Date: Wed, 28 Oct 2020 10:14:22 +0800 Subject: [PATCH] reformat Signed-off-by: Sergei Malafeev --- .../contrib/kafka/TracingKafkaProducer.java | 1 - .../contrib/kafka/TracingKafkaUtils.java | 2 +- .../kafka/spring/TracingKafkaAspect.java | 4 ++-- .../contrib/kafka/spring/Listener.java | 6 +++--- .../kafka/spring/TestConfiguration.java | 7 +++---- .../kafka/spring/TracingSpringKafkaTest.java | 20 +++++++++---------- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaProducer.java b/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaProducer.java index 4f8e543..3447d68 100644 --- a/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaProducer.java +++ b/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaProducer.java @@ -27,7 +27,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; - import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.clients.producer.Callback; diff --git a/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaUtils.java b/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaUtils.java index c9ceeab..8e0f10c 100644 --- a/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaUtils.java +++ b/opentracing-kafka-client/src/main/java/io/opentracing/contrib/kafka/TracingKafkaUtils.java @@ -49,7 +49,7 @@ public static SpanContext extractSpanContext(Headers headers, Tracer tracer) { * Inject Span Context to record headers * * @param spanContext Span Context - * @param headers record headers + * @param headers record headers */ public static void inject(SpanContext spanContext, Headers headers, Tracer tracer) { diff --git a/opentracing-kafka-spring/src/main/java/io/opentracing/contrib/kafka/spring/TracingKafkaAspect.java b/opentracing-kafka-spring/src/main/java/io/opentracing/contrib/kafka/spring/TracingKafkaAspect.java index 2a9713b..7123795 100644 --- a/opentracing-kafka-spring/src/main/java/io/opentracing/contrib/kafka/spring/TracingKafkaAspect.java +++ b/opentracing-kafka-spring/src/main/java/io/opentracing/contrib/kafka/spring/TracingKafkaAspect.java @@ -24,8 +24,8 @@ import org.springframework.kafka.listener.MessageListenerContainer; /** - * Wraps a {@link MessageListener} into a tracing proxy, - * to support {@link org.springframework.kafka.annotation.KafkaListener} beans. + * Wraps a {@link MessageListener} into a tracing proxy, to support {@link + * org.springframework.kafka.annotation.KafkaListener} beans. *

* A port of Spring Sleuth implementation. */ diff --git a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/Listener.java b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/Listener.java index b118e4c..bc2f076 100644 --- a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/Listener.java +++ b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/Listener.java @@ -13,14 +13,14 @@ */ package io.opentracing.contrib.kafka.spring; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; + import io.opentracing.mock.MockTracer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Component; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.notNullValue; - @Component public class Listener { diff --git a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TestConfiguration.java b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TestConfiguration.java index 3647d1e..33bb56c 100644 --- a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TestConfiguration.java +++ b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TestConfiguration.java @@ -13,7 +13,10 @@ */ package io.opentracing.contrib.kafka.spring; +import static io.opentracing.contrib.kafka.spring.TracingSpringKafkaTest.embeddedKafka; + import io.opentracing.mock.MockTracer; +import java.util.Map; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -27,10 +30,6 @@ import org.springframework.kafka.core.ProducerFactory; import org.springframework.kafka.test.utils.KafkaTestUtils; -import java.util.Map; - -import static io.opentracing.contrib.kafka.spring.TracingSpringKafkaTest.embeddedKafka; - @Configuration @EnableKafka @ComponentScan diff --git a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TracingSpringKafkaTest.java b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TracingSpringKafkaTest.java index f22f5dc..a59aabc 100644 --- a/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TracingSpringKafkaTest.java +++ b/opentracing-kafka-spring/src/test/java/io/opentracing/contrib/kafka/spring/TracingSpringKafkaTest.java @@ -13,8 +13,16 @@ */ package io.opentracing.contrib.kafka.spring; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; + import io.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.junit.Before; @@ -27,15 +35,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - -import static org.awaitility.Awaitility.await; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; - @RunWith(SpringRunner.class) @ContextConfiguration(classes = {TestConfiguration.class}) public class TracingSpringKafkaTest { @@ -81,7 +80,8 @@ private SpanMatcher(String operationName) { @Override public boolean matches(Object actual) { - return actual instanceof MockSpan && operationName.equals(((MockSpan) actual).operationName()); + return actual instanceof MockSpan && operationName + .equals(((MockSpan) actual).operationName()); } @Override