You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/02/26 13:49:11 UTC
svn commit: r748121 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/dataformat/
components/camel-amqp/src/test/java/org/apache/camel/component/amqp/
components/camel-hl7/src/main/java/org/apache/camel/component/hl7/
components/camel-...
Author: davsclaus
Date: Thu Feb 26 12:49:10 2009
New Revision: 748121
URL: http://svn.apache.org/viewvc?rev=748121&view=rev
Log:
CAMEL-1373: CamelCase keys.
Added:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java (with props)
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java (contents, props changed)
- copied, changed from r748103, camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7Converter.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java (contents, props changed)
- copied, changed from r748103, camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java (contents, props changed)
- copied, changed from r748103, camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java
Removed:
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPCodec.java
camel/trunk/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=748121&r1=748120&r2=748121&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java Thu Feb 26 12:49:10 2009
@@ -32,7 +32,7 @@
public class HL7DataFormat extends DataFormatType {
public HL7DataFormat() {
- super("org.apache.camel.dataformat.hl7.HL7DataFormat");
+ super("org.apache.camel.component.hl7.HL7DataFormat");
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=748121&r1=748120&r2=748121&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java (original)
+++ camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java Thu Feb 26 12:49:10 2009
@@ -51,7 +51,7 @@
}
// TODO fix this test
- public void xtestJmsRouteWithObjectMessage() throws Exception {
+ public void testJmsRouteWithObjectMessage() throws Exception {
PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
resultEndpoint.expectedBodiesReceived(expectedBody);
Added: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java?rev=748121&view=auto
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java (added)
+++ camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java Thu Feb 26 12:49:10 2009
@@ -0,0 +1,38 @@
+/**
+ * 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;
+
+/**
+ * HL7 Constants
+ */
+public final class HL7Constants {
+
+ public static final String HL7_SENDING_APPLICATION = "CamelHL7SendingApplication";
+ public static final String HL7_SENDING_FACILITY = "CamelHL7SendingFacility";
+ public static final String HL7_RECEIVING_APPLICATION = "CamelHL7ReceivingApplication";
+ public static final String HL7_RECEIVING_FACILITY = "CamelHL7ReceivingFacility";
+ public static final String HL7_TIMESTAMP = "CamelHL7Timestamp";
+ public static final String HL7_SECURITY = "CamelHL7Security";
+ public static final String HL7_MESSAGE_TYPE = "CamelHL7MessageType";
+ public static final String HL7_TRIGGER_EVENT = "CamelHL7TriggerEvent";
+ public static final String HL7_MESSAGE_CONTROL = "CamelHL7MessageControl";
+ public static final String HL7_PROCESSING_ID = "CamelHL7ProcessingId";
+ public static final String HL7_VERSION_ID = "CamelHL7VersionId";
+
+ private HL7Constants() {
+ }
+}
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Constants.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java (from r748103, camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7Converter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java?p2=camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java&p1=camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7Converter.java&r1=748103&r2=748121&rev=748121&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7Converter.java (original)
+++ camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java Thu Feb 26 12:49:10 2009
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.hl7;
+package org.apache.camel.component.hl7;
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;
/**
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java (from r748103, camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java?p2=camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java&p1=camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java&r1=748103&r2=748121&rev=748121&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java (original)
+++ camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java Thu Feb 26 12:49:10 2009
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.hl7;
+package org.apache.camel.component.hl7;
import java.io.InputStream;
import java.io.OutputStream;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.util.Terser;
-
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;
@@ -77,17 +76,17 @@
// add MSH fields as message out headers
Terser terser = new Terser(message);
- exchange.getOut().setHeader("hl7.msh.sendingApplication", terser.get("MSH-3"));
- exchange.getOut().setHeader("hl7.msh.sendingFacility", terser.get("MSH-4"));
- exchange.getOut().setHeader("hl7.msh.receivingApplication", terser.get("MSH-5"));
- exchange.getOut().setHeader("hl7.msh.receivingFacility", terser.get("MSH-6"));
- exchange.getOut().setHeader("hl7.msh.timestamp", terser.get("MSH-7"));
- exchange.getOut().setHeader("hl7.msh.security", terser.get("MSH-8"));
- exchange.getOut().setHeader("hl7.msh.messageType", terser.get("MSH-9-1"));
- exchange.getOut().setHeader("hl7.msh.triggerEvent", terser.get("MSH-9-2"));
- exchange.getOut().setHeader("hl7.msh.messageControl", terser.get("MSH-10"));
- exchange.getOut().setHeader("hl7.msh.processingId", terser.get("MSH-11"));
- exchange.getOut().setHeader("hl7.msh.versionId", terser.get("MSH-12"));
+ exchange.getOut().setHeader(HL7Constants.HL7_SENDING_APPLICATION, terser.get("MSH-3"));
+ exchange.getOut().setHeader(HL7Constants.HL7_SENDING_FACILITY, terser.get("MSH-4"));
+ exchange.getOut().setHeader(HL7Constants.HL7_RECEIVING_APPLICATION, terser.get("MSH-5"));
+ exchange.getOut().setHeader(HL7Constants.HL7_RECEIVING_FACILITY, terser.get("MSH-6"));
+ exchange.getOut().setHeader(HL7Constants.HL7_TIMESTAMP, terser.get("MSH-7"));
+ exchange.getOut().setHeader(HL7Constants.HL7_SECURITY, terser.get("MSH-8"));
+ exchange.getOut().setHeader(HL7Constants.HL7_MESSAGE_TYPE, terser.get("MSH-9-1"));
+ exchange.getOut().setHeader(HL7Constants.HL7_TRIGGER_EVENT, terser.get("MSH-9-2"));
+ exchange.getOut().setHeader(HL7Constants.HL7_MESSAGE_CONTROL, terser.get("MSH-10"));
+ exchange.getOut().setHeader(HL7Constants.HL7_PROCESSING_ID, terser.get("MSH-11"));
+ exchange.getOut().setHeader(HL7Constants.HL7_VERSION_ID, terser.get("MSH-12"));
return message;
}
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=748121&r1=748120&r2=748121&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 Thu Feb 26 12:49:10 2009
@@ -21,8 +21,6 @@
import java.nio.charset.CharsetEncoder;
import ca.uhn.hl7v2.model.Message;
-
-import org.apache.camel.dataformat.hl7.HL7Converter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.mina.common.ByteBuffer;
Modified: camel/trunk/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter?rev=748121&r1=748120&r2=748121&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter (original)
+++ camel/trunk/components/camel-hl7/src/main/resources/META-INF/services/org/apache/camel/TypeConverter Thu Feb 26 12:49:10 2009
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.camel.dataformat.hl7
\ No newline at end of file
+org.apache.camel.component.hl7
\ No newline at end of file
Copied: camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java (from r748103, camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java?p2=camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java&p1=camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java&r1=748103&r2=748121&rev=748121&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java (original)
+++ camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java Thu Feb 26 12:49:10 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.hl7;
+package org.apache.camel.component.hl7;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.v24.message.ADR_A19;
@@ -48,19 +48,17 @@
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(Message.class);
- mock.expectedHeaderReceived("hl7.msh.sendingApplication", "MYSERVER");
- mock.expectedHeaderReceived("hl7.msh.sendingFacility", "MYSENDERAPP");
- mock.expectedHeaderReceived("hl7.msh.receivingApplication", "MYCLIENT");
- mock.expectedHeaderReceived("hl7.msh.receivingFacility", "MYCLIENTAPP");
- mock.expectedHeaderReceived("hl7.msh.timestamp", "200612211200");
- mock.expectedHeaderReceived("hl7.msh.security", null);
- mock.expectedHeaderReceived("hl7.msh.messageType", "QRY");
- mock.expectedHeaderReceived("hl7.msh.triggerEvent", "A19");
- mock.expectedHeaderReceived("hl7.msh.messageType", "QRY");
- mock.expectedHeaderReceived("hl7.msh.triggerEvent", "A19");
- mock.expectedHeaderReceived("hl7.msh.messageControl", "1234");
- mock.expectedHeaderReceived("hl7.msh.processingId", "P");
- mock.expectedHeaderReceived("hl7.msh.versionId", "2.4");
+ mock.expectedHeaderReceived(HL7Constants.HL7_SENDING_APPLICATION, "MYSERVER");
+ mock.expectedHeaderReceived(HL7Constants.HL7_SENDING_FACILITY, "MYSENDERAPP");
+ mock.expectedHeaderReceived(HL7Constants.HL7_RECEIVING_APPLICATION, "MYCLIENT");
+ mock.expectedHeaderReceived(HL7Constants.HL7_RECEIVING_FACILITY, "MYCLIENTAPP");
+ mock.expectedHeaderReceived(HL7Constants.HL7_TIMESTAMP, "200612211200");
+ mock.expectedHeaderReceived(HL7Constants.HL7_SECURITY, null);
+ mock.expectedHeaderReceived(HL7Constants.HL7_MESSAGE_TYPE, "QRY");
+ mock.expectedHeaderReceived(HL7Constants.HL7_TRIGGER_EVENT, "A19");
+ mock.expectedHeaderReceived(HL7Constants.HL7_MESSAGE_CONTROL, "1234");
+ mock.expectedHeaderReceived(HL7Constants.HL7_PROCESSING_ID, "P");
+ mock.expectedHeaderReceived(HL7Constants.HL7_VERSION_ID, "2.4");
String body = createHL7AsString();
template.sendBody("direct:unmarshal", body);
Propchange: camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=748121&r1=748120&r2=748121&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 Thu Feb 26 12:49:10 2009
@@ -24,11 +24,9 @@
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.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.hl7.HL7DataFormat;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.DataFormat;
@@ -127,11 +125,11 @@
// using choice as the content base router
.choice()
// where we choose that A19 queries invoke the handleA19 method on our hl7service bean
- .when(header("hl7.msh.triggerEvent").isEqualTo("A19"))
+ .when(header("CamelHL7TriggerEvent").isEqualTo("A19"))
.beanRef("hl7service", "handleA19")
.to("mock:a19")
// and A01 should invoke the handleA01 method on our hl7service bean
- .when(header("hl7.msh.triggerEvent").isEqualTo("A01")).to("mock:a01")
+ .when(header("CamelHL7TriggerEvent").isEqualTo("A01")).to("mock:a01")
.beanRef("hl7service", "handleA01")
.to("mock:a19")
// other types should go to mock:unknown