Skip to content

Corrected handling of charset in Hl7Dataformat, #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valdar wants to merge 1 commit into from
Closed

Corrected handling of charset in Hl7Dataformat, #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
*/
package org.apache.camel.component.hl7;

import org.apache.camel.Converter;

import ca.uhn.hl7v2.HL7Exception;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.parser.PipeParser;

import org.apache.camel.Converter;

/**
* HL7 converters.
*/
Expand All @@ -32,7 +32,7 @@ public final class HL7Converter {
private HL7Converter() {
// Helper class
}

@Converter
public static String toString(Message message) throws HL7Exception {
return encode(message, new PipeParser());
Expand All @@ -43,11 +43,11 @@ public static Message toMessage(String body) throws HL7Exception {
return parse(body, new PipeParser());
}

static Message parse(String body, Parser parser) throws HL7Exception {
public static Message parse(String body, Parser parser) throws HL7Exception {
return parser.parse(body);
}

static String encode(Message message, Parser parser) throws HL7Exception {
public static String encode(Message message, Parser parser) throws HL7Exception {
return parser.encode(message);
}

Expand Down
140 changes: 70 additions & 70 deletions components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,6 @@
*/
package org.apache.camel.component.hl7;

import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;

import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.GenericParser;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.util.Terser;
import ca.uhn.hl7v2.validation.impl.NoValidation;

import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;

import static org.apache.camel.component.hl7.HL7Constants.HL7_MESSAGE_CONTROL;
import static org.apache.camel.component.hl7.HL7Constants.HL7_MESSAGE_TYPE;
import static org.apache.camel.component.hl7.HL7Constants.HL7_PROCESSING_ID;
Expand All @@ -43,6 +28,21 @@
import static org.apache.camel.component.hl7.HL7Constants.HL7_TRIGGER_EVENT;
import static org.apache.camel.component.hl7.HL7Constants.HL7_VERSION_ID;

import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;

import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;

import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.GenericParser;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.util.Terser;
import ca.uhn.hl7v2.validation.impl.NoValidation;

/**
* HL7 DataFormat (supports v2.x of the HL7 protocol).
* <p/>
Expand Down Expand Up @@ -79,60 +79,60 @@
*/
public class HL7DataFormat implements DataFormat {

private static final Map<String, String> HEADER_MAP = new HashMap<String, String>();

private Parser parser = new GenericParser();
static {
HEADER_MAP.put(HL7_SENDING_APPLICATION, "MSH-3");
HEADER_MAP.put(HL7_SENDING_FACILITY, "MSH-4");
HEADER_MAP.put(HL7_RECEIVING_APPLICATION, "MSH-5");
HEADER_MAP.put(HL7_RECEIVING_FACILITY, "MSH-6");
HEADER_MAP.put(HL7_TIMESTAMP, "MSH-7");
HEADER_MAP.put(HL7_SECURITY, "MSH-8");
HEADER_MAP.put(HL7_MESSAGE_TYPE, "MSH-9-1");
HEADER_MAP.put(HL7_TRIGGER_EVENT, "MSH-9-2");
HEADER_MAP.put(HL7_MESSAGE_CONTROL, "MSH-10");
HEADER_MAP.put(HL7_PROCESSING_ID, "MSH-11");
HEADER_MAP.put(HL7_VERSION_ID, "MSH-12");
}

public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
Message message = ExchangeHelper.convertToMandatoryType(exchange, Message.class, body);
String encoded = HL7Converter.encode(message, parser);
outputStream.write(encoded.getBytes());
}

public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
String body = ExchangeHelper.convertToMandatoryType(exchange, String.class, inputStream);
Message message = HL7Converter.parse(body, parser);

// add MSH fields as message out headers
Terser terser = new Terser(message);
for (Map.Entry<String, String> entry : HEADER_MAP.entrySet()) {
exchange.getOut().setHeader(entry.getKey(), terser.get(entry.getValue()));
}
return message;
}

public boolean isValidate() {
return parser.getValidationContext() instanceof NoValidation;
}

public void setValidate(boolean validate) {
if (!validate) {
parser.setValidationContext(new NoValidation());
}
}

public Parser getParser() {
return parser;
}

public void setParser(Parser parser) {
this.parser = parser;
}
private static final Map<String, String> HEADER_MAP = new HashMap<String, String>();

private Parser parser = new GenericParser();

static {
HEADER_MAP.put(HL7_SENDING_APPLICATION, "MSH-3");
HEADER_MAP.put(HL7_SENDING_FACILITY, "MSH-4");
HEADER_MAP.put(HL7_RECEIVING_APPLICATION, "MSH-5");
HEADER_MAP.put(HL7_RECEIVING_FACILITY, "MSH-6");
HEADER_MAP.put(HL7_TIMESTAMP, "MSH-7");
HEADER_MAP.put(HL7_SECURITY, "MSH-8");
HEADER_MAP.put(HL7_MESSAGE_TYPE, "MSH-9-1");
HEADER_MAP.put(HL7_TRIGGER_EVENT, "MSH-9-2");
HEADER_MAP.put(HL7_MESSAGE_CONTROL, "MSH-10");
HEADER_MAP.put(HL7_PROCESSING_ID, "MSH-11");
HEADER_MAP.put(HL7_VERSION_ID, "MSH-12");
}

public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
Message message = ExchangeHelper.convertToMandatoryType(exchange, Message.class, body);
String encoded = HL7Converter.encode(message, parser);
String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, String.class);
outputStream.write(charsetName != null ? encoded.getBytes(charsetName) : encoded.getBytes());
}

public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
String body = ExchangeHelper.convertToMandatoryType(exchange, String.class, inputStream);
Message message = HL7Converter.parse(body, parser);

// add MSH fields as message out headers
Terser terser = new Terser(message);
for (Map.Entry<String, String> entry : HEADER_MAP.entrySet()) {
exchange.getOut().setHeader(entry.getKey(), terser.get(entry.getValue()));
}
return message;
}

public boolean isValidate() {
return parser.getValidationContext() instanceof NoValidation;
}

public void setValidate(boolean validate) {
if (!validate) {
parser.setValidationContext(new NoValidation());
}
}

public Parser getParser() {
return parser;
}

public void setParser(Parser parser) {
this.parser = parser;
}

}

Loading