You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ni...@apache.org on 2013/07/07 21:42:45 UTC
svn commit: r1500521 - in
/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j: ./
message/ simple/ spi/ status/ util/
Author: nickwilliams
Date: Sun Jul 7 19:42:44 2013
New Revision: 1500521
URL: http://svn.apache.org/r1500521
Log:
Checkstyle police
Modified:
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java
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/LocalizedMessage.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/StringFormattedMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Sun Jul 7 19:42:44 2013
@@ -17,7 +17,6 @@
package org.apache.logging.log4j;
import java.net.URI;
-import java.util.Formatter;
import java.util.Iterator;
import java.util.Map;
import java.util.SortedMap;
@@ -223,7 +222,7 @@ public class LogManager {
/**
* Returns a formatter Logger using the fully qualified name of the Class as the Logger name.
* <p>
- * This logger let you use a {@link Formatter} string in the message to format parameters.
+ * This logger let you use a {@link java.util.Formatter} string in the message to format parameters.
* </p>
* <p>
* Short-hand for {@code getLogger(clazz, StringFormatterMessageFactory.INSTANCE)}
@@ -253,7 +252,7 @@ public class LogManager {
/**
* Returns a formatter Logger using the fully qualified name of the value's Class as the Logger name.
* <p>
- * This logger let you use a {@link Formatter} string in the message to format parameters.
+ * This logger let you use a {@link java.util.Formatter} string in the message to format parameters.
* </p>
* <p>
* Short-hand for {@code getLogger(value, StringFormatterMessageFactory.INSTANCE)}
@@ -284,7 +283,7 @@ public class LogManager {
/**
* Returns a formatter Logger with the specified name.
* <p>
- * This logger let you use a {@link Formatter} string in the message to format parameters.
+ * This logger let you use a {@link java.util.Formatter} string in the message to format parameters.
* </p>
* <p>
* Short-hand for {@code getLogger(name, StringFormatterMessageFactory.INSTANCE)}
@@ -411,7 +410,7 @@ public class LogManager {
* Gets the class name of the caller in the current stack at the given {@code depth}.
*
* @param depth a 0-based index in the current stack.
- * @return a class name
+ * @return a class name
*/
private static String getClassName(int depth) {
return new Throwable().getStackTrace()[depth].getClassName();
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=1500521&r1=1500520&r2=1500521&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 Sun Jul 7 19:42:44 2013
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.message;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -27,6 +24,9 @@ import java.text.MessageFormat;
import java.util.Arrays;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* Handles messages that contain a format String. Dynamically determines if the format conforms to
* MessageFormat or String.format and if not then uses ParameterizedMessage to format.
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=1500521&r1=1500520&r2=1500521&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 Sun Jul 7 19:42:44 2013
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.message;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -25,6 +23,8 @@ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* This class is not the recommended way to Localize messages. It is provided to provide some level
* of compatibility with Log4j 1.x.
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=1500521&r1=1500520&r2=1500521&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 Sun Jul 7 19:42:44 2013
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.message;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -26,6 +23,9 @@ import java.text.MessageFormat;
import java.util.Arrays;
import java.util.IllegalFormatException;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* Handles messages that consist of a format string conforming to java.text.MessageFormat.
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java Sun Jul 7 19:42:44 2013
@@ -16,17 +16,17 @@
*/
package org.apache.logging.log4j.message;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Arrays;
import java.util.IllegalFormatException;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
- * Handles messages that consist of a format string conforming to java.util.Formatter.
+ * Handles messages that consist of a format string conforming to {@link java.util.Formatter}.
*/
public class StringFormattedMessage implements Message {
@@ -106,11 +106,8 @@ public class StringFormattedMessage impl
if (messagePattern != null ? !messagePattern.equals(that.messagePattern) : that.messagePattern != null) {
return false;
}
- if (!Arrays.equals(stringArgs, that.stringArgs)) {
- return false;
- }
- return true;
+ return Arrays.equals(stringArgs, that.stringArgs);
}
@Override
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java Sun Jul 7 19:42:44 2013
@@ -16,10 +16,8 @@
*/
package org.apache.logging.log4j.message;
-import java.util.Formatter;
-
/**
- * Enables use of {@link Formatter} strings in message strings.
+ * Enables use of {@link java.util.Formatter} strings in message strings.
* <p>
* Creates {@link StringFormattedMessage} instances for {@link #newMessage(String, Object...)}.
* </p>
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Sun Jul 7 19:42:44 2013
@@ -199,8 +199,9 @@ public class StructuredDataMessage exten
}
char[] chars = key.toCharArray();
for (char c : chars) {
- if (c < 33 || c > 126 || c == '=' || c == ']' || c == '"') {
- throw new IllegalArgumentException("Structured data keys must contain printable US ASCII characters and may not contain a space, =, ], or \"");
+ if (c < '!' || c > '~' || c == '=' || c == ']' || c == '"') {
+ throw new IllegalArgumentException("Structured data keys must contain printable US ASCII characters" +
+ "and may not contain a space, =, ], or \"");
}
}
}
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java Sun Jul 7 19:42:44 2013
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.simple;
+import java.net.URI;
+
import org.apache.logging.log4j.spi.LoggerContext;
import org.apache.logging.log4j.spi.LoggerContextFactory;
-import java.net.URI;
-
/**
*
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Sun Jul 7 19:42:44 2013
@@ -20,9 +20,9 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MessageFactory;
+import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.status.StatusLogger;
/**
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java Sun Jul 7 19:42:44 2013
@@ -33,9 +33,10 @@ public class DefaultThreadContextStack i
private static final long serialVersionUID = 5050501L;
- private final boolean useStack;
private static ThreadLocal<List<String>> stack = new ThreadLocal<List<String>>();
+ private final boolean useStack;
+
public DefaultThreadContextStack(boolean useStack) {
this.useStack = useStack;
}
@@ -95,7 +96,7 @@ public class DefaultThreadContextStack i
}
final List<String> copy = new ArrayList<String>();
int count = Math.min(depth, list.size());
- for(int i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
copy.add(list.get(i));
}
stack.set(copy);
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java Sun Jul 7 19:42:44 2013
@@ -79,7 +79,7 @@ public class MutableThreadContextStack i
}
final List<String> copy = new ArrayList<String>(list.size());
int count = Math.min(depth, list.size());
- for(int i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
copy.add(list.get(i));
}
list.clear();
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/ThreadContextStack.java Sun Jul 7 19:42:44 2013
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.spi;
-import org.apache.logging.log4j.ThreadContext;
-
import java.io.Serializable;
import java.util.Collection;
+import org.apache.logging.log4j.ThreadContext;
+
/**
*
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java Sun Jul 7 19:42:44 2013
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.status;
+import java.io.PrintStream;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.util.PropertiesUtil;
-import java.io.PrintStream;
-
/**
* StatusListener that writes to the Console.
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusData.java Sun Jul 7 19:42:44 2013
@@ -16,15 +16,15 @@
*/
package org.apache.logging.log4j.status;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.message.Message;
-
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.message.Message;
+
/**
* The Status data.
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java Sun Jul 7 19:42:44 2013
@@ -16,13 +16,6 @@
*/
package org.apache.logging.log4j.status;
-import org.apache.logging.log4j.simple.SimpleLogger;
-import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.PropertiesUtil;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -32,6 +25,13 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.simple.SimpleLogger;
+import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
+
/**
* Mechanism to record events that occur in the logging system.
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java Sun Jul 7 19:42:44 2013
@@ -16,12 +16,12 @@
*/
package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* Utility class to help with accessing System Properties.
*/
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java?rev=1500521&r1=1500520&r2=1500521&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java Sun Jul 7 19:42:44 2013
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.util;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.spi.Provider;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
@@ -28,6 +24,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.spi.Provider;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
*
*/