You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ri...@apache.org on 2014/03/17 10:25:43 UTC
[1/3] git commit: CAMEL-7300: Don't perform validation (using the
default validation profile) during typeconversion.
Repository: camel
Updated Branches:
refs/heads/master 5f7246988 -> f105ac29d
CAMEL-7300: Don't perform validation (using the default validation profile) during typeconversion.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd60a2b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd60a2b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd60a2b3
Branch: refs/heads/master
Commit: bd60a2b3a7377a37543c4263b3eee5882526f479
Parents: db59f39
Author: Richard Kettelerij <r....@avisi.nl>
Authored: Mon Mar 17 10:03:54 2014 +0100
Committer: Richard Kettelerij <r....@avisi.nl>
Committed: Mon Mar 17 10:03:54 2014 +0100
----------------------------------------------------------------------
.../camel/component/hl7/HL7Converter.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bd60a2b3/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
index 680c424..3e2a4ae 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
@@ -20,7 +20,7 @@ import ca.uhn.hl7v2.HL7Exception;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.parser.PipeParser;
-
+import ca.uhn.hl7v2.validation.impl.NoValidation;
import org.apache.camel.Converter;
/**
@@ -33,22 +33,28 @@ public final class HL7Converter {
// Helper class
}
+ private static Parser getParser() {
+ PipeParser pipeParser = new PipeParser();
+ pipeParser.setValidationContext(new NoValidation());
+ return pipeParser;
+ }
+
@Converter
public static String toString(Message message) throws HL7Exception {
- return encode(message, new PipeParser());
+ return encode(message, getParser());
}
@Converter
public static Message toMessage(String body) throws HL7Exception {
- return parse(body, new PipeParser());
+ return parse(body, getParser());
}
-
+
static Message parse(String body, Parser parser) throws HL7Exception {
return parser.parse(body);
- }
-
+ }
+
static String encode(Message message, Parser parser) throws HL7Exception {
return parser.encode(message);
- }
+ }
}
[2/3] git commit: Polishing
Posted by ri...@apache.org.
Polishing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d193a865
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d193a865
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d193a865
Branch: refs/heads/master
Commit: d193a865b90af1d9fe70f5b401851009526fde13
Parents: bd60a2b
Author: Richard Kettelerij <r....@avisi.nl>
Authored: Mon Mar 17 10:22:36 2014 +0100
Committer: Richard Kettelerij <r....@avisi.nl>
Committed: Mon Mar 17 10:22:36 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/hl7/HL7Converter.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d193a865/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
index 3e2a4ae..115cf03 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7Converter.java
@@ -21,6 +21,7 @@ import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.parser.Parser;
import ca.uhn.hl7v2.parser.PipeParser;
import ca.uhn.hl7v2.validation.impl.NoValidation;
+
import org.apache.camel.Converter;
/**
[3/3] git commit: Merge remote-tracking branch 'origin/master'
Posted by ri...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f105ac29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f105ac29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f105ac29
Branch: refs/heads/master
Commit: f105ac29dc2fd97461d7a47873685e6cc0f3211e
Parents: d193a86 5f72469
Author: Richard Kettelerij <r....@avisi.nl>
Authored: Mon Mar 17 10:25:37 2014 +0100
Committer: Richard Kettelerij <r....@avisi.nl>
Committed: Mon Mar 17 10:25:37 2014 +0100
----------------------------------------------------------------------
.../camel/dataformat/avro/AvroDataFormat.java | 2 +-
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
components/camel-infinispan/pom.xml | 12 +-
.../component/jsch/ScpServerTestSupport.java | 5 +-
.../dataformat/protobuf/ProtobufDataFormat.java | 2 +-
.../component/ssh/FileKeyPairProvider.java | 5 +-
.../ssh/ResourceHelperKeyPairProvider.java | 4 +-
parent/pom.xml | 6 +-
.../src/main/resources/config.properties | 6 +-
.../features/src/main/resources/features.xml | 2 +
.../camel/itest/karaf/AbstractFeatureTest.java | 2 +-
.../protobuf/generated/AddressBookProtos.java | 2172 ++++++++++++++----
.../itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
13 files changed, 1730 insertions(+), 492 deletions(-)
----------------------------------------------------------------------