CAMEL-9416: Polished. This closes #748
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e5725284 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e5725284 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e5725284 Branch: refs/heads/master Commit: e5725284485e91093847b5b261171c96ca0aed03 Parents: bd1661b Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 30 09:59:34 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 30 09:59:34 2015 +0100 ---------------------------------------------------------------------- components/camel-mllp/pom.xml | 120 +++++------ .../camel/component/mllp/MllpComponent.java | 4 - .../camel/component/mllp/MllpEndpoint.java | 25 +-- .../component/mllp/MllpTcpClientProducer.java | 3 +- .../component/mllp/MllpTcpServerConsumer.java | 6 - .../camel/component/mllp/impl/MllpUtil.java | 80 ++++---- .../mllp/Hl7AcknowledgementGenerator.java | 4 +- .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 203 +++++++++++++++++++ .../src/test/resources/log4j.properties | 69 +++---- 10 files changed, 548 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml index 3a41bcf..e49249b 100644 --- a/components/camel-mllp/pom.xml +++ b/components/camel-mllp/pom.xml @@ -19,78 +19,66 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> - <version>2.17-SNAPSHOT</version> - </parent> - - <artifactId>camel-mllp</artifactId> - <packaging>bundle</packaging> - <name>Camel :: MLLP</name> - <description>Camel MLLP Component</description> - - <properties> - <camel.osgi.export.pkg>org.apache.camel.component.mllp.*,org.apache.camel.processor.mllp.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mllp</camel.osgi.export.service> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - - - <!-- support camel documentation --> - <!--dependency> - <groupId>org.apache.camel</groupId> - <artifactId>apt</artifactId> - </dependency --> - - <!-- logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-blueprint</artifactId> - <scope>test</scope> - </dependency> - - <!-- test logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.17-SNAPSHOT</version> + </parent> + + <artifactId>camel-mllp</artifactId> + <packaging>bundle</packaging> + <name>Camel :: MLLP</name> + <description>Camel MLLP Component</description> + + <properties> + <camel.osgi.export.pkg> + org.apache.camel.component.mllp.*, + org.apache.camel.processor.mllp.* + </camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mllp</camel.osgi.export.service> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-blueprint</artifactId> + <scope>test</scope> + </dependency> + + <!-- test logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> <!-- Ensure that test runs do no leave running JVMs --> - <build> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19</version> <configuration> <shutdown>kill</shutdown> </configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java index d815158..7a3fbb1 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java @@ -21,8 +21,6 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Represents the component that manages {@link MllpEndpoint}. @@ -30,8 +28,6 @@ import org.slf4j.LoggerFactory; public class MllpComponent extends UriEndpointComponent { public static final String MLLP_LOG_PHI_PROPERTY = "org.apache.camel.mllp.logPHI"; - Logger log = LoggerFactory.getLogger(this.getClass()); - public MllpComponent() { super(MllpEndpoint.class); } http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java index eda5757..21740a6 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java @@ -45,7 +45,7 @@ public class MllpEndpoint extends DefaultEndpoint { public static final char SEGMENT_DELIMITER = 0x0d; // CR (carriage return) - decimal 13, octal 015 public static final char MESSAGE_TERMINATOR = 0x0a; // LF (line feed, new line) - decimal 10, octal 012 - Logger log = LoggerFactory.getLogger(this.getClass()); + private static final Logger LOG = LoggerFactory.getLogger(MllpEndpoint.class); @UriPath(defaultValue = "0.0.0.0", description = "Hostname or IP for connection") String hostname = "0.0.0.0"; @@ -54,6 +54,7 @@ public class MllpEndpoint extends DefaultEndpoint { int port = -1; // TODO: Move URI Params to a MllpConfiguration class + // TODO: Move the description documentation to javadoc in the setter method @UriParam(defaultValue = "5", description = "TCP Server only - The maximum queue length for incoming connection indications (a request to connect) is set to the backlog parameter. If a " + "connection indication arrives when the queue is full, the connection is refused.") int backlog = 5; @@ -100,6 +101,9 @@ public class MllpEndpoint extends DefaultEndpoint { public MllpEndpoint(String uri, MllpComponent component) { super(uri, component); + // TODO: this logic should be in component class + // TODO: all the options in the endpoint should be getter/setter so you can configure them as plain Java + // mllp://hostname:port String hostPort; // look for options @@ -129,15 +133,9 @@ public class MllpEndpoint extends DefaultEndpoint { } @Override - public Exchange createExchange() { - return this.createExchange(getExchangePattern()); - } - - @Override public Exchange createExchange(ExchangePattern exchangePattern) { Exchange mllpExchange = super.createExchange(exchangePattern); setExchangeProperties(mllpExchange); - return mllpExchange; } @@ -145,26 +143,25 @@ public class MllpEndpoint extends DefaultEndpoint { public Exchange createExchange(Exchange exchange) { Exchange mllpExchange = super.createExchange(exchange); setExchangeProperties(mllpExchange); - return mllpExchange; } private void setExchangeProperties(Exchange mllpExchange) { - if (null != charsetName) { + if (charsetName != null) { mllpExchange.setProperty(Exchange.CHARSET_NAME, charsetName); } } public Producer createProducer() throws Exception { - log.trace("({}).createProducer()", this.getEndpointKey()); - + LOG.trace("({}).createProducer()", this.getEndpointKey()); return new MllpTcpClientProducer(this); } public Consumer createConsumer(Processor processor) throws Exception { - log.trace("({}).createConsumer(processor)", this.getEndpointKey()); - - return new MllpTcpServerConsumer(this, processor); + LOG.trace("({}).createConsumer(processor)", this.getEndpointKey()); + Consumer consumer = new MllpTcpServerConsumer(this, processor); + configureConsumer(consumer); + return consumer; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java index 7b9d86b..fdff64b 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java @@ -105,7 +105,7 @@ public class MllpTcpClientProducer extends DefaultProducer { } log.debug("Reading acknowledgement from external system"); - byte[] acknowledgementBytes = null; + byte[] acknowledgementBytes; try { MllpUtil.openFrame(socket); acknowledgementBytes = MllpUtil.closeFrame(socket); @@ -226,7 +226,6 @@ public class MllpTcpClientProducer extends DefaultProducer { } return null; - } } http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java index 362a30f..d74468c 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java @@ -55,10 +55,7 @@ public class MllpTcpServerConsumer extends DefaultConsumer { public MllpTcpServerConsumer(MllpEndpoint endpoint, Processor processor) { super(endpoint, processor); log.trace("MllpTcpServerConsumer(endpoint, processor)"); - - this.endpoint = endpoint; - } @Override @@ -128,7 +125,6 @@ public class MllpTcpServerConsumer extends DefaultConsumer { super.doShutdown(); } - /** * Nested Class to handle the ServerSocket.accept requests */ @@ -543,8 +539,6 @@ public class MllpTcpServerConsumer extends DefaultConsumer { } } } - - } } http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java index 4fd3fbf..c1c5aec 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/impl/MllpUtil.java @@ -37,7 +37,6 @@ import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_DATA; import static org.apache.camel.component.mllp.MllpEndpoint.END_OF_STREAM; import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK; - /** * Supplies methods to read and write messages in a MLLP Frame. * <p/> @@ -51,7 +50,7 @@ import static org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK; * <p/> */ public final class MllpUtil { - static Logger log = LoggerFactory.getLogger(MllpUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(MllpUtil.class); private MllpUtil() { } @@ -88,7 +87,7 @@ public final class MllpUtil { // Just pass this on - the caller will wrap it in a MllpTimeoutException throw normaTimeoutEx; } catch (IOException unexpectedException) { - log.error("Unexpected Exception occurred opening MLLP frame - resetting the connection"); + LOG.error("Unexpected Exception occurred opening MLLP frame - resetting the connection"); MllpUtil.resetConnection(socket); throw new MllpException("Unexpected Exception occurred opening MLLP frame", unexpectedException); } @@ -105,21 +104,21 @@ public final class MllpUtil { readByte = socketInputStream.read(); switch (readByte) { case END_OF_STREAM: - if (isLogPHIEnabled(log)) { - log.error("END_OF_STREAM read while looking for the beginning of the MLLP frame, and " + if (isLogPHIEnabled(LOG)) { + LOG.error("END_OF_STREAM read while looking for the beginning of the MLLP frame, and " + "out-of-frame data had been read - resetting connection and eating out-of-frame data: {}", outOfFrameData.toString().replace('\r', '\n')); } else { - log.error("END_OF_STREAM read while looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); + LOG.error("END_OF_STREAM read while looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); } resetConnection(socket); throw new MllpCorruptFrameException("END_OF_STREAM read while looking for the beginning of the MLLP frame", outOfFrameData.toByteArray()); case START_OF_BLOCK: - if (isLogPHIEnabled(log)) { - log.warn("The beginning of the MLLP frame was preceded by out-of-frame data - eating data: {}", outOfFrameData.toString().replace('\r', '\n')); + if (isLogPHIEnabled(LOG)) { + LOG.warn("The beginning of the MLLP frame was preceded by out-of-frame data - eating data: {}", outOfFrameData.toString().replace('\r', '\n')); } else { - log.warn("The beginning of the MLLP frame was preceded by out-of-frame data - eating data"); + LOG.warn("The beginning of the MLLP frame was preceded by out-of-frame data - eating data"); } throw new MllpCorruptFrameException("The beginning of the MLLP frame was preceded by out-of-frame data", outOfFrameData.toByteArray()); @@ -130,22 +129,22 @@ public final class MllpUtil { } } } catch (SocketTimeoutException timeoutEx) { - if (isLogPHIEnabled(log)) { - log.error("Timeout looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data: {}", + if (isLogPHIEnabled(LOG)) { + LOG.error("Timeout looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data: {}", outOfFrameData.toString().replace('\r', '\n')); } else { - log.error("Timeout looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); + LOG.error("Timeout looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); } resetConnection(socket); throw new MllpCorruptFrameException("Timeout looking for the beginning of the MLLP frame, and out-of-frame data had been read", outOfFrameData.toByteArray()); } catch (IOException e) { - if (isLogPHIEnabled(log)) { - log.error("Exception encountered looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data: {}", + if (isLogPHIEnabled(LOG)) { + LOG.error("Exception encountered looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data: {}", outOfFrameData.toString().replace('\r', '\n')); } else { - log.error("Exception encountered looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); + LOG.error("Exception encountered looking for the beginning of the MLLP frame, and out-of-frame data had been read - resetting connection and eating out-of-frame data"); } resetConnection(socket); @@ -182,20 +181,20 @@ public final class MllpUtil { int readByte = socketInputStream.read(); switch (readByte) { case END_OF_STREAM: - if (isLogPHIEnabled(log)) { - log.error("END_OF_STREAM read while looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); + if (isLogPHIEnabled(LOG)) { + LOG.error("END_OF_STREAM read while looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); } else { - log.error("END_OF_STREAM read while looking for the end of the MLLP frame - resetting connection and eating data"); + LOG.error("END_OF_STREAM read while looking for the end of the MLLP frame - resetting connection and eating data"); } resetConnection(socket); throw new MllpCorruptFrameException("END_OF_STREAM read while looking for the end of the MLLP frame", payload.size() > 0 ? payload.toByteArray() : null); case START_OF_BLOCK: - if (isLogPHIEnabled(log)) { - log.error("A new MLLP frame was opened before the previous frame was closed - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); + if (isLogPHIEnabled(LOG)) { + LOG.error("A new MLLP frame was opened before the previous frame was closed - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); } else { - log.error("A new MLLP frame was opened before the previous frame was closed - resetting connection and eating data"); + LOG.error("A new MLLP frame was opened before the previous frame was closed - resetting connection and eating data"); } resetConnection(socket); @@ -203,11 +202,11 @@ public final class MllpUtil { throw new MllpCorruptFrameException("A new MLLP frame was opened before the previous frame was closed", payload.size() > 0 ? payload.toByteArray() : null); case END_OF_BLOCK: if (END_OF_DATA != socketInputStream.read()) { - if (isLogPHIEnabled(log)) { - log.error("The MLLP frame was partially closed - END_OF_BLOCK was not followed by END_OF_DATA - resetting connection and eating data: {}", + if (isLogPHIEnabled(LOG)) { + LOG.error("The MLLP frame was partially closed - END_OF_BLOCK was not followed by END_OF_DATA - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); } else { - log.error("The MLLP frame was partially closed - END_OF_BLOCK was not followed by END_OF_DATA - resetting connection and eating data"); + LOG.error("The MLLP frame was partially closed - END_OF_BLOCK was not followed by END_OF_DATA - resetting connection and eating data"); } resetConnection(socket); @@ -223,13 +222,13 @@ public final class MllpUtil { } } catch (SocketTimeoutException timeoutEx) { if (0 < payload.size()) { - if (isLogPHIEnabled(log)) { - log.error("Timeout looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); + if (isLogPHIEnabled(LOG)) { + LOG.error("Timeout looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); } else { - log.error("Timeout looking for the end of the MLLP frame - resetting connection and eating data"); + LOG.error("Timeout looking for the end of the MLLP frame - resetting connection and eating data"); } } else { - log.error("Timeout looking for the end of the MLLP frame - resetting connection"); + LOG.error("Timeout looking for the end of the MLLP frame - resetting connection"); } resetConnection(socket); @@ -237,13 +236,13 @@ public final class MllpUtil { throw new MllpCorruptFrameException("Timeout looking for the end of the MLLP frame", payload.size() > 0 ? payload.toByteArray() : null, timeoutEx); } catch (IOException ioEx) { if (0 < payload.size()) { - if (isLogPHIEnabled(log)) { - log.error("Exception encountered looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); + if (isLogPHIEnabled(LOG)) { + LOG.error("Exception encountered looking for the end of the MLLP frame - resetting connection and eating data: {}", payload.toString().replace('\r', '\n')); } else { - log.error("Exception encountered looking for the end of the MLLP frame - resetting connection and eating data"); + LOG.error("Exception encountered looking for the end of the MLLP frame - resetting connection and eating data"); } } else { - log.error("Exception encountered looking for the end of the MLLP frame - resetting connection"); + LOG.error("Exception encountered looking for the end of the MLLP frame - resetting connection"); } resetConnection(socket); @@ -266,11 +265,11 @@ public final class MllpUtil { */ public static void writeFramedPayload(Socket socket, byte[] payload) throws MllpException { if (socket.isConnected() && !socket.isClosed()) { - OutputStream outputStream = null; + OutputStream outputStream; try { outputStream = new BufferedOutputStream(socket.getOutputStream(), payload.length + 4); } catch (IOException ioEx) { - log.error("Error Retrieving OutputStream from Socket - resetting connection"); + LOG.error("Error Retrieving OutputStream from Socket - resetting connection"); resetConnection(socket); @@ -285,7 +284,7 @@ public final class MllpUtil { outputStream.write(END_OF_DATA); outputStream.flush(); } catch (IOException ioEx) { - log.error("Error writing MLLP payload - resetting connection"); + LOG.error("Error writing MLLP payload - resetting connection"); resetConnection(socket); @@ -301,19 +300,19 @@ public final class MllpUtil { try { socket.shutdownInput(); } catch (Exception ex) { - log.warn("Exception encountered shutting down the input stream on the client socket", ex); + LOG.warn("Exception encountered shutting down the input stream on the client socket", ex); } try { socket.shutdownOutput(); } catch (Exception ex) { - log.warn("Exception encountered shutting down the output stream on the client socket", ex); + LOG.warn("Exception encountered shutting down the output stream on the client socket", ex); } try { socket.close(); } catch (Exception ex) { - log.warn("Exception encountered closing the client socket", ex); + LOG.warn("Exception encountered closing the client socket", ex); } } } @@ -324,13 +323,13 @@ public final class MllpUtil { try { socket.setSoLinger(true, 0); } catch (Exception ex) { - log.warn("Exception encountered setting SO_LINGER to 0 on the socket to force a reset", ex); + LOG.warn("Exception encountered setting SO_LINGER to 0 on the socket to force a reset", ex); } try { socket.close(); } catch (Exception ex) { - log.warn("Exception encountered closing the client socket", ex); + LOG.warn("Exception encountered closing the client socket", ex); } } @@ -358,7 +357,6 @@ public final class MllpUtil { } private static boolean isLogPHIEnabled(Logger targetLogger) { - String logPHIProperty = System.getProperty(MllpComponent.MLLP_LOG_PHI_PROPERTY, "true"); if (targetLogger.isDebugEnabled()) { if (Boolean.parseBoolean(System.getProperty(MllpComponent.MLLP_LOG_PHI_PROPERTY, "true"))) { return true; http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java index b95264a..265db76 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java @@ -35,7 +35,7 @@ import static org.apache.camel.component.mllp.MllpEndpoint.SEGMENT_DELIMITER; * A Camel Processor for generating HL7 Acknowledgements */ public class Hl7AcknowledgementGenerator implements Processor { - Logger log = LoggerFactory.getLogger(this.getClass()); + private static final Logger LOG = LoggerFactory.getLogger(Hl7AcknowledgementGenerator.class); String defaultNack = "MSH|^~\\&|||||||NACK||P|2.2" + SEGMENT_DELIMITER + "MSA|AR|" + SEGMENT_DELIMITER @@ -127,7 +127,7 @@ public class Hl7AcknowledgementGenerator implements Processor { } if (-1 == msh92start) { - log.warn("Didn't find component separator for MSH-9.2 - sending ACK in MSH-9"); + LOG.warn("Didn't find component separator for MSH-9.2 - sending ACK in MSH-9"); } else { acknowledgement.write(hl7MessageBytes, msh92start, fieldSeparatorIndexes.get(8) - msh92start); // MSH-9.2 } http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/resources/META-INF/LICENSE.txt b/components/camel-mllp/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-mllp/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/main/resources/META-INF/NOTICE.txt b/components/camel-mllp/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-mllp/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/e5725284/components/camel-mllp/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-mllp/src/test/resources/log4j.properties b/components/camel-mllp/src/test/resources/log4j.properties index 29932b4..19ecb1f 100644 --- a/components/camel-mllp/src/test/resources/log4j.properties +++ b/components/camel-mllp/src/test/resources/log4j.properties @@ -1,41 +1,42 @@ -### - # 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. - ## - -log4j.rootLogger=INFO, console, file - -# CONSOLE appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=[%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}] %p | %t | %c %n\t%m%n - -# File appender - not normally used in testing +## ------------------------------------------------------------------------ +## 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. +## ------------------------------------------------------------------------ + +# +# The logging properties used for testing. +# +log4j.rootLogger=INFO, file + +#log4j.logger.org.apache.camel.component.mllp=DEBUG +#log4j.logger.org.apache.camel.test.mllp.PassthroughProcessor=INFO +#log4j.logger.org.apache.camel.test.junit=WARN +#log4j.logger.org.apache.camel.test.tcp=WARN + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n log4j.appender.file.file=target/camel-mllp-test.log -# log4j.logger.org.apache.camel.component.hl7=TRACE -log4j.logger.org.apache.camel.component.mllp=INFO -log4j.logger.org.apache.camel.test.mllp.PassthroughProcessor=INFO -log4j.logger.org.apache.camel=WARN -log4j.logger.org.apache.activemq=WARN -log4j.logger.org.apache.camel.test.junit=WARN -log4j.logger.org.apache.camel.test.tcp=WARN
