CAMEL-8342 Fixed the CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc1d242a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc1d242a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc1d242a Branch: refs/heads/master Commit: bc1d242af4fa20a5f18dfb9f9f73c1846d1a6dda Parents: 12779b6 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Feb 13 10:19:34 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Feb 13 10:19:34 2015 +0800 ---------------------------------------------------------------------- .../component/ganglia/GangliaConfiguration.java | 51 ++++++++++---------- .../component/ganglia/GangliaEndpoint.java | 10 ++-- .../component/ganglia/GangliaProducer.java | 15 ++---- 3 files changed, 33 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bc1d242a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java index 510e318..d82f920 100644 --- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java +++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java @@ -19,15 +19,14 @@ package org.apache.camel.component.ganglia; import java.io.IOException; import java.net.URI; +import info.ganglia.gmetric4j.gmetric.GMetric; +import info.ganglia.gmetric4j.gmetric.GMetricSlope; +import info.ganglia.gmetric4j.gmetric.GMetricType; + import org.apache.camel.RuntimeCamelException; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; -import org.apache.camel.util.ObjectHelper; - -import info.ganglia.gmetric4j.gmetric.GMetric; -import info.ganglia.gmetric4j.gmetric.GMetricSlope; -import info.ganglia.gmetric4j.gmetric.GMetricType; /** * @version @@ -35,18 +34,18 @@ import info.ganglia.gmetric4j.gmetric.GMetricType; @UriParams public class GangliaConfiguration implements Cloneable { - public final static String DEFAULT_DESTINATION = "239.2.11.71"; - public final static int DEFAULT_PORT = 8649; - public final static GMetric.UDPAddressingMode DEFAULT_MODE = GMetric.UDPAddressingMode.MULTICAST; - public final static int DEFAULT_TTL = 5; - public final static boolean DEFAULT_WIRE_FORMAT_31X = true; - public final static String DEFAULT_GROUP_NAME = "Java"; - public final static String DEFAULT_METRIC_NAME = "metric"; - public final static GMetricType DEFAULT_TYPE = GMetricType.STRING; - public final static GMetricSlope DEFAULT_SLOPE = GMetricSlope.BOTH; - public final static String DEFAULT_UNITS = ""; - public final static int DEFAULT_TMAX = 60; - public final static int DEFAULT_DMAX = 0; + public static final String DEFAULT_DESTINATION = "127.0.0.1"; + public static final int DEFAULT_PORT = 8649; + public static final GMetric.UDPAddressingMode DEFAULT_MODE = GMetric.UDPAddressingMode.MULTICAST; + public static final int DEFAULT_TTL = 5; + public static final boolean DEFAULT_WIRE_FORMAT_31X = true; + public static final String DEFAULT_GROUP_NAME = "Java"; + public static final String DEFAULT_METRIC_NAME = "metric"; + public static final GMetricType DEFAULT_TYPE = GMetricType.STRING; + public static final GMetricSlope DEFAULT_SLOPE = GMetricSlope.BOTH; + public static final String DEFAULT_UNITS = ""; + public static final int DEFAULT_TMAX = 60; + public static final int DEFAULT_DMAX = 0; @UriPath private String host = DEFAULT_DESTINATION; @@ -57,22 +56,22 @@ public class GangliaConfiguration implements Cloneable { @UriParam private GMetric.UDPAddressingMode mode = DEFAULT_MODE; - @UriParam + @UriParam(defaultValue = "5") private int ttl = DEFAULT_TTL; - @UriParam + @UriParam(defaultValue = "true") private boolean wireFormat31x = DEFAULT_WIRE_FORMAT_31X; @UriParam private String spoofHostname; - @UriParam + @UriParam(defaultValue = "Java") private String groupName = DEFAULT_GROUP_NAME; @UriParam - private String prefix = null; + private String prefix; - @UriParam + @UriParam(defaultValue = "metric") private String metricName = DEFAULT_METRIC_NAME; @UriParam @@ -81,13 +80,13 @@ public class GangliaConfiguration implements Cloneable { @UriParam private GMetricSlope slope = DEFAULT_SLOPE; - @UriParam + @UriParam(defaultValue = "") private String units = DEFAULT_UNITS; - @UriParam + @UriParam(defaultValue = "60") private int tmax = DEFAULT_TMAX; - @UriParam + @UriParam(defaultValue = "0") private int dmax = DEFAULT_DMAX; /** @@ -117,7 +116,7 @@ public class GangliaConfiguration implements Cloneable { try { return new GMetric(host, port, mode, ttl, wireFormat31x, null, spoofHostname); - } catch(IOException ex) { + } catch (IOException ex) { throw new RuntimeCamelException("Failed to initialize Ganglia", ex); } } http://git-wip-us.apache.org/repos/asf/camel/blob/bc1d242a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java index 91ed5d4..199e115 100644 --- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java +++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java @@ -16,6 +16,10 @@ */ package org.apache.camel.component.ganglia; +import info.ganglia.gmetric4j.Publisher; +import info.ganglia.gmetric4j.gmetric.GMetric; +import info.ganglia.gmetric4j.gmetric.GMetricPublisher; + import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; @@ -25,14 +29,10 @@ import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; -import info.ganglia.gmetric4j.Publisher; -import info.ganglia.gmetric4j.gmetric.GMetric; -import info.ganglia.gmetric4j.gmetric.GMetricPublisher; - /** * @version */ -@UriEndpoint(scheme = "ganglia", label = "monitoring") +@UriEndpoint(scheme = "ganglia", producerOnly = true, label = "monitoring") public class GangliaEndpoint extends DefaultEndpoint { private Publisher publisher; http://git-wip-us.apache.org/repos/asf/camel/blob/bc1d242a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java index 1133654..21d3fc8 100644 --- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java +++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java @@ -16,22 +16,13 @@ */ package org.apache.camel.component.ganglia; -import java.util.concurrent.ExecutorService; - -import org.apache.camel.CamelException; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.impl.DefaultProducer; - -import org.apache.camel.component.ganglia.GangliaConstants; - import info.ganglia.gmetric4j.Publisher; import info.ganglia.gmetric4j.gmetric.GMetricSlope; import info.ganglia.gmetric4j.gmetric.GMetricType; +import org.apache.camel.Exchange; +import org.apache.camel.Message; +import org.apache.camel.impl.DefaultProducer; -/** - * @version - */ public class GangliaProducer extends DefaultProducer { private final Publisher publisher;
