You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/02 08:44:16 UTC
[camel] branch master updated (22fd657 -> bfbc97a)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 22fd657 Camel-Undertow: Added camel-mock as test dependency
new f4ea2b6 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Web3j
new bfbc97a Removed unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/web3j/Web3jMockTestSupport.java | 10 ++--------
.../apache/camel/component/web3j/Web3jQuorumProducerTest.java | 10 ++--------
2 files changed, 4 insertions(+), 16 deletions(-)
[camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Web3j
Posted by ac...@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 f4ea2b6957f32ffd683d0869fc2d9d3ca250f52f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 10:42:12 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Web3j
---
.../org/apache/camel/component/web3j/Web3jMockTestSupport.java | 9 ++-------
.../apache/camel/component/web3j/Web3jQuorumProducerTest.java | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 6080dd0..53d2f80 100755
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.web3j;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
@@ -39,6 +40,7 @@ public class Web3jMockTestSupport extends CamelTestSupport {
protected MockEndpoint mockError;
@Mock
+ @BindToRegistry("mockWeb3j")
protected Web3j mockWeb3j;
@Mock
@@ -49,13 +51,6 @@ public class Web3jMockTestSupport extends CamelTestSupport {
return true;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("mockWeb3j", mockWeb3j);
- return registry;
- }
-
protected String getUrl() {
return "web3j://http://127.0.0.1:8545?web3j=#mockWeb3j&";
}
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
index 3f8965d..033a8d7 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.web3j;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
@@ -42,6 +43,7 @@ import static org.mockito.ArgumentMatchers.any;
public class Web3jQuorumProducerTest extends Web3jMockTestSupport {
@Mock
+ @BindToRegistry("mockQuorum")
protected Quorum mockQuorum;
@Produce("direct:start")
@@ -55,13 +57,6 @@ public class Web3jQuorumProducerTest extends Web3jMockTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("mockQuorum", mockQuorum);
- return registry;
- }
-
- @Override
public boolean isUseAdviceWith() {
return false;
}
[camel] 02/02: Removed unused imports
Posted by ac...@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 bfbc97a96df24fbe366bd1a15b1fa59c987c8418
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 10:43:49 2019 +0200
Removed unused imports
---
.../test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java | 1 -
.../java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 53d2f80..5824457 100755
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -20,7 +20,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
index 033a8d7..4374a3c 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;