CAMEL-7554: Introduced constants class for constants. Fixed CS.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3373b6f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3373b6f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3373b6f3 Branch: refs/heads/master Commit: 3373b6f357a512bc9dd323f87ffd70563a906c5d Parents: acf0fa3 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jul 30 14:23:45 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jul 30 14:23:45 2014 +0200 ---------------------------------------------------------------------- .../metrics/AbstractMetricsProducer.java | 4 +-- .../component/metrics/MetricsComponent.java | 12 ++------ .../component/metrics/MetricsConstants.java | 32 ++++++++++++++++++++ .../metrics/counter/CounterProducer.java | 5 +-- .../metrics/histogram/HistogramProducer.java | 3 +- .../component/metrics/meter/MeterProducer.java | 3 +- .../component/metrics/timer/TimerProducer.java | 3 +- .../metrics/AbstractMetricsProducerTest.java | 4 +-- .../metrics/MetricsComponentRouteTest.java | 6 ++-- .../metrics/counter/CounterProducerTest.java | 4 +-- .../metrics/counter/CounterRouteTest.java | 7 +++-- .../histogram/HistogramProducerTest.java | 2 +- .../metrics/histogram/HistogramRouteTest.java | 5 +-- .../metrics/meter/MeterProducerTest.java | 2 +- .../component/metrics/meter/MeterRouteTest.java | 5 +-- .../metrics/timer/TimerProducerTest.java | 2 +- .../component/metrics/timer/TimerRouteTest.java | 7 +++-- 17 files changed, 70 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/AbstractMetricsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/AbstractMetricsProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/AbstractMetricsProducer.java index 539847a..4ee8b21 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/AbstractMetricsProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/AbstractMetricsProducer.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public abstract class AbstractMetricsProducer<T extends AbstractMetricsEndpoint> extends DefaultProducer { - public static final String HEADER_PATTERN = MetricsComponent.HEADER_PERFIX + "*"; + public static final String HEADER_PATTERN = MetricsConstants.HEADER_PERFIX + "*"; private static final Logger LOG = LoggerFactory.getLogger(AbstractMetricsProducer.class); public AbstractMetricsProducer(T endpoint) { @@ -54,7 +54,7 @@ public abstract class AbstractMetricsProducer<T extends AbstractMetricsEndpoint> protected abstract void doProcess(Exchange exchange, T endpoint, MetricRegistry registry, String metricsName) throws Exception; public String getMetricsName(Message in, String defaultValue) { - return getStringHeader(in, MetricsComponent.HEADER_METRIC_NAME, defaultValue); + return getStringHeader(in, MetricsConstants.HEADER_METRIC_NAME, defaultValue); } public String getStringHeader(Message in, String header, String defaultValue) { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java index bb2813a..962721e 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java @@ -18,35 +18,29 @@ package org.apache.camel.component.metrics; import java.util.Map; import java.util.concurrent.TimeUnit; + import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Slf4jReporter; import org.apache.camel.Endpoint; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.impl.DefaultComponent; import org.apache.camel.component.metrics.counter.CounterEndpoint; import org.apache.camel.component.metrics.histogram.HistogramEndpoint; import org.apache.camel.component.metrics.meter.MeterEndpoint; import org.apache.camel.component.metrics.timer.TimerEndpoint; +import org.apache.camel.impl.DefaultComponent; import org.apache.camel.spi.Registry; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Represents the component that manages {@link MetricsEndpoint}. + * Represents the component that manages metrics endpoints. */ public class MetricsComponent extends DefaultComponent { public static final String METRIC_REGISTRY_NAME = "metricRegistry"; public static final MetricsType DEFAULT_METRICS_TYPE = MetricsType.METER; public static final long DEFAULT_REPORTING_INTERVAL_SECONDS = 60L; - public static final String HEADER_PERFIX = "CamelMetrics"; - public static final String HEADER_METRIC_NAME = HEADER_PERFIX + "Name"; - public static final String HEADER_COUNTER_INCREMENT = HEADER_PERFIX + "CounterIncrement"; - public static final String HEADER_COUNTER_DECREMENT = HEADER_PERFIX + "CounterDecrement"; - public static final String HEADER_HISTOGRAM_VALUE = HEADER_PERFIX + "HistogramValue"; - public static final String HEADER_METER_MARK = HEADER_PERFIX + "MeterMark"; - public static final String HEADER_TIMER_ACTION = HEADER_PERFIX + "TimerAction"; private static final Logger LOG = LoggerFactory.getLogger(MetricsComponent.class); http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsConstants.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsConstants.java new file mode 100644 index 0000000..0bfe35f --- /dev/null +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsConstants.java @@ -0,0 +1,32 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.metrics; + +public final class MetricsConstants { + + public static final String HEADER_PERFIX = "CamelMetrics"; + public static final String HEADER_TIMER_ACTION = HEADER_PERFIX + "TimerAction"; + public static final String HEADER_METER_MARK = HEADER_PERFIX + "MeterMark"; + public static final String HEADER_HISTOGRAM_VALUE = HEADER_PERFIX + "HistogramValue"; + public static final String HEADER_COUNTER_DECREMENT = HEADER_PERFIX + "CounterDecrement"; + public static final String HEADER_COUNTER_INCREMENT = HEADER_PERFIX + "CounterIncrement"; + public static final String HEADER_METRIC_NAME = HEADER_PERFIX + "Name"; + + private MetricsConstants() { + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/counter/CounterProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/counter/CounterProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/counter/CounterProducer.java index 5a9dd42..7525866 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/counter/CounterProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/counter/CounterProducer.java @@ -22,8 +22,9 @@ import com.codahale.metrics.MetricRegistry; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.metrics.AbstractMetricsProducer; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_DECREMENT; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_INCREMENT; + +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT; public class CounterProducer extends AbstractMetricsProducer<CounterEndpoint> { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/histogram/HistogramProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/histogram/HistogramProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/histogram/HistogramProducer.java index 161da92..530e934 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/histogram/HistogramProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/histogram/HistogramProducer.java @@ -24,7 +24,8 @@ import org.apache.camel.Message; import org.apache.camel.component.metrics.AbstractMetricsProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_HISTOGRAM_VALUE; + +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; public class HistogramProducer extends AbstractMetricsProducer<HistogramEndpoint> { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/meter/MeterProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/meter/MeterProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/meter/MeterProducer.java index b3474bb..f6becca 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/meter/MeterProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/meter/MeterProducer.java @@ -21,7 +21,8 @@ import com.codahale.metrics.MetricRegistry; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.component.metrics.AbstractMetricsProducer; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METER_MARK; + +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK; public class MeterProducer extends AbstractMetricsProducer<MeterEndpoint> { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/timer/TimerProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/timer/TimerProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/timer/TimerProducer.java index 57cf471..1254cbe 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/timer/TimerProducer.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/timer/TimerProducer.java @@ -24,7 +24,8 @@ import org.apache.camel.component.metrics.AbstractMetricsProducer; import org.apache.camel.component.metrics.timer.TimerEndpoint.TimerAction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_TIMER_ACTION; + +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION; import static org.apache.camel.component.metrics.timer.TimerEndpoint.ENDPOINT_URI; public class TimerProducer extends AbstractMetricsProducer<TimerEndpoint> { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java index f651389..d441c24 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java @@ -28,8 +28,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.AbstractMetricsProducer.HEADER_PATTERN; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_HISTOGRAM_VALUE; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java index 9fed201..7b14213 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java @@ -25,9 +25,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_HISTOGRAM_VALUE; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_PERFIX; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_PERFIX; public class MetricsComponentRouteTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterProducerTest.java index 005ae65..4878cde 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterProducerTest.java @@ -27,8 +27,8 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_DECREMENT; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_INCREMENT; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterRouteTest.java index c33ec39..0540822 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/counter/CounterRouteTest.java @@ -39,10 +39,11 @@ import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_DECREMENT; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_COUNTER_INCREMENT; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; + import static org.apache.camel.component.metrics.MetricsComponent.METRIC_REGISTRY_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramProducerTest.java index 6665796..e048979 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramProducerTest.java @@ -27,7 +27,7 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_HISTOGRAM_VALUE; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramRouteTest.java index ee5dad8..a27107d 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/histogram/HistogramRouteTest.java @@ -36,9 +36,10 @@ import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_HISTOGRAM_VALUE; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; + import static org.apache.camel.component.metrics.MetricsComponent.METRIC_REGISTRY_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterProducerTest.java index 1392768..7e6e910 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterProducerTest.java @@ -27,7 +27,7 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METER_MARK; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterRouteTest.java index 86076e7..382d29a 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/meter/MeterRouteTest.java @@ -36,9 +36,10 @@ import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METER_MARK; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; + import static org.apache.camel.component.metrics.MetricsComponent.METRIC_REGISTRY_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerProducerTest.java index df94fef..3a09f8b 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerProducerTest.java @@ -28,7 +28,7 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_TIMER_ACTION; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; http://git-wip-us.apache.org/repos/asf/camel/blob/3373b6f3/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerRouteTest.java index b6941b5..1fc46b1 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/timer/TimerRouteTest.java @@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.metrics.timer.TimerEndpoint.TimerAction; +import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner; @@ -37,9 +37,10 @@ import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_METRIC_NAME; -import static org.apache.camel.component.metrics.MetricsComponent.HEADER_TIMER_ACTION; + import static org.apache.camel.component.metrics.MetricsComponent.METRIC_REGISTRY_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; +import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when;
