You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/09/29 17:28:26 UTC
[cxf] branch master updated: Fixing checkstyle issues in the
distribution
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b6d8ed4 Fixing checkstyle issues in the distribution
b6d8ed4 is described below
commit b6d8ed470cd5ba2e0482c1907cf701494359349d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Sep 29 18:28:06 2018 +0100
Fixing checkstyle issues in the distribution
---
.../src/main/java/demo/jaxrs/tracing/server/CatalogTracing.java | 5 +++--
.../main/java/demo/jaxrs/tracing/server/AsyncReporterConverter.java | 2 +-
.../main/java/demo/jaxrs/tracing/server/CatalogTracingFactory.java | 6 +++++-
.../main/java/demo/jaxws/tracing/server/AsyncReporterConverter.java | 2 +-
.../main/java/demo/jaxws/tracing/server/CatalogTracingFactory.java | 6 +++++-
.../java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java | 5 ++---
6 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogTracing.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogTracing.java
index 808ae74..818ffe0 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogTracing.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogTracing.java
@@ -42,12 +42,13 @@ public class CatalogTracing implements AutoCloseable {
HttpTracing result = httpTracing;
if (result == null) {
- synchronized(this) {
+ synchronized (this) {
result = httpTracing;
if (result == null) {
sender = OkHttpSender.create("http://localhost:9411/api/v2/spans");
reporter = AsyncReporter.create(sender);
- httpTracing = result = createHttpTracing(serviceName, reporter);
+ result = createHttpTracing(serviceName, reporter);
+ httpTracing = result;
}
}
}
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/AsyncReporterConverter.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/AsyncReporterConverter.java
index a553deb..7fa7405 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/AsyncReporterConverter.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/AsyncReporterConverter.java
@@ -34,7 +34,7 @@ import zipkin2.reporter.AsyncReporter;
public class AsyncReporterConverter implements Converter {
@Override
public boolean canConvert(Object source, ReifiedType target) {
- return (source instanceof AsyncReporter<?> && target.getRawClass() == AsyncReporter.class);
+ return source instanceof AsyncReporter<?> && target.getRawClass() == AsyncReporter.class;
}
@SuppressWarnings("unchecked")
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogTracingFactory.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogTracingFactory.java
index f4b8042..2df159a 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogTracingFactory.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogTracingFactory.java
@@ -23,7 +23,11 @@ import brave.Tracing;
import brave.propagation.ThreadLocalCurrentTraceContext;
import zipkin2.reporter.AsyncReporter;
-public class CatalogTracingFactory {
+public final class CatalogTracingFactory {
+
+ private CatalogTracingFactory() {
+ }
+
public static Tracing create(final String serviceName, final AsyncReporter<zipkin2.Span> reporter) {
return Tracing
.newBuilder()
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/AsyncReporterConverter.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/AsyncReporterConverter.java
index 6c4c335..dc094d4 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/AsyncReporterConverter.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/AsyncReporterConverter.java
@@ -34,7 +34,7 @@ import zipkin2.reporter.AsyncReporter;
public class AsyncReporterConverter implements Converter {
@Override
public boolean canConvert(Object source, ReifiedType target) {
- return (source instanceof AsyncReporter<?> && target.getRawClass() == AsyncReporter.class);
+ return source instanceof AsyncReporter<?> && target.getRawClass() == AsyncReporter.class;
}
@SuppressWarnings("unchecked")
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogTracingFactory.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogTracingFactory.java
index 0e8b337..4654f69 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogTracingFactory.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogTracingFactory.java
@@ -23,7 +23,11 @@ import brave.Tracing;
import brave.propagation.ThreadLocalCurrentTraceContext;
import zipkin2.reporter.AsyncReporter;
-public class CatalogTracingFactory {
+public final class CatalogTracingFactory {
+
+ private CatalogTracingFactory() {
+ }
+
public static Tracing create(final String serviceName, final AsyncReporter<zipkin2.Span> reporter) {
return Tracing
.newBuilder()
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
index b899614..2838632 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
@@ -18,13 +18,12 @@
*/
package demo.jaxws.tracing.server.impl;
-import brave.ScopedSpan;
-
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import brave.ScopedSpan;
import brave.Tracing;
import brave.propagation.TraceContext;
import demo.jaxws.tracing.server.Book;
@@ -68,4 +67,4 @@ public class CatalogServiceImpl implements CatalogService {
throw new RuntimeException("Book with does not exists: " + id);
}
}
-}
\ No newline at end of file
+}