Author: joed
Date: Tue Nov 9 16:43:13 2010
New Revision: 1033081
URL: http://svn.apache.org/viewvc?rev=1033081&view=rev
Log:
Camel :: Syslog - checkstyle compliance.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConstants.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogFacility.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogMessage.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogSeverity.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
Tue Nov 9 16:43:13 2010
@@ -17,8 +17,6 @@
package org.apache.camel.builder;
import java.util.zip.Deflater;
-
-import org.apache.camel.model.dataformat.SyslogDataFormat;
import org.w3c.dom.Node;
import org.apache.camel.model.DataFormatDefinition;
@@ -37,6 +35,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
+import org.apache.camel.model.dataformat.SyslogDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
@@ -68,10 +67,10 @@ public class DataFormatClause<T extends
/**
* Uses the Bindy data format
*
- * @param type the type of bindy data format to use
+ * @param type the type of bindy data format to use
* @param packages packages to scan for Bindy annotated POJO classes
*/
- public T bindy(BindyType type, String... packages) {
+ public T bindy(BindyType type, String... packages) {
BindyDataFormat bindy = new BindyDataFormat();
bindy.setType(type);
bindy.setPackages(packages);
@@ -107,7 +106,7 @@ public class DataFormatClause<T extends
* Uses the Castor data format
*
* @param mappingFile name of mapping file to locate in classpath
- * @param validation whether validation is enabled or not
+ * @param validation whether validation is enabled or not
*/
public T castor(String mappingFile, boolean validation) {
CastorDataFormat castor = new CastorDataFormat();
@@ -146,7 +145,7 @@ public class DataFormatClause<T extends
public T jaxb() {
return dataFormat(new JaxbDataFormat());
}
-
+
/**
* Uses the JAXB data format with context path
*/
@@ -182,7 +181,7 @@ public class DataFormatClause<T extends
/**
* Uses the JSON data format
*
- * @param type the json type to use
+ * @param type the json type to use
* @param unmarshalType unmarshal type for json jackson type
*/
public T json(JsonLibrary type, Class<?> unmarshalType) {
@@ -190,20 +189,20 @@ public class DataFormatClause<T extends
json.setUnmarshalType(unmarshalType);
return dataFormat(json);
}
-
+
/**
* Uses the protobuf data format
*/
public T protobuf() {
return dataFormat(new ProtobufDataFormat());
}
-
+
public T protobuf(Object defaultInstance) {
ProtobufDataFormat dataFormat = new ProtobufDataFormat();
dataFormat.setDefaultInstance(defaultInstance);
return dataFormat(dataFormat);
}
-
+
public T protobuf(String instanceClassName) {
return dataFormat(new ProtobufDataFormat(instanceClassName));
}
@@ -213,36 +212,36 @@ public class DataFormatClause<T extends
*/
public T rss() {
return dataFormat(new RssDataFormat());
- }
-
+ }
+
/**
* Uses the Java Serialization data format
*/
public T serialization() {
return dataFormat(new SerializationDataFormat());
}
-
+
/**
* Uses the Soap JAXB data format
*/
public T soapjaxb() {
return dataFormat(new SoapJaxbDataFormat());
}
-
+
/**
* Uses the Soap JAXB data format
*/
public T soapjaxb(String contextPath) {
return dataFormat(new SoapJaxbDataFormat(contextPath));
}
-
+
/**
* Uses the Soap JAXB data format
*/
public T soapjaxb(String contextPath, String elementNameStrategyRef) {
return dataFormat(new SoapJaxbDataFormat(contextPath,
elementNameStrategyRef));
}
-
+
/**
* Uses the Soap JAXB data format
*/
@@ -273,7 +272,6 @@ public class DataFormatClause<T extends
return dataFormat(new SyslogDataFormat());
}
-
/**
* Return WellFormed HTML (an XML Document) either
* {...@link java.lang.String} or {...@link org.w3c.dom.Node}
@@ -283,8 +281,8 @@ public class DataFormatClause<T extends
}
/**
- * Return TidyMarkup in the default format
- * as {...@link org.w3c.dom.Node}
+ * Return TidyMarkup in the default format
+ * as {...@link org.w3c.dom.Node}
*/
public T tidyMarkup() {
return dataFormat(new TidyMarkupDataFormat(Node.class));
@@ -296,14 +294,14 @@ public class DataFormatClause<T extends
public T xstream() {
return dataFormat(new XStreamDataFormat());
}
-
+
/**
* Uses the xstream by setting the encoding
*/
public T xstream(String encoding) {
return dataFormat(new XStreamDataFormat(encoding));
}
-
+
/**
* Uses the XML Security data format
*/
@@ -358,14 +356,14 @@ public class DataFormatClause<T extends
ZipDataFormat zdf = new ZipDataFormat(compressionLevel);
return dataFormat(zdf);
}
-
+
@SuppressWarnings("unchecked")
private T dataFormat(DataFormatDefinition dataFormatType) {
switch (operation) {
case Unmarshal:
- return (T)processorType.unmarshal(dataFormatType);
+ return (T) processorType.unmarshal(dataFormatType);
case Marshal:
- return (T)processorType.marshal(dataFormatType);
+ return (T) processorType.marshal(dataFormatType);
default:
throw new IllegalArgumentException("Unknown DataFormat operation:
" + operation);
}
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=1033081&r1=1033080&r2=1033081&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
Tue Nov 9 16:43:13 2010
@@ -30,7 +30,7 @@ import org.apache.camel.Converter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class Rfc3164SyslogConverter {
+public final class Rfc3164SyslogConverter {
private static final transient Log LOG =
LogFactory.getLog(Rfc3164SyslogConverter.class);
@@ -38,7 +38,7 @@ public class Rfc3164SyslogConverter {
jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec
}
- private final static Map<String, MONTHS> MONTH_VALUE_MAP = new
HashMap<String, MONTHS>() {
+ private static Map<String, MONTHS> monthValueMap = new HashMap<String,
MONTHS>() {
{
put("jan", MONTHS.jan);
put("feb", MONTHS.feb);
@@ -55,6 +55,10 @@ public class Rfc3164SyslogConverter {
}
};
+ private Rfc3164SyslogConverter() {
+ //Utility class
+ }
+
@Converter
public static String toString(SyslogMessage message) {
StringBuilder sbr = new StringBuilder();
@@ -132,7 +136,7 @@ public class Rfc3164SyslogConverter {
return parseMessage(body.getBytes());
}
- public final static SyslogMessage parseMessage(byte[] bytes) {
+ public static SyslogMessage parseMessage(byte[] bytes) {
ByteBuffer byteBuffer = ByteBuffer.allocate(bytes.length);
byteBuffer.put(bytes);
byteBuffer.rewind();
@@ -249,7 +253,7 @@ public class Rfc3164SyslogConverter {
}
Calendar calendar = new GregorianCalendar();
- calendar.set(Calendar.MONTH,
MONTH_VALUE_MAP.get((String.valueOf(month).toLowerCase())).ordinal());
+ calendar.set(Calendar.MONTH,
monthValueMap.get(String.valueOf(month).toLowerCase()).ordinal());
calendar.set(Calendar.DAY_OF_MONTH, day);
calendar.set(Calendar.HOUR_OF_DAY, hour);
calendar.set(Calendar.MINUTE, minute);
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConstants.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConstants.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConstants.java
Tue Nov 9 16:43:13 2010
@@ -17,7 +17,7 @@
package org.apache.camel.component.syslog;
-public class SyslogConstants {
+public final class SyslogConstants {
/**
* The socket address of local machine that received the message.
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogFacility.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogFacility.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogFacility.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogFacility.java
Tue Nov 9 16:43:13 2010
@@ -41,7 +41,6 @@ public enum SyslogFacility {
LOCAL4,
LOCAL5,
LOCAL6,
- LOCAL7,;
-
+ LOCAL7,
}
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogMessage.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogMessage.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogMessage.java
Tue Nov 9 16:43:13 2010
@@ -88,6 +88,7 @@ public class SyslogMessage {
@Override
public String toString() {
- return "SyslogMessage{" + "content='" + logMessage + '\'' + ",
facility=" + facility + ", severity=" + severity + ", remoteAddress='" +
remoteAddress + '\'' + ", localAddress='" + localAddress + '\'' + ",
hostname='" + hostname + '\'' + ", messageTime=" + timestamp + '}';
+ return "SyslogMessage{" + "content='" + logMessage + '\'' + ",
facility=" + facility + ", severity=" + severity + ", remoteAddress='"
+ + remoteAddress + '\'' + ", localAddress='" + localAddress +
'\'' + ", hostname='" + hostname + '\'' + ", messageTime=" + timestamp + '}';
}
}
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogSeverity.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogSeverity.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogSeverity.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogSeverity.java
Tue Nov 9 16:43:13 2010
@@ -25,5 +25,5 @@ public enum SyslogSeverity {
WARNING,
NOTICE,
INFO,
- DEBUG,;
+ DEBUG,
}
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
Tue Nov 9 16:43:13 2010
@@ -34,7 +34,8 @@ public class MinaDataFormatTest extends
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 # %%";
+ 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 {
@@ -73,9 +74,7 @@ public class MinaDataFormatTest extends
DataFormat syslogDataFormat = new Rfc3164SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort)
-
- .unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" +
serverPort).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
}
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
Tue Nov 9 16:43:13 2010
@@ -33,7 +33,8 @@ public class MinaManyUDPMessagesTest ext
private final int serverPort = 10514;
private final int messageCount = 100;
- 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 # %%";
+ 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 testSendingManyMessages() throws Exception,
InterruptedException {
@@ -69,9 +70,7 @@ public class MinaManyUDPMessagesTest ext
DataFormat syslogDataFormat = new Rfc3164SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort)
-
- .unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" +
serverPort).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
}
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
Tue Nov 9 16:43:13 2010
@@ -34,7 +34,8 @@ public class NettyDataFormatTest extends
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 # %%";
+ 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 {
@@ -73,13 +74,12 @@ public class NettyDataFormatTest extends
DataFormat syslogDataFormat = new Rfc3164SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false")
-
- .unmarshal(syslogDataFormat).process(new Processor() {
- public void process(Exchange ex) {
- assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
- }
- }).to("mock:syslogReceiver").
+ from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ .process(new Processor() {
+ public void process(Exchange ex) {
+ assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
+ }
+ }).to("mock:syslogReceiver").
marshal(syslogDataFormat).to("mock:syslogReceiver2");
}
};
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
Tue Nov 9 16:43:13 2010
@@ -33,7 +33,8 @@ public class NettyManyUDPMessagesTest ex
private final int serverPort = 10514;
private final int messageCount = 100;
- 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 # %%";
+ 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 testSendingManyMessages() throws Exception,
InterruptedException {
@@ -69,13 +70,12 @@ public class NettyManyUDPMessagesTest ex
DataFormat syslogDataFormat = new Rfc3164SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false")
-
- .unmarshal(syslogDataFormat).process(new Processor() {
- public void process(Exchange ex) {
- assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
- }
- }).to("mock:stop1").
+ from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ .process(new Processor() {
+ public void process(Exchange ex) {
+ assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
+ }
+ }).to("mock:stop1").
marshal(syslogDataFormat).to("mock:stop2");
}
};
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
Tue Nov 9 16:43:13 2010
@@ -25,32 +25,32 @@ public class SyslogEnumsTest extends Tes
@Test
public void testFacilityConstants() {
- assertEquals("KERN", SyslogFacility.values()[(0 >> 3)].name());
- assertEquals("USER", SyslogFacility.values()[((1 >> 3 / 8))].name());
- assertEquals("MAIL", SyslogFacility.values()[((2 >> 3 / 8))].name());
- assertEquals("DAEMON", SyslogFacility.values()[((3 >> 3 / 8))].name());
- assertEquals("AUTH", SyslogFacility.values()[((4 >> 3 / 8))].name());
- assertEquals("SYSLOG", SyslogFacility.values()[((5 >> 3 / 8))].name());
- assertEquals("LPR", SyslogFacility.values()[(((6 >> 3 / 8)))].name());
- assertEquals("NEWS", SyslogFacility.values()[(((7 >> 3 / 8)))].name());
- assertEquals("UUCP", SyslogFacility.values()[(((8 >> 3 / 8)))].name());
- assertEquals("CRON", SyslogFacility.values()[(((9 >> 3 / 8)))].name());
- assertEquals("AUTHPRIV", SyslogFacility.values()[((10 >> 3 /
8))].name());
- assertEquals("FTP", SyslogFacility.values()[((11 >> 3 / 8))].name());
+ assertEquals("KERN", SyslogFacility.values()[0 >> 3].name());
+ assertEquals("USER", SyslogFacility.values()[1 >> 3 / 8].name());
+ assertEquals("MAIL", SyslogFacility.values()[2 >> 3 / 8].name());
+ assertEquals("DAEMON", SyslogFacility.values()[3 >> 3 / 8].name());
+ assertEquals("AUTH", SyslogFacility.values()[4 >> 3 / 8].name());
+ assertEquals("SYSLOG", SyslogFacility.values()[5 >> 3 / 8].name());
+ assertEquals("LPR", SyslogFacility.values()[6 >> 3 / 8].name());
+ assertEquals("NEWS", SyslogFacility.values()[7 >> 3 / 8].name());
+ assertEquals("UUCP", SyslogFacility.values()[8 >> 3 / 8].name());
+ assertEquals("CRON", SyslogFacility.values()[9 >> 3 / 8].name());
+ assertEquals("AUTHPRIV", SyslogFacility.values()[10 >> 3 / 8].name());
+ assertEquals("FTP", SyslogFacility.values()[11 >> 3 / 8].name());
/**
RESERVED_12,
RESERVED_13,
RESERVED_14,
RESERVED_15,
*/
- assertEquals("LOCAL0", SyslogFacility.values()[((16 >> 3 /
8))].name());
- assertEquals("LOCAL1", SyslogFacility.values()[((17 >> 3 /
8))].name());
- assertEquals("LOCAL2", SyslogFacility.values()[((18 >> 3 /
8))].name());
- assertEquals("LOCAL3", SyslogFacility.values()[((19 >> 3 /
8))].name());
- assertEquals("LOCAL4", SyslogFacility.values()[((20 >> 3 /
8))].name());
- assertEquals("LOCAL5", SyslogFacility.values()[((21 >> 3 /
8))].name());
- assertEquals("LOCAL6", SyslogFacility.values()[((22 >> 3 /
8))].name());
- assertEquals("LOCAL7", SyslogFacility.values()[((23 >> 3 /
8))].name());
+ assertEquals("LOCAL0", SyslogFacility.values()[16 >> 3 / 8].name());
+ assertEquals("LOCAL1", SyslogFacility.values()[17 >> 3 / 8].name());
+ assertEquals("LOCAL2", SyslogFacility.values()[18 >> 3 / 8].name());
+ assertEquals("LOCAL3", SyslogFacility.values()[19 >> 3 / 8].name());
+ assertEquals("LOCAL4", SyslogFacility.values()[20 >> 3 / 8].name());
+ assertEquals("LOCAL5", SyslogFacility.values()[21 >> 3 / 8].name());
+ assertEquals("LOCAL6", SyslogFacility.values()[22 >> 3 / 8].name());
+ assertEquals("LOCAL7", SyslogFacility.values()[23 >> 3 / 8].name());
}
@Test
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
Tue Nov 9 16:43:13 2010
@@ -32,7 +32,8 @@ public class SyslogSpringMinaTest extend
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 # %%";
+ 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 # %%";
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
Modified:
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java?rev=1033081&r1=1033080&r2=1033081&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
(original)
+++
camel/trunk/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
Tue Nov 9 16:43:13 2010
@@ -31,7 +31,8 @@ import org.springframework.context.suppo
public class SyslogSpringNettyTest extends CamelSpringTestSupport {
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 # %%";
+ 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 # %%";
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
