You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/01/11 06:33:45 UTC
svn commit: r1431898 - in /logging/log4j/log4j2/trunk:
api/src/main/java/org/apache/logging/log4j/message/
api/src/main/java/org/apache/logging/log4j/spi/
api/src/test/java/org/apache/logging/log4j/
core/src/main/java/org/apache/logging/log4j/core/appe...
Author: ggregory
Date: Fri Jan 11 05:33:44 2013
New Revision: 1431898
URL: http://svn.apache.org/viewvc?rev=1431898&view=rev
Log:
Add final modifier to method parameters.
Modified:
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/Provider.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpResponse.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java
logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java Fri Jan 11 05:33:44 2013
@@ -54,13 +54,13 @@ public class FormattedMessage implements
private static final Pattern MSG_PATTERN = Pattern.compile(formatSpecifier);
- public FormattedMessage(String messagePattern, Object[] arguments, Throwable throwable) {
+ public FormattedMessage(final String messagePattern, final Object[] arguments, final Throwable throwable) {
this.messagePattern = messagePattern;
this.argArray = arguments;
this.throwable = throwable;
}
- public FormattedMessage(String messagePattern, Object[] arguments) {
+ public FormattedMessage(final String messagePattern, final Object[] arguments) {
this.messagePattern = messagePattern;
this.argArray = arguments;
this.throwable = null;
@@ -71,7 +71,7 @@ public class FormattedMessage implements
* @param messagePattern The message pattern.
* @param arg The parameter.
*/
- public FormattedMessage(String messagePattern, Object arg) {
+ public FormattedMessage(final String messagePattern, final Object arg) {
this.messagePattern = messagePattern;
this.argArray = new Object[] {arg};
this.throwable = null;
@@ -83,7 +83,7 @@ public class FormattedMessage implements
* @param arg1 The first parameter.
* @param arg2 The second parameter.
*/
- public FormattedMessage(String messagePattern, Object arg1, Object arg2) {
+ public FormattedMessage(final String messagePattern, final Object arg1, final Object arg2) {
this(messagePattern, new Object[]{arg1, arg2});
}
@@ -121,7 +121,7 @@ public class FormattedMessage implements
return stringArgs;
}
- protected Message getMessage(String msgPattern, Object[] args, Throwable throwable) {
+ protected Message getMessage(final String msgPattern, final Object[] args, final Throwable throwable) {
try {
final MessageFormat format = new MessageFormat(msgPattern);
final Format[] formats = format.getFormats();
@@ -142,7 +142,7 @@ public class FormattedMessage implements
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -176,7 +176,7 @@ public class FormattedMessage implements
Arrays.toString(argArray) + "]";
}
- private void writeObject(ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
getFormattedMessage();
out.writeUTF(formattedMessage);
@@ -190,7 +190,7 @@ public class FormattedMessage implements
}
}
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
formattedMessage = in.readUTF();
messagePattern = in.readUTF();
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java Fri Jan 11 05:33:44 2013
@@ -30,7 +30,7 @@ public class FormattedMessageFactory ext
* @see MessageFactory#newMessage(String, Object...)
*/
@Override
- public Message newMessage(String message, Object... params) {
+ public Message newMessage(final String message, final Object... params) {
return new FormattedMessage(message, params);
}
}
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java Fri Jan 11 05:33:44 2013
@@ -130,7 +130,7 @@ public class LocalizedMessage implements
this(bundleId, locale, key, new Object[] {arg1, arg2});
}
- public LocalizedMessage(ResourceBundle bundle, Locale locale, String key, Object arg1, Object arg2) {
+ public LocalizedMessage(final ResourceBundle bundle, final Locale locale, final String key, final Object arg1, final Object arg2) {
this(bundle, locale, key, new Object[] {arg1, arg2});
}
@@ -245,7 +245,7 @@ public class LocalizedMessage implements
return rb;
}
- private void writeObject(ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
getFormattedMessage();
out.writeUTF(formattedMessage);
@@ -260,7 +260,7 @@ public class LocalizedMessage implements
}
}
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
formattedMessage = in.readUTF();
messagePattern = in.readUTF();
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java Fri Jan 11 05:33:44 2013
@@ -29,13 +29,13 @@ public class LocalizedMessageFactory ext
private final ResourceBundle bundle;
private final String bundleId;
- public LocalizedMessageFactory(ResourceBundle bundle) {
+ public LocalizedMessageFactory(final ResourceBundle bundle) {
this.bundle = bundle;
this.bundleId = null;
}
- public LocalizedMessageFactory(String bundleId) {
+ public LocalizedMessageFactory(final String bundleId) {
this.bundle = null;
this.bundleId = bundleId;
}
@@ -47,7 +47,7 @@ public class LocalizedMessageFactory ext
* @see org.apache.logging.log4j.message.MessageFactory#newMessage(String, Object...)
*/
@Override
- public Message newMessage(String message, Object... params) {
+ public Message newMessage(final String message, final Object... params) {
if (bundle == null) {
return new LocalizedMessage(bundleId, message, params);
}
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java Fri Jan 11 05:33:44 2013
@@ -43,7 +43,7 @@ public class MessageFormatMessage implem
private String[] stringArgs;
private transient String formattedMessage;
- public MessageFormatMessage(String messagePattern, Object... arguments) {
+ public MessageFormatMessage(final String messagePattern, final Object... arguments) {
this.messagePattern = messagePattern;
this.argArray = arguments;
}
@@ -78,7 +78,7 @@ public class MessageFormatMessage implem
return stringArgs;
}
- protected String formatMessage(String msgPattern, Object... args) {
+ protected String formatMessage(final String msgPattern, final Object... args) {
try {
return MessageFormat.format(msgPattern, args);
} catch (final IllegalFormatException ife) {
@@ -88,7 +88,7 @@ public class MessageFormatMessage implem
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -122,7 +122,7 @@ public class MessageFormatMessage implem
Arrays.toString(argArray) + "]";
}
- private void writeObject(ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
getFormattedMessage();
out.writeUTF(formattedMessage);
@@ -136,7 +136,7 @@ public class MessageFormatMessage implem
}
}
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
formattedMessage = in.readUTF();
messagePattern = in.readUTF();
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java Fri Jan 11 05:33:44 2013
@@ -30,7 +30,7 @@ public class MessageFormatMessageFactory
* @see org.apache.logging.log4j.message.MessageFactory#newMessage(String, Object...)
*/
@Override
- public Message newMessage(String message, Object... params) {
+ public Message newMessage(final String message, final Object... params) {
return new MessageFormatMessage(message, params);
}
}
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java Fri Jan 11 05:33:44 2013
@@ -34,7 +34,7 @@ public class DefaultThreadContextMap imp
}
};
- public DefaultThreadContextMap(boolean useMap) {
+ public DefaultThreadContextMap(final boolean useMap) {
this.useMap = useMap;
}
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/Provider.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/Provider.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/Provider.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/Provider.java Fri Jan 11 05:33:44 2013
@@ -32,7 +32,7 @@ public class Provider {
private final String threadContextMap;
private final URL url;
- public Provider(Properties props, URL url) {
+ public Provider(final Properties props, final URL url) {
this.url = url;
final String weight = props.getProperty(FACTORY_PRIORITY);
priority = weight == null ? -1 : Integer.valueOf(weight);
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java Fri Jan 11 05:33:44 2013
@@ -57,7 +57,7 @@ public class ThreadContextTest {
private final StringBuilder sb;
- public TestThread(StringBuilder sb) {
+ public TestThread(final StringBuilder sb) {
this.sb = sb;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Fri Jan 11 05:33:44 2013
@@ -127,7 +127,7 @@ public final class FailoverAppender exte
}
}
- private void failover(final LogEvent event, Exception ex) {
+ private void failover(final LogEvent event, final Exception ex) {
final RuntimeException re = ex != null ? new LoggingException(ex) : null;
boolean written = false;
Exception failoverException = null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Fri Jan 11 05:33:44 2013
@@ -51,7 +51,7 @@ public class SMTPAppender extends Abstra
protected final SMTPManager manager;
private SMTPAppender(final String name, final Filter filter, final Layout<?> layout, final SMTPManager manager,
- boolean handleExceptions) {
+ final boolean handleExceptions) {
super(name, filter, layout, handleExceptions);
this.manager = manager;
}
@@ -105,7 +105,7 @@ public class SMTPAppender extends Abstra
@PluginAttr("from") final String from,
@PluginAttr("replyTo") final String replyTo,
@PluginAttr("subject") final String subject,
- @PluginAttr("smtpProtocol") String smtpProtocol,
+ @PluginAttr("smtpProtocol") final String smtpProtocol,
@PluginAttr("smtpHost") final String smtpHost,
@PluginAttr("smtpPort") final String smtpPortNum,
@PluginAttr("smtpUsername") final String smtpUsername,
@@ -145,7 +145,7 @@ public class SMTPAppender extends Abstra
* Capture all events in CyclicBuffer
*/
@Override
- public boolean isFiltered(LogEvent event) {
+ public boolean isFiltered(final LogEvent event) {
manager.add(event);
return super.isFiltered(event);
}
@@ -155,7 +155,7 @@ public class SMTPAppender extends Abstra
* to a cyclic buffer and checking if the event triggers an e-mail to be
* sent.
*/
- public void append(LogEvent event) {
+ public void append(final LogEvent event) {
manager.sendEvents(getLayout());
}
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java Fri Jan 11 05:33:44 2013
@@ -33,7 +33,7 @@ public class CyclicBuffer<T> {
* Instantiate a new CyclicBuffer of at most <code>maxSize</code>
* events.
*/
- public CyclicBuffer(Class<T> clazz, int size) throws IllegalArgumentException {
+ public CyclicBuffer(final Class<T> clazz, final int size) throws IllegalArgumentException {
if (size < 1) {
throw new IllegalArgumentException("The maxSize argument (" + size + ") is not a positive integer.");
}
@@ -42,14 +42,14 @@ public class CyclicBuffer<T> {
}
@SuppressWarnings("unchecked")
- private T[] makeArray(Class<T> clazz, int size) {
+ private T[] makeArray(final Class<T> clazz, final int size) {
return (T[]) Array.newInstance(clazz, size);
}
/**
* Add an item as the last event in the buffer.
*/
- public synchronized void add(T item) {
+ public synchronized void add(final T item) {
ring[last] = item;
if (++last == ring.length) {
last = 0;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java Fri Jan 11 05:33:44 2013
@@ -34,7 +34,7 @@ public final class NameUtil {
return i > 0 ? name.substring(0, i) : "";
}
- public static String md5(String string) {
+ public static String md5(final String string) {
try {
final MessageDigest digest = MessageDigest.getInstance("MD5");
digest.update(string.getBytes());
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Fri Jan 11 05:33:44 2013
@@ -256,7 +256,7 @@ public final class RFC5424Layout extends
return buf.toString();
}
- private String escapeNewlines(String text, String escapeNewLine)
+ private String escapeNewlines(final String text, final String escapeNewLine)
{
if(null == escapeNewLine) {
return text;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java Fri Jan 11 05:33:44 2013
@@ -117,7 +117,7 @@ public class JMSQueueManager extends Abs
}
}
- private void cleanup(boolean quiet) {
+ private void cleanup(final boolean quiet) {
try {
info.session.close();
} catch (final Exception e) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java Fri Jan 11 05:33:44 2013
@@ -118,7 +118,7 @@ public class JMSTopicManager extends Abs
}
}
- private void cleanup(boolean quiet) {
+ private void cleanup(final boolean quiet) {
try {
info.session.close();
} catch (final Exception e) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java Fri Jan 11 05:33:44 2013
@@ -29,7 +29,7 @@ import javax.mail.internet.MimeMessage;
public class MimeMessageBuilder {
private final MimeMessage message;
- public MimeMessageBuilder(Session session) {
+ public MimeMessageBuilder(final Session session) {
message = new MimeMessage(session);
}
@@ -78,11 +78,11 @@ public class MimeMessageBuilder {
return message;
}
- private static InternetAddress parseAddress(String address) throws AddressException {
+ private static InternetAddress parseAddress(final String address) throws AddressException {
return address == null ? null : new InternetAddress(address);
}
- private static InternetAddress[] parseAddresses(String addresses) throws AddressException {
+ private static InternetAddress[] parseAddresses(final String addresses) throws AddressException {
return addresses == null ? null : InternetAddress.parse(addresses, true);
}
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java Fri Jan 11 05:33:44 2013
@@ -66,7 +66,7 @@ public class SMTPManager extends Abstrac
this.buffer = new CyclicBuffer<LogEvent>(LogEvent.class, data.numElements);
}
- public void add(LogEvent event) {
+ public void add(final LogEvent event) {
buffer.add(event);
}
@@ -124,7 +124,7 @@ public class SMTPManager extends Abstrac
/**
* Send the contents of the cyclic buffer as an e-mail message.
*/
- public void sendEvents(Layout<?> layout) {
+ public void sendEvents(final Layout<?> layout) {
if (message == null) {
connect();
}
@@ -151,27 +151,27 @@ public class SMTPManager extends Abstrac
}
}
- protected byte[] formatContentToBytes(CyclicBuffer<LogEvent> cb, Layout<?> layout) throws IOException {
+ protected byte[] formatContentToBytes(final CyclicBuffer<LogEvent> cb, final Layout<?> layout) throws IOException {
final ByteArrayOutputStream raw = new ByteArrayOutputStream();
writeContent(cb, layout, raw);
return raw.toByteArray();
}
- private void writeContent(CyclicBuffer<LogEvent> cb, Layout<?> layout, ByteArrayOutputStream out)
+ private void writeContent(final CyclicBuffer<LogEvent> cb, final Layout<?> layout, final ByteArrayOutputStream out)
throws IOException {
writeHeader(layout, out);
writeBuffer(cb, layout, out);
writeFooter(layout, out);
}
- protected void writeHeader(Layout<?> layout, OutputStream out) throws IOException {
+ protected void writeHeader(final Layout<?> layout, final OutputStream out) throws IOException {
final byte[] header = layout.getHeader();
if (header != null) {
out.write(header);
}
}
- protected void writeBuffer(CyclicBuffer<LogEvent> cb, Layout<?> layout, OutputStream out) throws IOException {
+ protected void writeBuffer(final CyclicBuffer<LogEvent> cb, final Layout<?> layout, final OutputStream out) throws IOException {
final LogEvent[] events = cb.removeAll();
for (final LogEvent event : events) {
final byte[] bytes = layout.toByteArray(event);
@@ -179,46 +179,46 @@ public class SMTPManager extends Abstrac
}
}
- protected void writeFooter(Layout<?> layout, OutputStream out) throws IOException {
+ protected void writeFooter(final Layout<?> layout, final OutputStream out) throws IOException {
final byte[] footer = layout.getFooter();
if (footer != null) {
out.write(footer);
}
}
- protected String getEncoding(byte[] rawBytes, String contentType) {
+ protected String getEncoding(final byte[] rawBytes, final String contentType) {
final DataSource dataSource = new ByteArrayDataSource(rawBytes, contentType);
return MimeUtility.getEncoding(dataSource);
}
- protected byte[] encodeContentToBytes(byte[] rawBytes, String encoding) throws MessagingException, IOException {
+ protected byte[] encodeContentToBytes(final byte[] rawBytes, final String encoding) throws MessagingException, IOException {
final ByteArrayOutputStream encoded = new ByteArrayOutputStream();
encodeContent(rawBytes, encoding, encoded);
return encoded.toByteArray();
}
- protected void encodeContent(byte[] bytes, String encoding, ByteArrayOutputStream out)
+ protected void encodeContent(final byte[] bytes, final String encoding, final ByteArrayOutputStream out)
throws MessagingException, IOException {
final OutputStream encoder = MimeUtility.encode(out, encoding);
encoder.write(bytes);
encoder.close();
}
- protected InternetHeaders getHeaders(String contentType, String encoding) {
+ protected InternetHeaders getHeaders(final String contentType, final String encoding) {
final InternetHeaders headers = new InternetHeaders();
headers.setHeader("Content-Type", contentType + "; charset=UTF-8");
headers.setHeader("Content-Transfer-Encoding", encoding);
return headers;
}
- protected MimeMultipart getMimeMultipart(byte[] encodedBytes, InternetHeaders headers) throws MessagingException {
+ protected MimeMultipart getMimeMultipart(final byte[] encodedBytes, final InternetHeaders headers) throws MessagingException {
final MimeMultipart mp = new MimeMultipart();
final MimeBodyPart part = new MimeBodyPart(headers, encodedBytes);
mp.addBodyPart(part);
return mp;
}
- protected void sendMultipartMessage(MimeMessage message, MimeMultipart mp) throws MessagingException {
+ protected void sendMultipartMessage(final MimeMessage message, final MimeMultipart mp) throws MessagingException {
synchronized (message) {
message.setContent(mp);
message.setSentDate(new Date());
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java Fri Jan 11 05:33:44 2013
@@ -141,7 +141,7 @@ public final class PatternParser {
}
- public List<PatternFormatter> parse(final String pattern, boolean handleExceptions) {
+ public List<PatternFormatter> parse(final String pattern, final boolean handleExceptions) {
final List<PatternFormatter> list = new ArrayList<PatternFormatter>();
final List<PatternConverter> converters = new ArrayList<PatternConverter>();
final List<FormattingInfo> fields = new ArrayList<FormattingInfo>();
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java Fri Jan 11 05:33:44 2013
@@ -67,7 +67,7 @@ public class SimpleSmtpServer implements
*
* @param port port number
*/
- public SimpleSmtpServer(int port) {
+ public SimpleSmtpServer(final int port) {
receivedMail = new ArrayList();
this.port = port;
}
@@ -163,7 +163,7 @@ public class SimpleSmtpServer implements
* @return List of SmtpMessage
* @throws IOException
*/
- private List handleTransaction(PrintWriter out, BufferedReader input) throws IOException {
+ private List handleTransaction(final PrintWriter out, final BufferedReader input) throws IOException {
// Initialize the state machine
SmtpState smtpState = SmtpState.CONNECT;
final SmtpRequest smtpRequest = new SmtpRequest(SmtpActionType.CONNECT, "", smtpState);
@@ -214,7 +214,7 @@ public class SimpleSmtpServer implements
* @param out socket output stream
* @param smtpResponse response object
*/
- private static void sendResponse(PrintWriter out, SmtpResponse smtpResponse) {
+ private static void sendResponse(final PrintWriter out, final SmtpResponse smtpResponse) {
if (smtpResponse.getCode() > 0) {
final int code = smtpResponse.getCode();
final String message = smtpResponse.getMessage();
@@ -256,7 +256,7 @@ public class SimpleSmtpServer implements
* @param port port number the server should listen to
* @return a reference to the SMTP server
*/
- public static SimpleSmtpServer start(int port) {
+ public static SimpleSmtpServer start(final int port) {
final SimpleSmtpServer server = new SimpleSmtpServer(port);
final Thread t = new Thread(server);
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java Fri Jan 11 05:33:44 2013
@@ -146,7 +146,7 @@ public class SmtpActionType {
*
* @param value one of the _BYTE values
*/
- private SmtpActionType(byte value) {
+ private SmtpActionType(final byte value) {
this.value = value;
}
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java Fri Jan 11 05:33:44 2013
@@ -50,7 +50,7 @@ public class SmtpMessage {
* @param response SmtpResponse object
* @param params remainder of input line after SMTP command has been removed
*/
- public void store(SmtpResponse response, String params) {
+ public void store(final SmtpResponse response, final String params) {
if (params != null) {
if (SmtpState.DATA_HDR.equals(response.getNextState())) {
final int headerNameEnd = params.indexOf(':');
@@ -81,7 +81,7 @@ public class SmtpMessage {
* @param name header name
* @return value(s) associated with the header name
*/
- public String[] getHeaderValues(String name) {
+ public String[] getHeaderValues(final String name) {
final List values = (List) headers.get(name);
if (values == null) {
return new String[0];
@@ -96,7 +96,7 @@ public class SmtpMessage {
* @param name header name
* @return first value associated with the header name
*/
- public String getHeaderValue(String name) {
+ public String getHeaderValue(final String name) {
final List values = (List) headers.get(name);
if (values == null) {
return null;
@@ -121,7 +121,7 @@ public class SmtpMessage {
* @param name header name
* @param value header value
*/
- private void addHeader(String name, String value) {
+ private void addHeader(final String name, final String value) {
List valueList = (List) headers.get(name);
if (valueList == null) {
valueList = new ArrayList(1);
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpRequest.java Fri Jan 11 05:33:44 2013
@@ -62,7 +62,7 @@ public class SmtpRequest {
* @param params remainder of command line once command is removed
* @param state current SMTP server state
*/
- public SmtpRequest(SmtpActionType actionType, String params, SmtpState state) {
+ public SmtpRequest(final SmtpActionType actionType, final String params, final SmtpState state) {
this.action = actionType;
this.state = state;
this.params = params;
@@ -161,7 +161,7 @@ public class SmtpRequest {
* @param state current state
* @return a populated SmtpRequest object
*/
- public static SmtpRequest createRequest(String s, SmtpState state) {
+ public static SmtpRequest createRequest(final String s, final SmtpState state) {
SmtpActionType action = null;
String params = null;
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpResponse.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpResponse.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpResponse.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpResponse.java Fri Jan 11 05:33:44 2013
@@ -40,7 +40,7 @@ public class SmtpResponse {
* @param message response message
* @param next next state of the SMTP server
*/
- public SmtpResponse(int code, String message, SmtpState next) {
+ public SmtpResponse(final int code, final String message, final SmtpState next) {
this.code = code;
this.message = message;
this.nextState = next;
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java Fri Jan 11 05:33:44 2013
@@ -88,7 +88,7 @@ public class SmtpState {
*
* @param value one of the _BYTE values.
*/
- private SmtpState(byte value) {
+ private SmtpState(final byte value) {
this.value = value;
}
Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java Fri Jan 11 05:33:44 2013
@@ -25,15 +25,15 @@ import java.util.Map;
* Bind the ThreadContextMap to the SLF4J MDC.
*/
public class MDCContextMap implements ThreadContextMap {
- public void put(String key, String value) {
+ public void put(final String key, final String value) {
MDC.put(key, value);
}
- public String get(String key) {
+ public String get(final String key) {
return MDC.get(key);
}
- public void remove(String key) {
+ public void remove(final String key) {
MDC.remove(key);
}
@@ -41,7 +41,7 @@ public class MDCContextMap implements Th
MDC.clear();
}
- public boolean containsKey(String key) {
+ public boolean containsKey(final String key) {
return MDC.getCopyOfContextMap().containsKey(key);
}
Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java Fri Jan 11 05:33:44 2013
@@ -46,7 +46,7 @@ public class SLF4JLogger extends Abstrac
}
@Override
- protected void log(Marker marker, String fqcn, Level level, Message data, Throwable t) {
+ protected void log(final Marker marker, final String fqcn, final Level level, final Message data, final Throwable t) {
if (locationAwareLogger != null) {
if (data instanceof LoggerNameAwareMessage) {
((LoggerNameAwareMessage) data).setLoggerName(getName());
@@ -71,7 +71,7 @@ public class SLF4JLogger extends Abstrac
}
}
- private org.slf4j.Marker getMarker(Marker marker) {
+ private org.slf4j.Marker getMarker(final Marker marker) {
if (marker == null) {
return null;
}
@@ -84,7 +84,7 @@ public class SLF4JLogger extends Abstrac
return slf4jMarker;
}
- private int convertLevel(Level level) {
+ private int convertLevel(final Level level) {
switch (level) {
case DEBUG :
return LocationAwareLogger.DEBUG_INT;
@@ -102,31 +102,31 @@ public class SLF4JLogger extends Abstrac
}
@Override
- protected boolean isEnabled(Level level, Marker marker, String data) {
+ protected boolean isEnabled(final Level level, final Marker marker, final String data) {
return isEnabledFor(level, marker);
}
@Override
- protected boolean isEnabled(Level level, Marker marker, String data, Throwable t) {
+ protected boolean isEnabled(final Level level, final Marker marker, final String data, final Throwable t) {
return isEnabledFor(level, marker);
}
@Override
- protected boolean isEnabled(Level level, Marker marker, String data, Object... p1) {
+ protected boolean isEnabled(final Level level, final Marker marker, final String data, final Object... p1) {
return isEnabledFor(level, marker);
}
@Override
- protected boolean isEnabled(Level level, Marker marker, Object data, Throwable t) {
+ protected boolean isEnabled(final Level level, final Marker marker, final Object data, final Throwable t) {
return isEnabledFor(level, marker);
}
@Override
- protected boolean isEnabled(Level level, Marker marker, Message data, Throwable t) {
+ protected boolean isEnabled(final Level level, final Marker marker, final Message data, final Throwable t) {
return isEnabledFor(level, marker);
}
- private boolean isEnabledFor(Level level, Marker marker) {
+ private boolean isEnabledFor(final Level level, final Marker marker) {
final org.slf4j.Marker slf4jMarker = getMarker(marker);
switch (level) {
case DEBUG :
Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java Fri Jan 11 05:33:44 2013
@@ -34,21 +34,21 @@ public class SLF4JLoggerContext implemen
return null;
}
- public Logger getLogger(String name) {
+ public Logger getLogger(final String name) {
if (!loggers.containsKey(name)) {
loggers.putIfAbsent(name, new SLF4JLogger(name, LoggerFactory.getLogger(name)));
}
return loggers.get(name);
}
- public Logger getLogger(String name, MessageFactory messageFactory) {
+ public Logger getLogger(final String name, final MessageFactory messageFactory) {
if (!loggers.containsKey(name)) {
loggers.putIfAbsent(name, new SLF4JLogger(name, messageFactory, LoggerFactory.getLogger(name)));
}
return loggers.get(name);
}
- public boolean hasLogger(String name) {
+ public boolean hasLogger(final String name) {
return loggers.containsKey(name);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java Fri Jan 11 05:33:44 2013
@@ -66,7 +66,7 @@ public class LoggerTest {
rootLogger.detachAppender("console");
}
- private static void configure(String file) throws JoranException {
+ private static void configure(final String file) throws JoranException {
final JoranConfigurator jc = new JoranConfigurator();
jc.setContext(context);
jc.doConfigure(file);
Modified: logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java (original)
+++ logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java Fri Jan 11 05:33:44 2013
@@ -32,7 +32,7 @@ import java.lang.reflect.Proxy;
*/
public class LogEventFactory {
- public static <T> T getEvent(Class<T> intrface) {
+ public static <T> T getEvent(final Class<T> intrface) {
final Class<?>[] interfaces = new Class<?>[]{intrface};
@@ -49,12 +49,12 @@ public class LogEventFactory {
private final StructuredDataMessage msg;
private final Class intrface;
- public AuditProxy(StructuredDataMessage msg, Class intrface) {
+ public AuditProxy(final StructuredDataMessage msg, final Class intrface) {
this.msg = msg;
this.intrface = intrface;
}
- public Object invoke(Object o, Method method, Object[] objects)
+ public Object invoke(final Object o, final Method method, final Object[] objects)
throws Throwable {
if (method.getName().equals("logEvent")) {
Modified: logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java (original)
+++ logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java Fri Jan 11 05:33:44 2013
@@ -66,7 +66,7 @@ public class LoggingController {
@RequestMapping(value = "/start.do", method = RequestMethod.GET)
public ModelAndView startLogging(
@RequestParam(value = "member", required = false, defaultValue = "fakemember") final String member,
- HttpServletRequest servletRequest) {
+ final HttpServletRequest servletRequest) {
System.out.println("STARTING..................");
@@ -116,7 +116,7 @@ public class LoggingController {
}
@RequestMapping(value = "/stop.do", method = RequestMethod.GET)
- public ModelAndView stopLogging(HttpServletRequest servletRequest) {
+ public ModelAndView stopLogging(final HttpServletRequest servletRequest) {
generateLog = false;
return new ModelAndView("stop.jsp");
}
Modified: logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java (original)
+++ logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java Fri Jan 11 05:33:44 2013
@@ -32,7 +32,7 @@ public class MockEventsSupplier {
/* This provides random generation */
static Random ran = new Random();
- public static List<AuditEvent> getAllEvents(String member) {
+ public static List<AuditEvent> getAllEvents(final String member) {
final List<AuditEvent> events = new ArrayList<AuditEvent>();
Modified: logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java (original)
+++ logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java Fri Jan 11 05:33:44 2013
@@ -64,7 +64,7 @@ public final class RequestContext {
return ThreadContext.get(REQUEST_ID);
}
- public static void setSessionId(String id) {
+ public static void setSessionId(final String id) {
ThreadContext.put(SESSION_ID, id);
}
@@ -72,7 +72,7 @@ public final class RequestContext {
return ThreadContext.get(SESSION_ID);
}
- public static void setTransId(String id) {
+ public static void setTransId(final String id) {
ThreadContext.put(TRANSACTION_ID, id);
}
@@ -80,7 +80,7 @@ public final class RequestContext {
return ThreadContext.get(TRANSACTION_ID);
}
- public static void setRequestURI(String URI) {
+ public static void setRequestURI(final String URI) {
ThreadContext.put(REQUEST_URI, URI);
}
@@ -88,7 +88,7 @@ public final class RequestContext {
return ThreadContext.get(REQUEST_URI);
}
- public static void setLoginId(String id) {
+ public static void setLoginId(final String id) {
ThreadContext.put(LOGIN_ID, id);
}
@@ -96,7 +96,7 @@ public final class RequestContext {
return ThreadContext.get(LOGIN_ID);
}
- public static void setUserId(String id) {
+ public static void setUserId(final String id) {
ThreadContext.put(USER_ID, id);
}
@@ -104,7 +104,7 @@ public final class RequestContext {
return ThreadContext.get(USER_ID);
}
- public static void setUserType(String type) {
+ public static void setUserType(final String type) {
ThreadContext.put(USER_TYPE, type);
}
@@ -112,7 +112,7 @@ public final class RequestContext {
return ThreadContext.get(USER_TYPE);
}
- public static void setClientId(String id) {
+ public static void setClientId(final String id) {
ThreadContext.put(CLIENT_ID, id);
}
@@ -120,7 +120,7 @@ public final class RequestContext {
return ThreadContext.get(CLIENT_ID);
}
- public static void setIpAddress(String addr) {
+ public static void setIpAddress(final String addr) {
ThreadContext.put(IP_ADDRESS, addr);
}
@@ -128,7 +128,7 @@ public final class RequestContext {
return ThreadContext.get(IP_ADDRESS);
}
- public static void setProductName(String productName) {
+ public static void setProductName(final String productName) {
ThreadContext.put(PRODUCT_NAME, productName);
}
@@ -137,7 +137,7 @@ public final class RequestContext {
}
- public static void setProductVersion(String productVersion) {
+ public static void setProductVersion(final String productVersion) {
ThreadContext.put(PRODUCT_VERSION, productVersion);
}
@@ -145,7 +145,7 @@ public final class RequestContext {
return ThreadContext.get(PRODUCT_VERSION);
}
- public static void setLocale(String locale) {
+ public static void setLocale(final String locale) {
ThreadContext.put(LOCALE, locale);
}
@@ -153,7 +153,7 @@ public final class RequestContext {
return ThreadContext.get(LOCALE);
}
- public static void setRegion(String region) {
+ public static void setRegion(final String region) {
ThreadContext.put(REGION, region);
}
@@ -161,7 +161,7 @@ public final class RequestContext {
return ThreadContext.get(REGION);
}
- public static void setUserAgent(String agent) {
+ public static void setUserAgent(final String agent) {
ThreadContext.put(USER_AGENT, agent);
}
Modified: logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java (original)
+++ logging/log4j/log4j2/trunk/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java Fri Jan 11 05:33:44 2013
@@ -18,31 +18,31 @@ package org.apache.logging.log4j.samples
public class NamingUtils {
- public static String getPackageName(String className) {
+ public static String getPackageName(final String className) {
return className.substring(0, className.lastIndexOf("."));
}
- public static String getSimpleName(String className) {
+ public static String getSimpleName(final String className) {
return className.substring(className.lastIndexOf(".") + 1);
}
- public static String getMethodShortName(String name) {
+ public static String getMethodShortName(final String name) {
return name.replaceFirst("(get|set|is|has)", "");
}
- public static String upperFirst(String name) {
+ public static String upperFirst(final String name) {
return String.valueOf(name.charAt(0)).toUpperCase() + name.substring(1);
}
- public static String lowerFirst(String name) {
+ public static String lowerFirst(final String name) {
return String.valueOf(name.charAt(0)).toLowerCase() + name.substring(1);
}
- public static String getSetterName(String fieldName) {
+ public static String getSetterName(final String fieldName) {
return "set" + upperFirst(fieldName);
}
- public static String getGetterName(String fieldName, String type) {
+ public static String getGetterName(final String fieldName, final String type) {
if ("boolean".equals(type)) {
return "is" + upperFirst(fieldName);
} else {
@@ -50,7 +50,7 @@ public class NamingUtils {
}
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
final String blah = "com.test.generator.Classname";
System.out.println(getSimpleName(blah));
System.out.println(lowerFirst(getSimpleName(blah)));
@@ -61,19 +61,19 @@ public class NamingUtils {
System.out.println(getMethodShortName("setName"));
}
- public static String getClassName(String className) {
+ public static String getClassName(final String className) {
return upperFirst(className.replaceAll("[^a-zA-Z0-9_]+", ""));
}
- public static String getFieldName(String fieldName) {
+ public static String getFieldName(final String fieldName) {
return fieldName.replaceAll("[^a-zA-Z0-9_]+", "");
}
- public static String methodCaseName(String variable) {
+ public static String methodCaseName(final String variable) {
return variable.substring(0, 1).toUpperCase() + variable.substring(1);
}
- public static String getAccessorName(String type, String methodName) {
+ public static String getAccessorName(final String type, final String methodName) {
String prefix = "get";
if (type.equals("boolean")) {
prefix = "is";
@@ -81,7 +81,7 @@ public class NamingUtils {
return prefix + methodCaseName(methodName);
}
- public static String getMutatorName(String methodName) {
+ public static String getMutatorName(final String methodName) {
return "set" + methodCaseName(methodName);
}
}
Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java (original)
+++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java Fri Jan 11 05:33:44 2013
@@ -51,7 +51,7 @@ public class JNDIContextFilter implement
private String name;
private NamedContextSelector selector = null;
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(final FilterConfig filterConfig) throws ServletException {
context = filterConfig.getServletContext();
name = filterConfig.getInitParameter(CONTEXT_NAME);
final String configLocn = filterConfig.getInitParameter(CONFIG_LOCATION);
@@ -78,7 +78,7 @@ public class JNDIContextFilter implement
}
}
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+ public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain)
throws IOException, ServletException {
final LoggerContext ctx = (LoggerContext) context.getAttribute(Log4jContextListener.LOG4J_CONTEXT_ATTRIBUTE);
if (ctx != null) {
Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java (original)
+++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java Fri Jan 11 05:33:44 2013
@@ -48,7 +48,7 @@ public class Log4jContextListener implem
* Initialize Logging for the web application.
* @param event The ServletContextEvent.
*/
- public void contextInitialized(ServletContextEvent event) {
+ public void contextInitialized(final ServletContextEvent event) {
final ServletContext context = event.getServletContext();
final String locn = context.getInitParameter(LOG4J_CONFIG);
String name = context.getInitParameter(LOG4J_CONTEXT_NAME);
@@ -66,12 +66,12 @@ public class Log4jContextListener implem
* Shutdown logging for the web application.
* @param event The ServletContextEvent.
*/
- public void contextDestroyed(ServletContextEvent event) {
+ public void contextDestroyed(final ServletContextEvent event) {
final LoggerContext ctx = (LoggerContext) event.getServletContext().getAttribute(LOG4J_CONTEXT_ATTRIBUTE);
Configurator.shutdown(ctx);
}
- private ClassLoader getClassLoader(ServletContext context) {
+ private ClassLoader getClassLoader(final ServletContext context) {
final Method[] methods = context.getClass().getMethods();
Method getClassLoader = null;
for (final Method method : methods) {
Modified: logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java?rev=1431898&r1=1431897&r2=1431898&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java (original)
+++ logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java Fri Jan 11 05:33:44 2013
@@ -125,7 +125,7 @@ public class Log4jContextListenerTest {
private final Hashtable<String, Object> attrs = new Hashtable<String, Object>();
- public ServletContext getContext(String s) {
+ public ServletContext getContext(final String s) {
return null;
}
@@ -137,31 +137,31 @@ public class Log4jContextListenerTest {
return 0;
}
- public String getMimeType(String s) {
+ public String getMimeType(final String s) {
return null;
}
- public Set getResourcePaths(String s) {
+ public Set getResourcePaths(final String s) {
return null;
}
- public URL getResource(String s) throws MalformedURLException {
+ public URL getResource(final String s) throws MalformedURLException {
return null;
}
- public InputStream getResourceAsStream(String s) {
+ public InputStream getResourceAsStream(final String s) {
return null;
}
- public RequestDispatcher getRequestDispatcher(String s) {
+ public RequestDispatcher getRequestDispatcher(final String s) {
return null;
}
- public RequestDispatcher getNamedDispatcher(String s) {
+ public RequestDispatcher getNamedDispatcher(final String s) {
return null;
}
- public Servlet getServlet(String s) throws ServletException {
+ public Servlet getServlet(final String s) throws ServletException {
return null;
}
@@ -173,21 +173,21 @@ public class Log4jContextListenerTest {
return null;
}
- public void log(String s) {
+ public void log(final String s) {
System.out.println(s);
}
- public void log(Exception e, String s) {
+ public void log(final Exception e, final String s) {
System.out.println(s);
e.printStackTrace();
}
- public void log(String s, Throwable throwable) {
+ public void log(final String s, final Throwable throwable) {
System.out.println(s);
throwable.printStackTrace();
}
- public String getRealPath(String s) {
+ public String getRealPath(final String s) {
return null;
}
@@ -195,11 +195,11 @@ public class Log4jContextListenerTest {
return "Mock";
}
- public void setInitParameter(String key, String value) {
+ public void setInitParameter(final String key, final String value) {
params.put(key, value);
}
- public String getInitParameter(String s) {
+ public String getInitParameter(final String s) {
return params.get(s);
}
@@ -207,7 +207,7 @@ public class Log4jContextListenerTest {
return params.keys();
}
- public Object getAttribute(String s) {
+ public Object getAttribute(final String s) {
return attrs.get(s);
}
@@ -215,11 +215,11 @@ public class Log4jContextListenerTest {
return attrs.keys();
}
- public void setAttribute(String s, Object o) {
+ public void setAttribute(final String s, final Object o) {
attrs.put(s, o);
}
- public void removeAttribute(String s) {
+ public void removeAttribute(final String s) {
attrs.remove(s);
}