This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cbae5439a20ff1e1e8939c6482e7eee50e953b8a
Author: Christian Ohr <christian....@gmail.com>
AuthorDate: Wed May 16 16:15:06 2018 +0200
CAMEL-11600:revert accidental changes to camel-metrics
---
.../camel/component/metrics/CounterRouteTest.java | 2 +-
.../metrics/MetricsComponentRouteTest.java | 4 +--
.../component/metrics/MetricsComponentTest.java | 6 ++--
.../camel/component/metrics/MetricsTypeTest.java | 35 ++++++++++++++++++++++
4 files changed, 41 insertions(+), 6 deletions(-)
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
index fcff3c0..4804a2c 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
@@ -154,7 +154,7 @@ public class CounterRouteTest {
public void testOverrideIncrementAndDecrement() throws Exception {
when(mockRegistry.counter("A")).thenReturn(mockCounter);
endpoint.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<>();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put(HEADER_COUNTER_INCREMENT, 912L);
headers.put(HEADER_COUNTER_DECREMENT, 43219L);
producer1.sendBodyAndHeaders(new Object(), headers);
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 0d50e9e..26fadb8 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
@@ -58,7 +58,7 @@ public class MetricsComponentRouteTest extends
CamelTestSupport {
mock.expectedBodiesReceived(body);
mock.expectedHeaderReceived(header1, value1);
mock.expectedHeaderReceived(header2, value2);
- Map<String, Object> headers = new HashMap<>();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put(header1, value1);
headers.put(header2, value2);
template1.sendBodyAndHeaders(body, headers);
@@ -75,7 +75,7 @@ public class MetricsComponentRouteTest extends
CamelTestSupport {
mock.expectedHeaderReceived("." + HEADER_PREFIX, "value");
mock.expectedHeaderReceived("date", now);
- Map<String, Object> headers = new HashMap<>();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put(HEADER_METRIC_NAME, "a name");
headers.put(HEADER_HISTOGRAM_VALUE, 34L);
headers.put(HEADER_PREFIX + "notExistingHeader", "?");
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
index e5bee00..906960e 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
@@ -69,7 +69,7 @@ public class MetricsComponentTest {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
- Map<String, Object> params = new HashMap<>();
+ Map<String, Object> params = new HashMap<String, Object>();
Long value = System.currentTimeMillis();
params.put("mark", value);
Endpoint result = component.createEndpoint("metrics:meter:long.meter",
"meter:long.meter", params);
@@ -90,7 +90,7 @@ public class MetricsComponentTest {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
- Map<String, Object> params = new HashMap<>();
+ Map<String, Object> params = new HashMap<String, Object>();
Long value = System.currentTimeMillis();
params.put("mark", value);
Endpoint result = component.createEndpoint("metrics:meter:long.meter",
"meter:long.meter", params);
@@ -101,7 +101,7 @@ public class MetricsComponentTest {
assertThat(me.getMetricsName(), is("long.meter"));
assertThat(me.getRegistry(), is(metricRegistry));
- params = new HashMap<>();
+ params = new HashMap<String, Object>();
params.put("increment", value + 1);
params.put("decrement", value - 1);
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
new file mode 100644
index 0000000..2e77114
--- /dev/null
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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;
+
+import java.util.EnumSet;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class MetricsTypeTest {
+
+ @Test
+ public void testGetByName() throws Exception {
+ for (MetricsType type : EnumSet.allOf(MetricsType.class)) {
+ MetricsType t = MetricsType.getByName(type.toString());
+ assertThat(t, is(type));
+ }
+ }
+}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
