[camel] branch exchange-factory updated: CAMEL-16222: camel-core - ExchangeFactory SPI

[da...@apache.org]

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


The following commit(s) were added to refs/heads/exchange-factory by this push:
     new f6c9b93  CAMEL-16222: camel-core - ExchangeFactory SPI
f6c9b93 is described below

commit f6c9b936c17d9402707d6f5b70ad98b90191710c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 17 13:00:00 2021 +0100

    CAMEL-16222: camel-core - ExchangeFactory SPI
---
 .../java/org/apache/camel/component/mock/MockAsBeanTest.java | 12 +++---------
 .../processor/RecipientListWithSimpleExpressionTest.java     |  2 ++
 .../main/java/org/apache/camel/support/DefaultEndpoint.java  |  4 +++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
index a4bf701..20ca056 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
@@ -21,20 +21,12 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.ExpressionBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spi.Registry;
 import org.junit.jupiter.api.Test;
 
 public class MockAsBeanTest extends ContextTestSupport {
 
     // create foo bean as a mock endpoint
-    private MockEndpoint foo = new MockEndpoint("mock:foo", new MockComponent(context));
-
-    @Override
-    protected Registry createRegistry() throws Exception {
-        Registry jndi = super.createRegistry();
-        jndi.bind("foo", foo);
-        return jndi;
-    }
+    private MockEndpoint foo = new MockEndpoint("mock:foo", new MockComponent());
 
     // START SNIPPET: e1
     @Test
@@ -63,6 +55,8 @@ public class MockAsBeanTest extends ContextTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
+                context.getRegistry().bind("foo", foo);
+
                 from("direct:start")
                         // send to foo bean
                         .bean("foo")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithSimpleExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithSimpleExpressionTest.java
index 6fbef28..f36ba0e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithSimpleExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithSimpleExpressionTest.java
@@ -40,6 +40,7 @@ public class RecipientListWithSimpleExpressionTest extends ContextTestSupport {
             }
         });
         context.start();
+        template.start();
 
         for (int i = 0; i < 10; i++) {
             getMockEndpoint("mock:" + i).expectedMessageCount(50);
@@ -92,6 +93,7 @@ public class RecipientListWithSimpleExpressionTest extends ContextTestSupport {
             }
         });
         context.start();
+        template.start();
 
         for (int i = 0; i < 10; i++) {
             getMockEndpoint("mock:" + i).expectedMessageCount(50);
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 ea20389..aa777e9 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
@@ -101,7 +101,9 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
         this.setEndpointUri(endpointUri);
         if (component != null) {
             this.camelContext = component.getCamelContext();
-            this.exchangeFactory = camelContext.adapt(ExtendedCamelContext.class).getExchangeFactory();
+            if (this.camelContext != null) {
+                this.exchangeFactory = camelContext.adapt(ExtendedCamelContext.class).getExchangeFactory();
+            }
         }
     }