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 82b68d413a1753a53dafc2c0e15db762d00916f1
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jul 25 10:58:37 2019 +0200
Camel-HL7: Use BindToRegistry annotation wherever possible
---
.../camel/component/hl7/HL7ByteArrayRouteTest.java | 21 ++++++++--------
.../component/hl7/HL7MLLPCodecBoundaryTest.java | 9 +++----
.../camel/component/hl7/HL7MLLPCodecLongTest.java | 20 +++++++---------
.../hl7/HL7MLLPCodecMessageFloodingTest.java | 10 ++++----
.../hl7/HL7MLLPCodecStandAndEndBytesTest.java | 11 ++++-----
.../camel/component/hl7/HL7MLLPCodecTest.java | 13 ++++------
.../hl7/HL7MLLPNettyCodecBoundaryTest.java | 23 ++++++++++--------
.../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 23 +++++++++---------
.../component/hl7/HL7MLLPNettyCodecLongTest.java | 22 +++++++++--------
.../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 20 +++++++++-------
.../camel/component/hl7/HL7MLLPNettyCodecTest.java | 26 ++++++++++----------
.../hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 17 +++++++------
.../component/hl7/HL7MLLPNettyRouteToTest.java | 26 ++++++++++----------
.../camel/component/hl7/HL7NettyRouteTest.java | 28 ++++++++++++----------
.../apache/camel/component/hl7/HL7RouteTest.java | 17 +++++++------
15 files changed, 147 insertions(+), 139 deletions(-)
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
index a201b5f..fc913f5 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
@@ -24,6 +24,8 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -36,19 +38,18 @@ import org.junit.Test;
*/
public class HL7ByteArrayRouteTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addHl7MllpCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setProduceString(false);
-
- jndi.bind("hl7codec", codec);
-
- MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
- jndi.bind("hl7service", logic);
-
- return jndi;
+ return codec;
}
+
+ @BindToRegistry("hl7service")
+ public MyHL7BusinessLogic addHl7MllpService() throws Exception {
+
+ return new MyHL7BusinessLogic();
+ }
@Test
public void testSendA19() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
index 709a103..56e53cc 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
@@ -20,6 +20,8 @@ import java.io.BufferedReader;
import java.io.InputStreamReader;
import ca.uhn.hl7v2.model.v25.message.MDM_T02;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -34,12 +36,11 @@ import org.junit.Test;
*/
public class HL7MLLPCodecBoundaryTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addHl7MllpCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("iso-8859-1");
- jndi.bind("hl7codec", codec);
- return jndi;
+ return codec;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
index 60b395c..f24db6d 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
@@ -22,6 +22,8 @@ import java.io.InputStreamReader;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.v25.message.MDM_T02;
import ca.uhn.hl7v2.model.v25.segment.MSH;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -35,18 +37,12 @@ import org.junit.Test;
*/
public class HL7MLLPCodecLongTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // START SNIPPET: e1
- HL7MLLPCodec codec = new HL7MLLPCodec();
- codec.setCharset("iso-8859-1");
-
- jndi.bind("hl7codec", codec);
- // END SNIPPET: e1
-
- return jndi;
- }
+ @BindToRegistry("hl7codec")
+public HL7MLLPCodec addHl7MllpCodec() throws Exception {
+ HL7MLLPCodec codec = new HL7MLLPCodec();
+ codec.setCharset("iso-8859-1");
+ return codec;
+}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
index 1183fc2..4db63f6 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
@@ -26,6 +26,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import ca.uhn.hl7v2.model.Message;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -37,14 +39,12 @@ import org.junit.Test;
*/
public class HL7MLLPCodecMessageFloodingTest extends HL7TestSupport {
-
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addHl7MllpCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("ISO-8859-1");
codec.setConvertLFtoCR(false);
- jndi.bind("hl7codec", codec);
- return jndi;
+ return codec;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
index 4d2a9ac..dcace7d 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
@@ -21,6 +21,8 @@ import ca.uhn.hl7v2.model.v24.message.ADR_A19;
import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -32,8 +34,8 @@ import org.junit.Test;
*/
public class HL7MLLPCodecStandAndEndBytesTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("iso-8859-1");
@@ -42,10 +44,7 @@ public class HL7MLLPCodecStandAndEndBytesTest extends
HL7TestSupport {
codec.setEndByte1('#');
codec.setEndByte2('*');
codec.setConvertLFtoCR(false);
-
- jndi.bind("hl7codec", codec);
-
- return jndi;
+ return codec;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
index 8432ef8..b5d45c1 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
@@ -21,6 +21,8 @@ import ca.uhn.hl7v2.model.v24.message.ADR_A19;
import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -33,18 +35,13 @@ import org.junit.Test;
public class HL7MLLPCodecTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // START SNIPPET: e1
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("iso-8859-1");
codec.setConvertLFtoCR(true);
- jndi.bind("hl7codec", codec);
- // END SNIPPET: e1
-
- return jndi;
+ return codec;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
index 66742f6..5e36515 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
@@ -20,6 +20,8 @@ import java.io.BufferedReader;
import java.io.InputStreamReader;
import ca.uhn.hl7v2.model.v25.message.MDM_T02;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -34,20 +36,21 @@ import org.junit.Test;
*/
public class HL7MLLPNettyCodecBoundaryTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addNettyDecoder() throws Exception {
- // START SNIPPET: e1
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
- jndi.bind("hl7decoder", decoder);
-
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- decoder.setCharset("iso-8859-1");
- jndi.bind("hl7encoder", encoder);
- // END SNIPPET: e1
+
+ return decoder;
- return jndi;
+ }
+
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addNettyEncoder() throws Exception {
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+ encoder.setCharset("iso-8859-1");
+ return encoder;
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
index ef75409..e0b707e 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
@@ -24,6 +24,8 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -36,21 +38,20 @@ import org.junit.Test;
*/
public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7encoder")
+ private HL7MLLPNettyEncoderFactory encoder = new
HL7MLLPNettyEncoderFactory();
+
+ @BindToRegistry("hl7service")
+ private MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
+
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setProduceString(false);
- jndi.bind("hl7decoder", decoder);
-
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- jndi.bind("hl7encoder", encoder);
+ return decoder;
+ }
- MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
- jndi.bind("hl7service", logic);
-
- return jndi;
- }
@Test
public void testSendA19() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
index 06e4b2a..ea770f2 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
@@ -22,6 +22,8 @@ import java.io.InputStreamReader;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.v25.message.MDM_T02;
import ca.uhn.hl7v2.model.v25.segment.MSH;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -34,21 +36,21 @@ import org.junit.Test;
*/
public class HL7MLLPNettyCodecLongTest extends HL7TestSupport {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
- // START SNIPPET: e1
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
- jndi.bind("hl7decoder", decoder);
+ return decoder;
+ }
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- decoder.setCharset("iso-8859-1");
- jndi.bind("hl7encoder", encoder);
- // END SNIPPET: e1
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addEncoder() throws Exception {
- return jndi;
- }
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+ encoder.setCharset("iso-8859-1");
+ return encoder;
+ }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
index 57b8808..e8a1e63 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
@@ -21,6 +21,8 @@ import ca.uhn.hl7v2.model.v24.message.ADR_A19;
import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -31,9 +33,9 @@ import org.junit.Test;
* Unit test for the HL7MLLP Codec using different start and end bytes.
*/
public class HL7MLLPNettyCodecStandAndEndBytesTest extends HL7TestSupport {
-
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
@@ -42,8 +44,11 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
decoder.setEndByte1('#');
decoder.setEndByte2('*');
decoder.setConvertLFtoCR(false);
+ return decoder;
+ }
- jndi.bind("hl7decoder", decoder);
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addEncoder() throws Exception {
HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
encoder.setCharset("iso-8859-1");
@@ -52,11 +57,8 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
encoder.setEndByte1('#');
encoder.setEndByte2('*');
encoder.setConvertLFtoCR(false);
-
- jndi.bind("hl7encoder", encoder);
-
- return jndi;
- }
+ return encoder;
+ }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
index 656e784..2aeb6cd 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
@@ -21,6 +21,8 @@ import ca.uhn.hl7v2.model.v24.message.ADR_A19;
import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -31,24 +33,24 @@ import org.junit.Test;
* Unit test for the HL7MLLPNetty Codec.
*/
public class HL7MLLPNettyCodecTest extends HL7TestSupport {
+
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // START SNIPPET: e1
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
decoder.setConvertLFtoCR(true);
- jndi.bind("hl7decoder", decoder);
+ return decoder;
+ }
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- decoder.setCharset("iso-8859-1");
- decoder.setConvertLFtoCR(true);
- jndi.bind("hl7encoder", encoder);
- // END SNIPPET: e1
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addEncoder() throws Exception {
- return jndi;
- }
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+ encoder.setCharset("iso-8859-1");
+ encoder.setConvertLFtoCR(true);
+ return encoder;
+ }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
index 6fe36f9..9777021 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
@@ -17,6 +17,8 @@
package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.model.Message;
import io.netty.util.ResourceLeakDetector;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -26,6 +28,12 @@ import org.junit.Test;
public class HL7MLLPNettyDecoderResourceLeakTest extends HL7TestSupport {
+ @BindToRegistry("hl7decoder")
+ HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
+
+ @BindToRegistry("hl7encoder")
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+
@BeforeClass
// As the ResourceLeakDetector just write error log when it find the leak,
// We need to check the log file to see if there is a leak.
@@ -33,15 +41,6 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends
HL7TestSupport {
ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.PARANOID);
}
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- jndi.bind("hl7decoder", new HL7MLLPNettyDecoderFactory());
- jndi.bind("hl7encoder", new HL7MLLPNettyEncoderFactory());
-
- return jndi;
- }
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
index 1117f77..15a790b 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
@@ -21,6 +21,8 @@ import ca.uhn.hl7v2.model.v24.message.ADR_A19;
import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -31,24 +33,24 @@ import org.junit.Test;
* Unit test for the HL7MLLPNetty Codec.
*/
public class HL7MLLPNettyRouteToTest extends HL7TestSupport {
+
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // START SNIPPET: e1
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
decoder.setConvertLFtoCR(true);
- jndi.bind("hl7decoder", decoder);
+ return decoder;
+ }
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- decoder.setCharset("iso-8859-1");
- decoder.setConvertLFtoCR(true);
- jndi.bind("hl7encoder", encoder);
- // END SNIPPET: e1
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addEncoder() throws Exception {
- return jndi;
- }
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+ encoder.setCharset("iso-8859-1");
+ encoder.setConvertLFtoCR(true);
+ return encoder;
+ }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
index c9a4ff0..2945dae 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
@@ -24,6 +24,8 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -34,23 +36,25 @@ import org.junit.Test;
* Unit test for HL7 routing.
*/
public class HL7NettyRouteTest extends HL7TestSupport {
-
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+
+ @BindToRegistry("hl7service")
+ MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
+
+ @BindToRegistry("hl7decoder")
+ public HL7MLLPNettyDecoderFactory addDecoder() throws Exception {
HL7MLLPNettyDecoderFactory decoder = new HL7MLLPNettyDecoderFactory();
decoder.setCharset("iso-8859-1");
- jndi.bind("hl7decoder", decoder);
-
- HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
- decoder.setCharset("iso-8859-1");
- jndi.bind("hl7encoder", encoder);
+ return decoder;
+ }
- MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
- jndi.bind("hl7service", logic);
+ @BindToRegistry("hl7encoder")
+ public HL7MLLPNettyEncoderFactory addEncoder() throws Exception {
- return jndi;
- }
+ HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory();
+ encoder.setCharset("iso-8859-1");
+ return encoder;
+ }
@Test
public void testSendA19() throws Exception {
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
index ad771b7..c673ca5 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
@@ -24,6 +24,8 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.model.v24.segment.QRD;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -34,19 +36,16 @@ import org.junit.Test;
* Unit test for HL7 routing.
*/
public class HL7RouteTest extends HL7TestSupport {
-
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ @BindToRegistry("hl7service")
+ MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
+
+ @BindToRegistry("hl7codec")
+ public HL7MLLPCodec addCodec() throws Exception {
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("iso-8859-1");
- jndi.bind("hl7codec", codec);
-
- MyHL7BusinessLogic logic = new MyHL7BusinessLogic();
- jndi.bind("hl7service", logic);
-
- return jndi;
+ return codec;
}
@Test
