CAMEL-7554 - camel-metrics * Fixed build issues.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5068b9c0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5068b9c0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5068b9c0 Branch: refs/heads/master Commit: 5068b9c0d6164c1617e54a1dcb3748bbf06d1b2e Parents: b11d68a Author: Lauri Kimmel <lauri.kim...@gmx.com> Authored: Thu Jul 3 21:04:34 2014 +1000 Committer: Lauri Kimmel <lauri.kim...@gmx.com> Committed: Thu Jul 3 21:04:34 2014 +1000 ---------------------------------------------------------------------- components/camel-metrics/pom.xml | 7 ++++++- .../org/apache/camel/metrics/AbstractMetricsProducer.java | 2 +- .../main/java/org/apache/camel/metrics/MetricsComponent.java | 2 +- .../org/apache/camel/metrics/counter/CounterEndpoint.java | 2 +- .../org/apache/camel/metrics/histogram/HistogramEndpoint.java | 2 +- .../java/org/apache/camel/metrics/meter/MeterEndpoint.java | 2 +- .../java/org/apache/camel/metrics/timer/TimerEndpoint.java | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index db89694..bf3fdc8 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -77,7 +77,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> <!-- logging --> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/AbstractMetricsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/AbstractMetricsProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/AbstractMetricsProducer.java index 24149af..8bf99d0 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/AbstractMetricsProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/AbstractMetricsProducer.java @@ -33,7 +33,7 @@ public abstract class AbstractMetricsProducer<T extends AbstractMetricsEndpoint> doProcess(exchange, endpoint, registry, finalMetricsName); } catch (Exception e) { - LOG.warn("Failed to produce metrics for {} in {} - {}", finalMetricsName, getClass().getSimpleName(), e.getMessage()); + LOG.warn("Failed to produce metrics for {} in {} - {}", new Object[] { finalMetricsName, getClass().getSimpleName(), e.getMessage() }); } clearMetricsHeaders(in); } http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/MetricsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/MetricsComponent.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/MetricsComponent.java index c803e4f..596b08b 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/MetricsComponent.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/MetricsComponent.java @@ -88,7 +88,7 @@ public class MetricsComponent extends DefaultComponent { type = MetricsType.getByName(name); } if (type == null) { - throw new RuntimeCamelException("Unknow metrics type \"" + name + "\""); + throw new RuntimeCamelException("Unknown metrics type \"" + name + "\""); } return type; } http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/counter/CounterEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/counter/CounterEndpoint.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/counter/CounterEndpoint.java index 8d0b34e..508e485 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/counter/CounterEndpoint.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/counter/CounterEndpoint.java @@ -7,7 +7,7 @@ import org.apache.camel.spi.UriParam; import com.codahale.metrics.MetricRegistry; -@UriEndpoint(scheme = "metrics:counter") +@UriEndpoint(scheme = "metrics") public class CounterEndpoint extends AbstractMetricsEndpoint { public static final String ENDPOINT_URI = "metrics:counter"; http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/histogram/HistogramEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/histogram/HistogramEndpoint.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/histogram/HistogramEndpoint.java index 8024289..c6e7157 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/histogram/HistogramEndpoint.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/histogram/HistogramEndpoint.java @@ -7,7 +7,7 @@ import org.apache.camel.spi.UriParam; import com.codahale.metrics.MetricRegistry; -@UriEndpoint(scheme = "metrics:histogram") +@UriEndpoint(scheme = "metrics") public class HistogramEndpoint extends AbstractMetricsEndpoint { public static String ENDPOINT_URI = "metrics:histogram"; http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/meter/MeterEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/meter/MeterEndpoint.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/meter/MeterEndpoint.java index d0b609e..82c7187 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/meter/MeterEndpoint.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/meter/MeterEndpoint.java @@ -7,7 +7,7 @@ import org.apache.camel.spi.UriParam; import com.codahale.metrics.MetricRegistry; -@UriEndpoint(scheme = "metrics:meter") +@UriEndpoint(scheme = "metrics") public class MeterEndpoint extends AbstractMetricsEndpoint { public static final String ENDPOINT_URI = "metrics:meter"; http://git-wip-us.apache.org/repos/asf/camel/blob/5068b9c0/components/camel-metrics/src/main/java/org/apache/camel/metrics/timer/TimerEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/metrics/timer/TimerEndpoint.java b/components/camel-metrics/src/main/java/org/apache/camel/metrics/timer/TimerEndpoint.java index 6de4e32..7b534c4 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/metrics/timer/TimerEndpoint.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/metrics/timer/TimerEndpoint.java @@ -7,7 +7,7 @@ import org.apache.camel.spi.UriParam; import com.codahale.metrics.MetricRegistry; -@UriEndpoint(scheme = "metrics:timer") +@UriEndpoint(scheme = "metrics") public class TimerEndpoint extends AbstractMetricsEndpoint { public static final String ENDPOINT_URI = "metrics:timer";
