Skip to content

Commit

Permalink
reformat
Browse files Browse the repository at this point in the history
Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
  • Loading branch information
Sergei Malafeev committed Oct 28, 2020
1 parent a0ecc5a commit 7115096
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 21 deletions.
Expand Up @@ -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;
Expand Down
Expand Up @@ -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) {
Expand Down
Expand Up @@ -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.
* <p>
* A port of Spring Sleuth implementation.
*/
Expand Down
Expand Up @@ -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 {

Expand Down
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7115096

Please sign in to comment.