This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch exchange-factory in repository https://gitbox.apache.org/repos/asf/camel.git
commit 782b0c0d44aa0d95508877af2f2e24bba11c3d55 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Feb 17 11:22:30 2021 +0100 CAMEL-16222: camel-core - ExchangeFactory SPI --- .../camel/component/dataset/DataSetEndpoint.java | 4 +- .../apache/camel/component/mock/MockEndpoint.java | 52 ++++++++++------------ .../org/apache/camel/support/DefaultEndpoint.java | 6 ++- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java index 1f13b95..bc53fdb 100644 --- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java +++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java @@ -102,7 +102,9 @@ public class DataSetEndpoint extends MockEndpoint implements Service { @Override public void reset() { super.reset(); - receivedCounter.set(0); + if (receivedCounter != null) { + receivedCounter.set(0); + } } @Override diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java index 9ffb2df..10d2c81 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java @@ -144,12 +144,12 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, private boolean copyOnExchange = true; public MockEndpoint() { - init(); + reset(); } public MockEndpoint(String endpointUri, Component component) { super(endpointUri, component); - init(); + reset(); } /** @@ -308,7 +308,28 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, } public void reset() { - doInit(); + expectedCount = -1; + counter = 0; + defaultProcessor = null; + processors = new HashMap<>(); + receivedExchanges = new CopyOnWriteArrayList<>(); + failures = new CopyOnWriteArrayList<>(); + tests = new CopyOnWriteArrayList<>(); + latch = null; + failFastAssertionError = null; + sleepForEmptyTest = 0; + resultWaitTime = 0; + resultMinimumWaitTime = 0L; + assertPeriod = 0L; + expectedMinimumCount = -1; + expectedBodyValues = null; + actualBodyValues = new ArrayList<>(); + expectedHeaderValues = null; + actualHeaderValues = null; + expectedPropertyValues = null; + actualPropertyValues = null; + retainFirst = -1; + retainLast = -1; } // Testing API @@ -1516,31 +1537,6 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, // Implementation methods // ------------------------------------------------------------------------- - @Override - protected void doInit() { - expectedCount = -1; - counter = 0; - defaultProcessor = null; - processors = new HashMap<>(); - receivedExchanges = new CopyOnWriteArrayList<>(); - failures = new CopyOnWriteArrayList<>(); - tests = new CopyOnWriteArrayList<>(); - latch = null; - failFastAssertionError = null; - sleepForEmptyTest = 0; - resultWaitTime = 0; - resultMinimumWaitTime = 0L; - assertPeriod = 0L; - expectedMinimumCount = -1; - expectedBodyValues = null; - actualBodyValues = new ArrayList<>(); - expectedHeaderValues = null; - actualHeaderValues = null; - expectedPropertyValues = null; - actualPropertyValues = null; - retainFirst = -1; - retainLast = -1; - } protected synchronized void onExchange(Exchange exchange) { try { diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java index ae48c58..ea20389 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java @@ -97,10 +97,12 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint * @param component the component that created this endpoint */ protected DefaultEndpoint(String endpointUri, Component component) { - this.camelContext = component == null ? null : component.getCamelContext(); this.component = component; - this.exchangeFactory = camelContext.adapt(ExtendedCamelContext.class).getExchangeFactory(); this.setEndpointUri(endpointUri); + if (component != null) { + this.camelContext = component.getCamelContext(); + this.exchangeFactory = camelContext.adapt(ExtendedCamelContext.class).getExchangeFactory(); + } } /**
