Author: davsclaus
Date: Wed Sep 5 07:08:21 2012
New Revision: 1381034
URL: http://svn.apache.org/viewvc?rev=1381034&view=rev
Log:
CAMEL-5304: camel-hl7 line terminator default changed. Thanks to Christian Ohr
for the patch.
Added:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
(with props)
Modified:
camel/trunk/components/camel-hl7/ (props changed)
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPConfig.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java
Propchange: camel/trunk/components/camel-hl7/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 5 07:08:21 2012
@@ -14,3 +14,5 @@ eclipse-classes
*.ipr
*.iml
*.iws
+*.idea
+id_file
Modified:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java
(original)
+++
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java
Wed Sep 5 07:08:21 2012
@@ -18,12 +18,14 @@ package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.validation.ValidationContext;
+import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ValueBuilder;
+import org.apache.camel.support.ExpressionAdapter;
public final class HL7 {
-
+
private HL7() {
// Helper class
}
@@ -40,11 +42,25 @@ public final class HL7 {
return new AckExpression(code);
}
- public static Expression ack(AckCode code, String errorMessage, int
errorCode) {
+ public static Expression convertLFToCR() {
+ return new ExpressionAdapter() {
+
+ @Override
+ public Object evaluate(Exchange exchange) {
+ String s = exchange.getIn().getBody(String.class);
+ return s != null ? s.replace('\n', '\r') : null;
+ }
+
+ };
+ }
+
+ public static Expression ack(AckCode code, String errorMessage,
+ int errorCode) {
return new AckExpression(code, errorMessage, errorCode);
}
- public static Predicate messageConformsTo(ValidationContext
validationContext) {
+ public static Predicate messageConformsTo(
+ ValidationContext validationContext) {
return new ValidationContextPredicate(validationContext);
}
Modified:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
(original)
+++
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
Wed Sep 5 07:08:21 2012
@@ -44,8 +44,6 @@ public final class HL7Converter {
}
static Message parse(String body, Parser parser) throws HL7Exception {
- // replace \n with \r as HL7 uses 0x0d = \r as segment terminators and
HAPI only parses with \r
- body = body.replace('\n', '\r');
return parser.parse(body);
}
Modified:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java
(original)
+++
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java
Wed Sep 5 07:08:21 2012
@@ -40,7 +40,6 @@ import org.apache.mina.filter.codec.Prot
* <p/>
* The encoder is used for encoding from String to MLLP (bytes). The String
should <b>not</b> contain
* any of the start and end markers, the encoder will add these, and stream
the string as bytes.
- * Also the enocder will convert any <tt>\n</tt> (line breaks) as segment
terminators to <tt>\r</tt>.
* <p/>
* This codes supports charset encoding/decoding between bytes and String. The
JVM platform default charset
* is used, but the charset can be configued on this codec using the setter
method.
Modified:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPConfig.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPConfig.java
(original)
+++
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPConfig.java
Wed Sep 5 07:08:21 2012
@@ -26,7 +26,7 @@ class HL7MLLPConfig {
private Charset charset = Charset.defaultCharset();
- private boolean convertLFtoCR = true;
+ private boolean convertLFtoCR;
// HL7 MLLP start and end markers
private char startByte = 0x0b; // 11 decimal
Modified:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
(original)
+++
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
Wed Sep 5 07:08:21 2012
@@ -69,6 +69,9 @@ class HL7MLLPDecoder extends CumulativeP
try {
String body = in.getString(state.length(),
charsetDecoder(session));
LOG.debug("Decoded HL7 from byte stream of length {} to String of
length {}", state.length(), body.length());
+ if (config.isConvertLFtoCR()) {
+ body = body.replace('\n', '\r');
+ }
out.write(body);
// Avoid redelivery of scanned message
state.reset();
@@ -79,7 +82,7 @@ class HL7MLLPDecoder extends CumulativeP
private CharsetDecoder charsetDecoder(IoSession session) {
// convert to string using the charset decoder
- CharsetDecoder decoder =
(CharsetDecoder)session.getAttribute(CHARSET_DECODER);
+ CharsetDecoder decoder = (CharsetDecoder)
session.getAttribute(CHARSET_DECODER);
if (decoder == null) {
decoder = config.getCharset().newDecoder();
session.setAttribute(CHARSET_DECODER, decoder);
@@ -90,7 +93,7 @@ class HL7MLLPDecoder extends CumulativeP
/**
* Scans the buffer for start and end bytes and stores its position in the
* session state object.
- *
+ *
* @return <code>true</code> if the end bytes were found,
<code>false</code>
* otherwise
*/
@@ -122,7 +125,7 @@ class HL7MLLPDecoder extends CumulativeP
// Check end byte2
if (b == config.getEndByte2() && state.waitingForEndByte2) {
state.posEnd = in.position() - 2; // use -2 to skip these
- // last 2 end markers
+ // last 2 end markers
state.waitingForEndByte2 = false;
LOG.debug("Message ends at position {}", state.posEnd);
break;
@@ -135,7 +138,7 @@ class HL7MLLPDecoder extends CumulativeP
}
private DecoderState decoderState(IoSession session) {
- DecoderState decoderState =
(DecoderState)session.getAttribute(DECODER_STATE);
+ DecoderState decoderState = (DecoderState)
session.getAttribute(DECODER_STATE);
if (decoderState == null) {
decoderState = new DecoderState();
session.setAttribute(DECODER_STATE, decoderState);
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java
Wed Sep 5 07:08:21 2012
@@ -18,7 +18,6 @@ package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.HL7Exception;
import ca.uhn.hl7v2.model.v24.message.ACK;
import ca.uhn.hl7v2.model.v24.message.ADT_A01;
-import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import org.apache.camel.builder.RouteBuilder;
@@ -104,17 +103,7 @@ public class AckExpressionTest extends C
private static ADT_A01 createADT01Message() throws Exception {
ADT_A01 adt = new ADT_A01();
-
- // Populate the MSH Segment
- MSH mshSegment = adt.getMSH();
- mshSegment.getFieldSeparator().setValue("|");
- mshSegment.getEncodingCharacters().setValue("^~\\&");
-
mshSegment.getDateTimeOfMessage().getTimeOfAnEvent().setValue("200701011539");
-
mshSegment.getSendingApplication().getNamespaceID().setValue("MYSENDER");
- mshSegment.getMessageControlID().setValue("123");
- mshSegment.getSequenceNumber().setValue("123");
- mshSegment.getMessageType().getMessageType().setValue("ADT");
- mshSegment.getMessageType().getTriggerEvent().setValue("A01");
+ adt.initQuickstart("ADT", "A01", "P");
// Populate the PID Segment
PID pid = adt.getPID();
Added:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java?rev=1381034&view=auto
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
(added)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
Wed Sep 5 07:08:21 2012
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.hl7;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import static org.apache.camel.component.hl7.HL7.convertLFToCR;
+
+public class ConvertLineFeedTest extends CamelTestSupport {
+
+ @Test
+ public void testConvertLineFeed() throws Exception {
+ String s = "line1\nline2\rline3";
+ String result = template.requestBody("direct:test1", s, String.class);
+ assertEquals("line1\rline2\rline3", result);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:test1").transform(convertLFToCR());
+ }
+ };
+ }
+
+}
Propchange:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
Wed Sep 5 07:08:21 2012
@@ -91,7 +91,7 @@ public class HL7DataFormatTest extends C
StringBuilder body = new StringBuilder();
body.append(line1);
- body.append("\n");
+ body.append("\r");
body.append(line2);
return body.toString();
}
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
Wed Sep 5 07:08:21 2012
@@ -40,6 +40,7 @@ public class HL7MLLPCodecTest extends Ca
// START SNIPPET: e1
HL7MLLPCodec codec = new HL7MLLPCodec();
codec.setCharset("iso-8859-1");
+ codec.setConvertLFtoCR(true);
jndi.bind("hl7codec", codec);
// END SNIPPET: e1
@@ -83,23 +84,20 @@ public class HL7MLLPCodecTest extends Ca
// END SNIPPET: e2
String[] lines = out.split("\r");
- assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123",
lines[0]);
+
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19^ADR_A19|456|P|2.4",
lines[0]);
assertEquals("MSA|AA|123", lines[1]);
}
// START SNIPPET: e3
private static Message createHL7AsMessage() throws Exception {
ADR_A19 adr = new ADR_A19();
+ adr.initQuickstart("ADR", "A19", "P");
// Populate the MSH Segment
MSH mshSegment = adr.getMSH();
- mshSegment.getFieldSeparator().setValue("|");
- mshSegment.getEncodingCharacters().setValue("^~\\&");
mshSegment.getDateTimeOfMessage().getTimeOfAnEvent().setValue("200701011539");
mshSegment.getSendingApplication().getNamespaceID().setValue("MYSENDER");
- mshSegment.getSequenceNumber().setValue("123");
- mshSegment.getMessageType().getMessageType().setValue("ADR");
- mshSegment.getMessageType().getTriggerEvent().setValue("A19");
+ mshSegment.getMessageControlID().setValue("456");
// Populate the PID Segment
MSA msa = adr.getMSA();
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
Wed Sep 5 07:08:21 2012
@@ -61,7 +61,7 @@ public class HL7RouteTest extends CamelT
StringBuilder in = new StringBuilder();
in.append(line1);
- in.append("\n");
+ in.append("\r");
in.append(line2);
String out = (String)
template.requestBody("mina2:tcp://127.0.0.1:8888?sync=true&codec=#hl7codec",
in.toString());
@@ -84,7 +84,7 @@ public class HL7RouteTest extends CamelT
StringBuilder in = new StringBuilder();
in.append(line1);
- in.append("\n");
+ in.append("\r");
in.append(line2);
String out = (String)
template.requestBody("mina2:tcp://127.0.0.1:8888?sync=true&codec=#hl7codec",
in.toString());
@@ -106,7 +106,7 @@ public class HL7RouteTest extends CamelT
StringBuilder in = new StringBuilder();
in.append(line1);
- in.append("\n");
+ in.append("\r");
in.append(line2);
template.requestBody("mina2:tcp://127.0.0.1:8888?sync=true&codec=#hl7codec",
in.toString());
@@ -141,7 +141,7 @@ public class HL7RouteTest extends CamelT
.to("mock:unknown")
// end choice block
.end()
- // marhsal response back
+ // marshal response back
.marshal(hl7);
// END SNIPPET: e1
}
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java
Wed Sep 5 07:08:21 2012
@@ -100,19 +100,19 @@ public class HL7ValidateTest extends Cam
StringBuilder body = new StringBuilder();
body.append(line1);
- body.append("\n");
+ body.append("\r");
body.append(line2);
- body.append("\n");
+ body.append("\r");
body.append(line3);
- body.append("\n");
+ body.append("\r");
body.append(line4);
- body.append("\n");
+ body.append("\r");
body.append(line5);
- body.append("\n");
+ body.append("\r");
body.append(line6);
- body.append("\n");
+ body.append("\r");
body.append(line7);
- body.append("\n");
+ body.append("\r");
body.append(line8);
return body.toString();
}
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java
Wed Sep 5 07:08:21 2012
@@ -87,19 +87,19 @@ public class HL7XmlDataFormatTest extend
StringBuilder body = new StringBuilder();
body.append(line1);
- body.append("\n");
+ body.append("\r");
body.append(line2);
- body.append("\n");
+ body.append("\r");
body.append(line3);
- body.append("\n");
+ body.append("\r");
body.append(line4);
- body.append("\n");
+ body.append("\r");
body.append(line5);
- body.append("\n");
+ body.append("\r");
body.append(line6);
- body.append("\n");
+ body.append("\r");
body.append(line7);
- body.append("\n");
+ body.append("\r");
body.append(line8);
return body.toString();
}
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java
Wed Sep 5 07:08:21 2012
@@ -18,7 +18,6 @@ package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.v24.message.ADT_A01;
-import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.validation.MessageRule;
import ca.uhn.hl7v2.validation.ValidationContext;
@@ -114,16 +113,7 @@ public class MessageValidatorTest extend
private static Message createADT01Message() throws Exception {
ADT_A01 adt = new ADT_A01();
-
- // Populate the MSH Segment
- MSH mshSegment = adt.getMSH();
- mshSegment.getFieldSeparator().setValue("|");
- mshSegment.getEncodingCharacters().setValue("^~\\&");
-
mshSegment.getDateTimeOfMessage().getTimeOfAnEvent().setValue("200701011539");
-
mshSegment.getSendingApplication().getNamespaceID().setValue("MYSENDER");
- mshSegment.getSequenceNumber().setValue("123");
- mshSegment.getMessageType().getMessageType().setValue("ADT");
- mshSegment.getMessageType().getTriggerEvent().setValue("A01");
+ adt.initQuickstart("ADT", "A01", "P");
// Populate the PID Segment
PID pid = adt.getPID();
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java?rev=1381034&r1=1381033&r2=1381034&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java
Wed Sep 5 07:08:21 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.v24.message.ADT_A01;
-import ca.uhn.hl7v2.model.v24.segment.MSH;
import ca.uhn.hl7v2.model.v24.segment.PID;
import org.apache.camel.CamelExecutionException;
@@ -97,16 +96,7 @@ public class TerserExpressionTest extend
private static Message createADT01Message() throws Exception {
ADT_A01 adt = new ADT_A01();
-
- // Populate the MSH Segment
- MSH mshSegment = adt.getMSH();
- mshSegment.getFieldSeparator().setValue("|");
- mshSegment.getEncodingCharacters().setValue("^~\\&");
-
mshSegment.getDateTimeOfMessage().getTimeOfAnEvent().setValue("200701011539");
-
mshSegment.getSendingApplication().getNamespaceID().setValue("MYSENDER");
- mshSegment.getSequenceNumber().setValue("123");
- mshSegment.getMessageType().getMessageType().setValue("ADT");
- mshSegment.getMessageType().getTriggerEvent().setValue("A01");
+ adt.initQuickstart("ADT", "A01", "P");
// Populate the PID Segment
PID pid = adt.getPID();
