From 3ba0891213dfd4fbb14ee7c2e2486f351fb3a65d Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 5 Jan 2015 08:45:11 -0800 Subject: [PATCH] HTRACE-50 Clean up build warnings --- htrace-core/pom.xml | 2 +- htrace-core/src/main/java/org/apache/htrace/Span.java | 2 -- htrace-core/src/main/java/org/apache/htrace/Trace.java | 15 ++------------- .../main/java/org/apache/htrace/wrappers/TraceProxy.java | 8 -------- htrace-flume/pom.xml | 11 +++-------- htrace-hbase/pom.xml | 11 +++-------- htrace-zipkin/pom.xml | 11 +++-------- 7 files changed, 12 insertions(+), 48 deletions(-) diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml index 91d906c..c31c49e 100644 --- a/htrace-core/pom.xml +++ b/htrace-core/pom.xml @@ -85,7 +85,7 @@ language governing permissions and limitations under the License. --> - + diff --git a/htrace-core/src/main/java/org/apache/htrace/Span.java b/htrace-core/src/main/java/org/apache/htrace/Span.java index b8af10d..2731583 100644 --- a/htrace-core/src/main/java/org/apache/htrace/Span.java +++ b/htrace-core/src/main/java/org/apache/htrace/Span.java @@ -116,8 +116,6 @@ public interface Span { /** * Return a unique id for the node or process from which this Span originated. * IP address is a reasonable choice. - * - * @return */ String getProcessId(); diff --git a/htrace-core/src/main/java/org/apache/htrace/Trace.java b/htrace-core/src/main/java/org/apache/htrace/Trace.java index 61dfdfa..67bb731 100644 --- a/htrace-core/src/main/java/org/apache/htrace/Trace.java +++ b/htrace-core/src/main/java/org/apache/htrace/Trace.java @@ -38,7 +38,6 @@ public class Trace { * NullSpan. * * @param description Description of the span to be created. - * @return */ public static TraceScope startSpan(String description) { return startSpan(description, TrueIfTracingSampler.INSTANCE); @@ -52,7 +51,6 @@ public class Trace { * @param description Description of the span to be created. * @param parent The parent that should be used to create the child span that is to * be returned. - * @return */ public static TraceScope startSpan(String description, Span parent) { if (parent == null) return startSpan(description); @@ -99,8 +97,7 @@ public class Trace { /** * Set the processId to be used for all Spans created by this Tracer. * - * @param processId - * @see Span.java + * @see Span */ public static void setProcessId(String processId) { Tracer.processId = processId; @@ -108,8 +105,6 @@ public class Trace { /** * Removes the given SpanReceiver from the list of SpanReceivers. - * - * @param rcvr */ public static void removeReceiver(SpanReceiver rcvr) { Tracer.getInstance().removeReceiver(rcvr); @@ -118,8 +113,6 @@ public class Trace { /** * Adds the given SpanReceiver to the current Tracer instance's list of * SpanReceivers. - * - * @param rcvr */ public static void addReceiver(SpanReceiver rcvr) { Tracer.getInstance().addReceiver(rcvr); @@ -147,8 +140,6 @@ public class Trace { /** * Returns true if the current thread is a part of a trace, false otherwise. - * - * @return */ public static boolean isTracing() { return Tracer.getInstance().isTracing(); @@ -166,7 +157,6 @@ public class Trace { /** * Wrap the callable in a TraceCallable, if tracing. * - * @param callable * @return The callable provided, wrapped if tracing, 'callable' if not. */ public static Callable wrap(Callable callable) { @@ -180,7 +170,6 @@ public class Trace { /** * Wrap the runnable in a TraceRunnable, if tracing * - * @param runnable * @return The runnable provided, wrapped if tracing, 'runnable' if not. */ public static Runnable wrap(Runnable runnable) { @@ -195,7 +184,7 @@ public class Trace { * Wrap the runnable in a TraceRunnable, if tracing * * @param description name of the span to be created. - * @param runnable + * @param runnable The runnable that will have tracing info associated with it if tracing. * @return The runnable provided, wrapped if tracing, 'runnable' if not. */ public static Runnable wrap(String description, Runnable runnable) { diff --git a/htrace-core/src/main/java/org/apache/htrace/wrappers/TraceProxy.java b/htrace-core/src/main/java/org/apache/htrace/wrappers/TraceProxy.java index c06befd..4087417 100644 --- a/htrace-core/src/main/java/org/apache/htrace/wrappers/TraceProxy.java +++ b/htrace-core/src/main/java/org/apache/htrace/wrappers/TraceProxy.java @@ -27,9 +27,6 @@ import java.lang.reflect.Proxy; public class TraceProxy { /** * Returns an object that will trace all calls to itself. - * - * @param instance - * @return */ public static T trace(T instance) { return trace(instance, Sampler.ALWAYS); @@ -37,11 +34,6 @@ public class TraceProxy { /** * Returns an object that will trace all calls to itself. - * - * @param - * @param instance - * @param sampler - * @return */ @SuppressWarnings("unchecked") public static T trace(final T instance, final Sampler sampler) { diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml index b9fe5a8..5c938c1 100644 --- a/htrace-flume/pom.xml +++ b/htrace-flume/pom.xml @@ -38,6 +38,9 @@ language governing permissions and limitations under the License. --> maven-assembly-plugin true + + jar-with-dependencies + @@ -62,14 +65,6 @@ language governing permissions and limitations under the License. --> maven-deploy-plugin - - maven-assembly-plugin - - - jar-with-dependencies - - - diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index 80f9091..71fd589 100644 --- a/htrace-hbase/pom.xml +++ b/htrace-hbase/pom.xml @@ -53,6 +53,9 @@ language governing permissions and limitations under the License. --> maven-assembly-plugin true + + jar-with-dependencies + @@ -70,14 +73,6 @@ language governing permissions and limitations under the License. --> maven-source-plugin - maven-assembly-plugin - - - jar-with-dependencies - - - - maven-compiler-plugin diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index f641512..fb64539 100644 --- a/htrace-zipkin/pom.xml +++ b/htrace-zipkin/pom.xml @@ -36,6 +36,9 @@ language governing permissions and limitations under the License. --> maven-assembly-plugin true + + jar-with-dependencies + @@ -60,14 +63,6 @@ language governing permissions and limitations under the License. --> maven-deploy-plugin - - maven-assembly-plugin - - - jar-with-dependencies - - - -- 2.2.1