Author: joed
Date: Fri Apr 29 22:33:42 2011
New Revision: 1097978
URL: http://svn.apache.org/viewvc?rev=1097978&view=rev
Log:
Converter annotation and new route test, thanks a bunch to Roberto Rojas.
Fixes CAMEL-3890
Added:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java?rev=1097978&r1=1097977&r2=1097978&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Fri Apr 29 22:33:42 2011
@@ -30,6 +30,7 @@ import org.apache.camel.Converter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Converter
public final class Rfc3164SyslogConverter {
private static final transient Logger LOG =
LoggerFactory.getLogger(Rfc3164SyslogConverter.class);
@@ -89,8 +90,7 @@ public final class Rfc3164SyslogConverte
cal.setTime(message.getTimestamp());
String firstLetter =
MONTHS.values()[cal.get(Calendar.MONTH)].toString().substring(0, 1); // Get
first letter
- String remainder = MONTHS.values()[cal.get(Calendar.MONTH)].toString()
- .substring(1); // Get remainder of word.
+ String remainder =
MONTHS.values()[cal.get(Calendar.MONTH)].toString().substring(1); // Get
remainder of word.
String capitalized = firstLetter.toUpperCase() +
remainder.toLowerCase();
sbr.append(capitalized);
Added:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java?rev=1097978&view=auto
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
(added)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
Fri Apr 29 22:33:42 2011
@@ -0,0 +1,80 @@
+/*
+ * 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.syslog;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+
+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.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class AutomatedConversionTest extends CamelTestSupport {
+
+ private final int serverPort = 10514;
+ private final int messageCount = 1;
+ private final String message =
+ "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to
make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ + " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK #
Transport:\n" + " Conveyer1=OK, Conveyer2=OK # %%";
+
+ @Test
+ public void testSendingRawUDP() throws IOException, InterruptedException {
+
+ MockEndpoint mock = getMockEndpoint("mock:syslogReceiver");
+ MockEndpoint mock2 = getMockEndpoint("mock:syslogReceiver2");
+ mock.expectedMessageCount(1);
+ mock2.expectedMessageCount(1);
+ mock2.expectedBodiesReceived(message);
+ DatagramSocket ds = new DatagramSocket();
+
+ DatagramSocket socket = new DatagramSocket();
+ try {
+ InetAddress address = InetAddress.getByName("127.0.0.1");
+ for (int i = 0; i < messageCount; i++) {
+ byte[] data = message.getBytes();
+ DatagramPacket packet = new DatagramPacket(data, data.length,
address, serverPort);
+ socket.send(packet);
+ Thread.sleep(100);
+ }
+ } finally {
+ socket.close();
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ // we setup a Syslog listener on a random port.
+ from("mina:udp://127.0.0.1:" +
serverPort).unmarshal().syslog().process(new Processor() {
+ public void process(Exchange ex) {
+ assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
+ }
+ }).to("mock:syslogReceiver").
+ marshal().syslog().to("mock:syslogReceiver2");
+ }
+ };
+ }
+}
