CAMEL-7788: Support for rfc 5424/5425/6587 in syslog component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/808b0176 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/808b0176 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/808b0176 Branch: refs/heads/master Commit: 808b0176ee9ba0309a7cb25594000c12a62bfc56 Parents: b293ac1 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 7 09:14:54 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 7 09:22:34 2014 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/syslog/SyslogDataFormat.java | 2 +- .../java/org/apache/camel/itest/osgi/syslog/SyslogTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/808b0176/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java index 782c89a..cdc2146 100644 --- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java +++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java @@ -24,6 +24,7 @@ import org.apache.camel.spi.DataFormat; import org.apache.camel.util.ExchangeHelper; public class SyslogDataFormat implements DataFormat { + @Override public void marshal(Exchange exchange, Object body, OutputStream stream) throws Exception { SyslogMessage message = ExchangeHelper.convertToMandatoryType(exchange, SyslogMessage.class, body); @@ -32,7 +33,6 @@ public class SyslogDataFormat implements DataFormat { @Override public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception { - String body = ExchangeHelper.convertToMandatoryType(exchange, String.class, inputStream); SyslogMessage message = SyslogConverter.parseMessage(body.getBytes()); http://git-wip-us.apache.org/repos/asf/camel/blob/808b0176/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java index ae0b606..37ebec8 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java @@ -26,7 +26,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.syslog.Rfc3164SyslogDataFormat; +import org.apache.camel.component.syslog.SyslogDataFormat; import org.apache.camel.component.syslog.SyslogMessage; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.DataFormat; @@ -80,7 +80,7 @@ public class SyslogTest extends OSGiIntegrationTestSupport { public void configure() throws Exception { //context.setTracing(true); - DataFormat syslogDataFormat = new Rfc3164SyslogDataFormat(); + DataFormat syslogDataFormat = new SyslogDataFormat(); // we setup a Syslog listener on a random port. from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() { @@ -98,7 +98,7 @@ public class SyslogTest extends OSGiIntegrationTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), // using the features to install the other camel components - loadCamelFeatures("camel-mina", "camel-syslog")); + loadCamelFeatures("camel-mina", "camel-netty", "camel-syslog")); return options; }
