From commits-return-63003-archive-asf-public=cust-asf.ponee.io@camel.apache.org Thu May 17 11:28:52 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 32E5E1807B4 for ; Thu, 17 May 2018 11:28:51 +0200 (CEST) Received: (qmail 12181 invoked by uid 500); 17 May 2018 09:28:50 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 11618 invoked by uid 99); 17 May 2018 09:28:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2018 09:28:49 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8610586264; Thu, 17 May 2018 09:28:48 +0000 (UTC) Date: Thu, 17 May 2018 09:28:58 +0000 To: "commits@camel.apache.org" Subject: [camel] 11/16: CAMEL-11600:reverted too much (sigh...). Redo last commit on master MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: acosentino@apache.org In-Reply-To: <152654932753.30439.12529839093850638894@gitbox.apache.org> References: <152654932753.30439.12529839093850638894@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 0b58e3fa04d1b1062a5f38e6e83cff56fe050cc7 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180517092848.8610586264@gitbox.apache.org> 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 0b58e3fa04d1b1062a5f38e6e83cff56fe050cc7 Author: Christian Ohr AuthorDate: Wed May 16 16:39:01 2018 +0200 CAMEL-11600:reverted too much (sigh...). Redo last commit on master --- .../java/org/apache/camel/component/metrics/CounterRouteTest.java | 2 +- .../apache/camel/component/metrics/MetricsComponentRouteTest.java | 4 ++-- .../org/apache/camel/component/metrics/MetricsComponentTest.java | 6 +++--- 3 files changed, 6 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 4804a2c..fcff3c0 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 headers = new HashMap(); + Map headers = new HashMap<>(); 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 26fadb8..0d50e9e 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 headers = new HashMap(); + Map headers = new HashMap<>(); 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 headers = new HashMap(); + Map headers = new HashMap<>(); 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 906960e..e5bee00 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 params = new HashMap(); + Map params = new HashMap<>(); 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 params = new HashMap(); + Map params = new HashMap<>(); 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<>(); params.put("increment", value + 1); params.put("decrement", value - 1); -- To stop receiving notification emails like this one, please contact acosentino@apache.org.