This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch mock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1fac2390964f407e281434ef7bec26177c4dd5c9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 16 22:32:54 2019 +0200
Move mock component out of camel-core. Work in progress.
---
.../java/org/apache/camel/cdi/XmlCdiBeanFactory.java | 5 ++---
.../org/apache/camel/cdi/XmlProxyFactoryBean.java | 20 +++++---------------
.../org/apache/camel/processor/jpa/JpaRouteTest.java | 6 ++----
.../camel/component/slack/SlackConsumerTest.java | 4 +---
4 files changed, 10 insertions(+), 25 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index 3386a1e..22ede86 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -270,10 +270,9 @@ final class XmlCdiBeanFactory {
}
private SyntheticBean<?> proxyFactoryBean(Bean<?> context,
CamelProxyFactoryDefinition proxy, URL url) {
- if (isEmpty(proxy.getServiceRef()) && isEmpty(proxy.getServiceUrl())) {
+ if (isEmpty(proxy.getServiceUrl())) {
throw new CreationException(
- format("Missing [%s] or [%s] attribute for imported bean [%s]
from resource [%s]",
- "serviceRef", "serviceUrl", proxy.getId(), url));
+ format("Missing serviceUrl attribute for imported bean [%s]
from resource [%s]", proxy.getId(), url));
}
return new XmlProxyFactoryBean<>(manager,
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
index 8d6a891..1df4402 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
@@ -59,33 +59,23 @@ final class XmlProxyFactoryBean<T> extends SyntheticBean<T>
{
: getReference(manager, CamelContext.class, this.context);
Endpoint endpoint;
- if (isNotEmpty(proxy.getServiceRef())) {
- endpoint =
context.getRegistry().lookupByNameAndType(proxy.getServiceRef(),
Endpoint.class);
+ if (isNotEmpty(proxy.getServiceUrl())) {
+ endpoint = context.getEndpoint(proxy.getServiceUrl());
} else {
- if (isNotEmpty(proxy.getServiceUrl())) {
- endpoint = context.getEndpoint(proxy.getServiceUrl());
- } else {
- throw new IllegalStateException("serviceUrl or serviceRef
must not be empty!");
- }
+ throw new IllegalStateException("serviceUrl must not be
empty!");
}
if (endpoint == null) {
- throw new UnsatisfiedResolutionException("Could not resolve
endpoint: "
- + (isNotEmpty(proxy.getServiceRef())
- ? proxy.getServiceRef()
- : proxy.getServiceUrl()));
+ throw new UnsatisfiedResolutionException("Could not resolve
endpoint: " + proxy.getServiceUrl());
}
- // binding is enabled by default
- boolean bind = proxy.getBinding() != null ? proxy.getBinding() :
true;
-
try {
// Start the endpoint before we create the producer
startService(endpoint);
Producer producer = endpoint.createProducer();
// Add and start the producer
context.addService(producer, true, true);
- return createProxy(endpoint, bind, producer, (Class<T>)
proxy.getServiceInterface());
+ return createProxy(endpoint, true, producer, (Class<T>)
proxy.getServiceInterface());
} catch (Exception cause) {
throw new FailedToCreateProducerException(endpoint, cause);
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
index 946f492..20690ff 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.processor.jpa;
import javax.persistence.EntityManager;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.ValueBuilder;
import org.apache.camel.component.jpa.JpaComponent;
import org.apache.camel.component.jpa.JpaConstants;
import org.apache.camel.component.mock.MockEndpoint;
@@ -39,9 +38,8 @@ public class JpaRouteTest extends AbstractJpaTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- ValueBuilder header =
mock.message(0).header(JpaConstants.ENTITY_MANAGER);
- header.isNotNull();
- header.isInstanceOf(EntityManager.class);
+ mock.message(0).header(JpaConstants.ENTITY_MANAGER).isNotNull();
+
mock.message(0).header(JpaConstants.ENTITY_MANAGER).isInstanceOf(EntityManager.class);
template.sendBody("direct:start", new
SendEmail("some...@somewhere.org"));
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
index 7be92ea..db29797 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
@@ -34,8 +34,6 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-
-
public class SlackConsumerTest extends CamelTestSupport {
private String token;
@@ -57,7 +55,7 @@ public class SlackConsumerTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
-
mock.message(0).body(SlackMessage.class).method("getText").isEqualTo(message);
+ mock.message(0).simple("${body.getText()}").isEqualTo(message);
assertMockEndpointsSatisfied();
}
