Fixed CS. This closes #1506
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f97c6af6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f97c6af6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f97c6af6 Branch: refs/heads/master Commit: f97c6af6ad549f49c878dbd670d6adb5186026ea Parents: 84b21a8 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 4 16:04:44 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 4 16:04:44 2017 +0100 ---------------------------------------------------------------------- .../decorators/AbstractHttpSpanDecorator.java | 1 - .../opentracing/decorators/JdbcSpanDecorator.java | 3 +-- .../decorators/MongoDBSpanDecorator.java | 11 +++++------ .../opentracing/decorators/SqlSpanDecorator.java | 3 +-- .../decorators/AbstractHttpSpanDecoratorTest.java | 11 ++++------- .../decorators/AbstractSpanDecoratorTest.java | 11 +++++------ .../decorators/JdbcSpanDecoratorTest.java | 7 +++---- .../decorators/MongoDBSpanDecoratorTest.java | 16 +++++++--------- .../decorators/SqlSpanDecoratorTest.java | 7 +++---- .../decorators/TimerSpanDecoratorTest.java | 4 ++-- 10 files changed, 31 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java index bc16f42..a498349 100644 --- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java +++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecorator.java @@ -18,7 +18,6 @@ package org.apache.camel.opentracing.decorators; import io.opentracing.Span; import io.opentracing.tag.Tags; - import org.apache.camel.Endpoint; import org.apache.camel.Exchange; http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java index 44cded4..b42d377 100644 --- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java +++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JdbcSpanDecorator.java @@ -16,11 +16,10 @@ */ package org.apache.camel.opentracing.decorators; +import io.opentracing.Span; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; -import io.opentracing.Span; - public class JdbcSpanDecorator extends AbstractSpanDecorator { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java index 0237535..f224f6d 100644 --- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java +++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecorator.java @@ -20,11 +20,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import io.opentracing.Span; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; -import io.opentracing.Span; - public class MongoDBSpanDecorator extends AbstractSpanDecorator { @Override @@ -34,7 +33,7 @@ public class MongoDBSpanDecorator extends AbstractSpanDecorator { @Override public String getOperationName(Exchange exchange, Endpoint endpoint) { - Map<String,String> queryParameters = toQueryParameters(endpoint.getEndpointUri()); + Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri()); String opName = queryParameters.get("operation"); if (opName != null) { return opName; @@ -48,7 +47,7 @@ public class MongoDBSpanDecorator extends AbstractSpanDecorator { span.setTag("db.type", getComponent()); - Map<String,String> queryParameters = toQueryParameters(endpoint.getEndpointUri()); + Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri()); String database = queryParameters.get("database"); if (database != null) { span.setTag("db.instance", database); @@ -56,11 +55,11 @@ public class MongoDBSpanDecorator extends AbstractSpanDecorator { span.setTag("db.statement", queryParameters.toString()); } - public static Map<String,String> toQueryParameters(String uri) { + public static Map<String, String> toQueryParameters(String uri) { int index = uri.indexOf('?'); if (index != -1) { String queryString = uri.substring(index + 1); - Map<String,String> map = new HashMap<>(); + Map<String, String> map = new HashMap<>(); for (String param : queryString.split("&")) { String[] parts = param.split("="); if (parts.length == 2) { http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/SqlSpanDecorator.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/SqlSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/SqlSpanDecorator.java index c814994..a312f2a 100644 --- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/SqlSpanDecorator.java +++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/SqlSpanDecorator.java @@ -16,11 +16,10 @@ */ package org.apache.camel.opentracing.decorators; +import io.opentracing.Span; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; -import io.opentracing.Span; - public class SqlSpanDecorator extends AbstractSpanDecorator { public static final String CAMEL_SQL_QUERY = "CamelSqlQuery"; http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java index 8c16e76..093bb6d 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - -import java.net.URI; - +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; +import io.opentracing.tag.Tags; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -27,9 +26,7 @@ import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; -import io.opentracing.tag.Tags; +import static org.junit.Assert.assertEquals; public class AbstractHttpSpanDecoratorTest { http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java index b59aa30..5fcecb2 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java @@ -16,17 +16,16 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; +import io.opentracing.tag.Tags; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; -import io.opentracing.tag.Tags; +import static org.junit.Assert.assertEquals; public class AbstractSpanDecoratorTest { @@ -75,7 +74,7 @@ public class AbstractSpanDecoratorTest { Mockito.when(exchange.isFailed()).thenReturn(true); - Exception e=new Exception("Test Message"); + Exception e = new Exception("Test Message"); Mockito.when(exchange.getException()).thenReturn(e); SpanDecorator decorator = new AbstractSpanDecorator() { http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java index ce24aaf..a69fb78 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -25,8 +25,7 @@ import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; +import static org.junit.Assert.assertEquals; public class JdbcSpanDecoratorTest { http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java index 908560f..8961bb3 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java @@ -16,17 +16,17 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - import java.util.Map; +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; import org.apache.camel.Endpoint; import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class MongoDBSpanDecoratorTest { @@ -37,8 +37,7 @@ public class MongoDBSpanDecoratorTest { public void testGetOperationName() { Endpoint endpoint = Mockito.mock(Endpoint.class); - Mockito.when(endpoint.getEndpointUri()).thenReturn( - MONGODB_STATEMENT); + Mockito.when(endpoint.getEndpointUri()).thenReturn(MONGODB_STATEMENT); SpanDecorator decorator = new MongoDBSpanDecorator(); @@ -47,7 +46,7 @@ public class MongoDBSpanDecoratorTest { @Test public void testToQueryParameters() { - Map<String,String> params = MongoDBSpanDecorator.toQueryParameters(MONGODB_STATEMENT); + Map<String, String> params = MongoDBSpanDecorator.toQueryParameters(MONGODB_STATEMENT); assertEquals(3, params.size()); assertEquals("flights", params.get("database")); assertEquals("tickets", params.get("collection")); @@ -58,8 +57,7 @@ public class MongoDBSpanDecoratorTest { public void testPre() { Endpoint endpoint = Mockito.mock(Endpoint.class); - Mockito.when(endpoint.getEndpointUri()).thenReturn( - MONGODB_STATEMENT); + Mockito.when(endpoint.getEndpointUri()).thenReturn(MONGODB_STATEMENT); SpanDecorator decorator = new MongoDBSpanDecorator(); http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java index f9d3987..d6b0a25 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -25,8 +25,7 @@ import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; +import static org.junit.Assert.assertEquals; public class SqlSpanDecoratorTest { http://git-wip-us.apache.org/repos/asf/camel/blob/f97c6af6/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java index c5abdd0..1914c6d 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.opentracing.decorators; -import static org.junit.Assert.*; - import org.apache.camel.Exchange; import org.apache.camel.opentracing.SpanDecorator; import org.junit.Test; import org.mockito.Mockito; +import static org.junit.Assert.assertEquals; + public class TimerSpanDecoratorTest { private static final String TEST_NAME = "TestName";