[camel] branch master updated: CAMEL-14354: Optimize core and fixed test

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new c892e86  CAMEL-14354: Optimize core and fixed test
c892e86 is described below

commit c892e864196a4c15db816daa0cbbf1c8496b0cfe
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 18 20:15:48 2020 +0100

    CAMEL-14354: Optimize core and fixed test
---
 .../metrics/MicroProfileMetricsExchangeRecorderTest.java       | 10 ----------
 .../org/apache/camel/component/undertow/ExchangeHeaders.java   |  1 +
 core/camel-api/src/main/java/org/apache/camel/Exchange.java    |  1 +
 .../camel/management/ManagedDefaultReactiveExecutorTest.java   |  2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git 
a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java
 
b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java
index 20220b5..dd82b5c 100644
--- 
a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java
+++ 
b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsExchangeRecorderTest.java
@@ -80,16 +80,6 @@ public class MicroProfileMetricsExchangeRecorderTest extends 
MicroProfileMetrics
     }
 
     @Test
-    public void testMetricsRecorderExternalRedeliveries() {
-        Exchange exchange = ExchangeBuilder.anExchange(context)
-            .withProperty(Exchange.EXTERNAL_REDELIVERED, true)
-            .build();
-        recorder.recordExchangeComplete(exchange);
-        Counter externalRedeliveries = getCounter(CAMEL_METRIC_PREFIX + 
EXCHANGES_EXTERNAL_REDELIVERIES_METRIC_NAME, TAGS);
-        assertEquals(1, externalRedeliveries.getCount());
-    }
-
-    @Test
     public void testMetricsRecorderFailuresHandled() {
         Exchange exchange = ExchangeBuilder.anExchange(context)
             .withProperty(Exchange.FAILURE_HANDLED, true)
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
index 08d7bbe..ad3d373 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
@@ -64,6 +64,7 @@ public final class ExchangeHeaders {
     public static final HttpString EXCEPTION_HANDLED = new 
HttpString("CamelExceptionHandled");
     public static final HttpString EVALUATE_EXPRESSION_RESULT = new 
HttpString("CamelEvaluateExpressionResult");
     public static final HttpString ERRORHANDLER_HANDLED = new 
HttpString("CamelErrorHandlerHandled");
+    @Deprecated
     public static final HttpString EXTERNAL_REDELIVERED = new 
HttpString("CamelExternalRedelivered");
 
     public static final HttpString FAILURE_HANDLED = new 
HttpString("CamelFailureHandled");
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java 
b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 49ab34e..161932f 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -119,6 +119,7 @@ public interface Exchange {
     String EVALUATE_EXPRESSION_RESULT    = "CamelEvaluateExpressionResult";
     String ERRORHANDLER_CIRCUIT_DETECTED = "CamelFErrorHandlerCircuitDetected";
     String ERRORHANDLER_HANDLED          = "CamelErrorHandlerHandled";
+    @Deprecated
     String EXTERNAL_REDELIVERED          = "CamelExternalRedelivered";
 
     String FAILURE_HANDLED      = "CamelFailureHandled";
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDefaultReactiveExecutorTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDefaultReactiveExecutorTest.java
index a6cb317..a9eb455 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDefaultReactiveExecutorTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDefaultReactiveExecutorTest.java
@@ -56,7 +56,7 @@ public class ManagedDefaultReactiveExecutorTest extends 
ManagementTestSupport {
                             assertEquals(1, running.intValue());
 
                             // should be 0 pending
-                            Long pending = (Long) mbeanServer.getAttribute(on, 
"PendingTasks");
+                            Integer pending = (Integer) 
mbeanServer.getAttribute(on, "PendingTasks");
                             assertEquals(0, pending.intValue());
                         }
                     })