http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 5b6ac1a..0c77b86 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -2141,7 +2141,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { getRecursionDepthHolder()[0]++; } private static void decrementRecursionDepth() { - int[] depth = getRecursionDepthHolder(); + final int[] depth = getRecursionDepthHolder(); depth[0]--; if (depth[0] < 0) { throw new IllegalStateException("Recursion depth became negative: " + depth[0]);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java index e86f990..eb6b44f 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.util.LoaderUtil; /** * Provides an abstract base class to use for implementing LoggerAdapter. - * + * * @param <L> the Logger class to adapt * @since 2.1 */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java index 862246e..727a016 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java @@ -53,7 +53,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap protected static final String PROPERTY_NAME_INITIAL_CAPACITY = "log4j2.ThreadContext.initial.capacity"; private static final StringMap EMPTY_CONTEXT_DATA = new SortedArrayStringMap(1); - + private static volatile int initialCapacity; private static volatile boolean inheritableMap; @@ -66,7 +66,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap initialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); inheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); } - + static { EMPTY_CONTEXT_DATA.freeze(); init(); @@ -88,7 +88,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap if (parentValue == null) { return null; } - StringMap stringMap = createStringMap(parentValue); + final StringMap stringMap = createStringMap(parentValue); stringMap.freeze(); return stringMap; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java index 1e69a83..a00043b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java @@ -44,7 +44,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString private final ThreadLocal<Map<String, String>> localMap; private static boolean inheritableMap; - + static { init(); } @@ -69,7 +69,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString static void init() { inheritableMap = PropertiesUtil.getProperties().getBooleanProperty(INHERITABLE_MAP); } - + public DefaultThreadContextMap() { this(true); } @@ -154,6 +154,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString for (final Map.Entry<String, String> entry : map.entrySet()) { //BiConsumer should be able to handle values of any type V. In our case the values are of type String. @SuppressWarnings("unchecked") + final V value = (V) entry.getValue(); action.accept(entry.getKey(), value); } @@ -168,6 +169,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString for (final Map.Entry<String, String> entry : map.entrySet()) { //TriConsumer should be able to handle values of any type V. In our case the values are of type String. @SuppressWarnings("unchecked") + final V value = (V) entry.getValue(); action.accept(entry.getKey(), value, state); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java index 186e2a8..e65b1d0 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java @@ -53,7 +53,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap protected static final String PROPERTY_NAME_INITIAL_CAPACITY = "log4j2.ThreadContext.initial.capacity"; protected final ThreadLocal<StringMap> localMap; - + private static volatile int initialCapacity; private static volatile boolean inheritableMap; @@ -66,7 +66,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap initialCapacity = properties.getIntegerProperty(PROPERTY_NAME_INITIAL_CAPACITY, DEFAULT_INITIAL_CAPACITY); inheritableMap = properties.getBooleanProperty(INHERITABLE_MAP); } - + static { init(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java index 5808cf8..833b2d1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java @@ -189,7 +189,7 @@ public class Provider { public URL getUrl() { return url; } - + @Override public String toString() { final StringBuilder result = new StringBuilder("Provider["); @@ -220,7 +220,7 @@ public class Provider { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -228,7 +228,7 @@ public class Provider { return false; } - Provider provider = (Provider) o; + final Provider provider = (Provider) o; if (priority != null ? !priority.equals(provider.priority) : provider.priority != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java index 8a10e2d..cb40ba3 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/StandardLevel.java @@ -73,7 +73,7 @@ public enum StandardLevel { /** * Returns the integer value of the Level. - * + * * @return the integer value of the Level. */ public int intLevel() { @@ -82,7 +82,7 @@ public enum StandardLevel { /** * Method to convert custom Levels into a StandardLevel for conversion to other systems. - * + * * @param intLevel The integer value of the Level. * @return The StandardLevel. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java index c67fbcd..bf52b30 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java @@ -49,14 +49,14 @@ public final class ThreadContextMapFactory { private static final Logger LOGGER = StatusLogger.getLogger(); private static final String THREAD_CONTEXT_KEY = "log4j2.threadContextMap"; private static final String GC_FREE_THREAD_CONTEXT_KEY = "log4j2.garbagefree.threadContextMap"; - + private static boolean GcFreeThreadContextKey; private static String ThreadContextMapName; static { initPrivate(); } - + /** * Initializes static variables based on system properties. Normally called when this class is initialized by the VM * and when Log4j is reconfigured. @@ -77,7 +77,7 @@ public final class ThreadContextMapFactory { ThreadContextMapName = properties.getStringProperty(THREAD_CONTEXT_KEY); GcFreeThreadContextKey = properties.getBooleanProperty(GC_FREE_THREAD_CONTEXT_KEY); } - + private ThreadContextMapFactory() { } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java index 463d9d0..13f4859 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java @@ -43,7 +43,7 @@ public class StatusData implements Serializable { /** * Creates the StatusData object. - * + * * @param caller The method that created the event. * @param level The logging level. * @param msg The message String. @@ -62,7 +62,7 @@ public class StatusData implements Serializable { /** * Returns the event's timestamp. - * + * * @return The event's timestamp. */ public long getTimestamp() { @@ -71,7 +71,7 @@ public class StatusData implements Serializable { /** * Returns the StackTraceElement for the method that created the event. - * + * * @return The StackTraceElement. */ public StackTraceElement getStackTraceElement() { @@ -80,7 +80,7 @@ public class StatusData implements Serializable { /** * Returns the logging level for the event. - * + * * @return The logging level. */ public Level getLevel() { @@ -89,7 +89,7 @@ public class StatusData implements Serializable { /** * Returns the message associated with the event. - * + * * @return The message associated with the event. */ public Message getMessage() { @@ -105,7 +105,7 @@ public class StatusData implements Serializable { /** * Returns the Throwable associated with the event. - * + * * @return The Throwable associated with the event. */ public Throwable getThrowable() { @@ -114,7 +114,7 @@ public class StatusData implements Serializable { /** * Formats the StatusData for viewing. - * + * * @return The formatted status data as a String. */ public String getFormattedStatus() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java index be6b346..a5b4df7 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/EnglishEnums.java @@ -20,7 +20,7 @@ import java.util.Locale; /** * <em>Consider this class private.</em> - * + * * <p> * Helps convert English Strings to English Enum values. * </p> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java index df97fd2..48080a7 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java @@ -56,7 +56,7 @@ public class FilteredObjectInputStream extends ObjectInputStream { this.allowedClasses = new HashSet<>(); } - public FilteredObjectInputStream(InputStream in) throws IOException { + public FilteredObjectInputStream(final InputStream in) throws IOException { super(in); this.allowedClasses = new HashSet<>(); } @@ -77,7 +77,7 @@ public class FilteredObjectInputStream extends ObjectInputStream { @Override protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException { - String name = desc.getName(); + final String name = desc.getName(); if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) { throw new InvalidObjectException("Class is not allowed for deserialization: " + name); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java index bbf3cc7..ab61dbc 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java @@ -106,14 +106,14 @@ public final class LoaderUtil { } public static ClassLoader[] getClassLoaders() { - List<ClassLoader> classLoaders = new ArrayList<>(); - ClassLoader tcl = getThreadContextClassLoader(); + final List<ClassLoader> classLoaders = new ArrayList<>(); + final ClassLoader tcl = getThreadContextClassLoader(); classLoaders.add(tcl); // Some implementations may use null to represent the bootstrap class loader. - ClassLoader current = LoaderUtil.class.getClassLoader(); + final ClassLoader current = LoaderUtil.class.getClassLoader(); if (current != null && current != tcl) { classLoaders.add(current); - ClassLoader parent = current.getParent(); + final ClassLoader parent = current.getParent(); while (parent != null && !classLoaders.contains(parent)) { classLoaders.add(parent); } @@ -123,7 +123,7 @@ public final class LoaderUtil { classLoaders.add(parent); parent = parent.getParent(); } - ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); + final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); if (!classLoaders.contains(systemClassLoader)) { classLoaders.add(systemClassLoader); } @@ -281,7 +281,7 @@ public final class LoaderUtil { static Collection<UrlResource> findUrlResources(final String resource) { // @formatter:off final ClassLoader[] candidates = { - getThreadContextClassLoader(), + getThreadContextClassLoader(), LoaderUtil.class.getClassLoader(), GET_CLASS_LOADER_DISABLED ? null : ClassLoader.getSystemClassLoader()}; // @formatter:on http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java index 5cf40ca..d963013 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java @@ -35,7 +35,7 @@ final class LowLevelLogUtil { /** * Logs the given message. - * + * * @param message the message to log * @since 2.9.2 */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java index 685aabe..18d1834 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java @@ -30,13 +30,13 @@ public class ProcessIdUtil { public static String getProcessId() { try { // LOG4J2-2126 use reflection to improve compatibility with Android Platform which does not support JMX extensions - Class<?> managementFactoryClass = Class.forName("java.lang.management.ManagementFactory"); - Method getRuntimeMXBean = managementFactoryClass.getDeclaredMethod("getRuntimeMXBean"); - Class<?> runtimeMXBeanClass = Class.forName("java.lang.management.RuntimeMXBean"); - Method getName = runtimeMXBeanClass.getDeclaredMethod("getName"); + final Class<?> managementFactoryClass = Class.forName("java.lang.management.ManagementFactory"); + final Method getRuntimeMXBean = managementFactoryClass.getDeclaredMethod("getRuntimeMXBean"); + final Class<?> runtimeMXBeanClass = Class.forName("java.lang.management.RuntimeMXBean"); + final Method getName = runtimeMXBeanClass.getDeclaredMethod("getName"); - Object runtimeMXBean = getRuntimeMXBean.invoke(null); - String name = (String) getName.invoke(runtimeMXBean); + final Object runtimeMXBean = getRuntimeMXBean.invoke(null); + final String name = (String) getName.invoke(runtimeMXBean); //String name = ManagementFactory.getRuntimeMXBean().getName(); //JMX not allowed on Android return name.split("@")[0]; // likely works on most platforms } catch (final Exception ex) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java index 2a9ff7f..334fd7b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java @@ -178,9 +178,9 @@ public final class PropertiesUtil { if (Charset.isSupported(charsetName)) { return Charset.forName(charsetName); } - ResourceBundle bundle = getCharsetsResourceBundle(); + final ResourceBundle bundle = getCharsetsResourceBundle(); if (bundle.containsKey(name)) { - String mapped = bundle.getString(name); + final String mapped = bundle.getString(name); if (Charset.isSupported(mapped)) { return Charset.forName(mapped); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java index 3adbb24..c4cf359 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java @@ -37,7 +37,7 @@ public class PropertyFilePropertySource extends PropertiesPropertySource { for (final URL url : LoaderUtil.findResources(fileName)) { try (final InputStream in = url.openStream()) { props.load(in); - } catch (IOException e) { + } catch (final IOException e) { LowLevelLogUtil.logException("Unable to read " + url, e); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java index 75399d9..aba2ccf 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java @@ -93,7 +93,7 @@ public interface PropertySource { if (CACHE.containsKey(value)) { return CACHE.get(value); } - List<CharSequence> tokens = new ArrayList<>(); + final List<CharSequence> tokens = new ArrayList<>(); final Matcher matcher = PROPERTY_TOKENIZER.matcher(value); while (matcher.find()) { tokens.add(matcher.group(1).toLowerCase()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java index d19cdd9..c4f6ca1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java @@ -63,10 +63,10 @@ public final class ProviderUtil { private static volatile ProviderUtil instance; private ProviderUtil() { - for (ClassLoader classLoader : LoaderUtil.getClassLoaders()) { + for (final ClassLoader classLoader : LoaderUtil.getClassLoaders()) { try { loadProviders(classLoader); - } catch (Throwable ex) { + } catch (final Throwable ex) { LOGGER.debug("Unable to retrieve provider from ClassLoader {}", classLoader, ex); } } @@ -101,7 +101,7 @@ public final class ProviderUtil { } /** - * + * * @param classLoader null can be used to mark the bootstrap class loader. */ protected static void loadProviders(final ClassLoader classLoader) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java index df9a1c8..8a330f9 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java @@ -25,7 +25,7 @@ import java.util.Map; * @since 2.7 */ public interface ReadOnlyStringMap extends Serializable { - + /** * Returns a non-{@code null} mutable {@code Map<String, String>} containing a snapshot of this data structure. * http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java index 6d3eadb..ffd9745 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java @@ -96,7 +96,7 @@ public class SortedArrayStringMap implements IndexedStringMap { Method[] methods = ObjectInputStream.class.getMethods(); Method setMethod = null; Method getMethod = null; - for (Method method : methods) { + for (final Method method : methods) { if (method.getName().equals("setObjectInputFilter")) { setMethod = method; } else if (method.getName().equals("getObjectInputFilter")) { @@ -106,16 +106,16 @@ public class SortedArrayStringMap implements IndexedStringMap { Method newMethod = null; try { if (setMethod != null) { - Class<?> clazz = Class.forName("org.apache.logging.log4j.util.internal.DefaultObjectInputFilter"); + final Class<?> clazz = Class.forName("org.apache.logging.log4j.util.internal.DefaultObjectInputFilter"); methods = clazz.getMethods(); - for (Method method : methods) { + for (final Method method : methods) { if (method.getName().equals("newInstance") && Modifier.isStatic(method.getModifiers())) { newMethod = method; break; } } } - } catch (ClassNotFoundException ex) { + } catch (final ClassNotFoundException ex) { // Ignore the exception } newObjectInputFilter = newMethod; @@ -549,7 +549,7 @@ public class SortedArrayStringMap implements IndexedStringMap { } } - private static Object unmarshall(final byte[] data, ObjectInputStream inputStream) + private static Object unmarshall(final byte[] data, final ObjectInputStream inputStream) throws IOException, ClassNotFoundException { final ByteArrayInputStream bin = new ByteArrayInputStream(data); Collection<String> allowedClasses = null; @@ -559,8 +559,8 @@ public class SortedArrayStringMap implements IndexedStringMap { ois = new FilteredObjectInputStream(bin, allowedClasses); } else { try { - Object obj = getObjectInputFilter.invoke(inputStream); - Object filter = newObjectInputFilter.invoke(null, obj); + final Object obj = getObjectInputFilter.invoke(inputStream); + final Object filter = newObjectInputFilter.invoke(null, obj); ois = new ObjectInputStream(bin); setObjectInputFilter.invoke(ois, filter); } catch (IllegalAccessException | InvocationTargetException ex) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java index 48fa98f..a45fa5a 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java @@ -189,7 +189,7 @@ public final class StringBuilders { } } - int lastChar = toAppendTo.length() - 1; + final int lastChar = toAppendTo.length() - 1; toAppendTo.setLength(toAppendTo.length() + escapeCount); int lastPos = toAppendTo.length() - 1; @@ -238,7 +238,7 @@ public final class StringBuilders { } } - private static int escapeAndDecrement(StringBuilder toAppendTo, int lastPos, char c) { + private static int escapeAndDecrement(final StringBuilder toAppendTo, int lastPos, final char c) { toAppendTo.setCharAt(lastPos--, c); toAppendTo.setCharAt(lastPos--, '\\'); return lastPos; @@ -262,7 +262,7 @@ public final class StringBuilders { } } - int lastChar = toAppendTo.length() - 1; + final int lastChar = toAppendTo.length() - 1; toAppendTo.setLength(toAppendTo.length() + escapeCount); int lastPos = toAppendTo.length() - 1; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java index c369a4e..d0eea99 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java @@ -22,7 +22,7 @@ import java.util.Objects; /** * <em>Consider this class private.</em> - * + * * @see <a href="http://commons.apache.org/proper/commons-lang/";>Apache Commons Lang</a> */ public final class Strings { @@ -31,7 +31,7 @@ public final class Strings { * The empty string. */ public static final String EMPTY = ""; - + /** * OS-dependent line separator, defaults to {@code "\n"} if the system property {@code ""line.separator"} cannot be * read. @@ -45,7 +45,7 @@ public final class Strings { /** * Returns a double quoted string. - * + * * @param str a String * @return {@code "str"} */ @@ -129,7 +129,7 @@ public final class Strings { /** * Returns a quoted string. - * + * * @param str a String * @return {@code 'str'} */ @@ -146,7 +146,7 @@ public final class Strings { public String toRootUpperCase(final String str) { return str.toUpperCase(Locale.ROOT); } - + /** * <p> * Removes control characters (char <= 32) from both ends of this String returning {@code null} if the String is http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java index a152aad..5be886b 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java @@ -922,8 +922,8 @@ public class AbstractLoggerTest { throw new IllegalStateException("Oops!"); } }, "Message Format")); - List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData(); - StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1); + final List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData(); + final StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1); assertEquals(Level.WARN, mostRecent.getLevel()); assertThat(mostRecent.getFormattedStatus(), containsString( "org.apache.logging.log4j.spi.AbstractLogger caught " + @@ -939,8 +939,8 @@ public class AbstractLoggerTest { throw new IllegalStateException("Oops!"); } }, null /* format */)); - List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData(); - StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1); + final List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData(); + final StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1); assertEquals(Level.WARN, mostRecent.getLevel()); assertThat(mostRecent.getFormattedStatus(), containsString( "org.apache.logging.log4j.spi.AbstractLogger caught " + @@ -950,7 +950,7 @@ public class AbstractLoggerTest { private static final class TestMessage implements Message { private final FormattedMessageSupplier formattedMessageSupplier; private final String format; - TestMessage(FormattedMessageSupplier formattedMessageSupplier, String format) { + TestMessage(final FormattedMessageSupplier formattedMessageSupplier, final String format) { this.formattedMessageSupplier = formattedMessageSupplier; this.format = format; } @@ -1320,7 +1320,7 @@ public class AbstractLoggerTest { private static class ThrowableMessage implements Message { /** - * + * */ private static final long serialVersionUID = 1L; private final Throwable throwable; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java index a3164d1..68d6e4d 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java @@ -35,19 +35,19 @@ public class LogManagerTest { class Inner { final Logger LOGGER = LogManager.getLogger(); } - + class InnerByClass { final Logger LOGGER = LogManager.getLogger(InnerByClass.class); } - + static class StaticInner { final static Logger LOGGER = LogManager.getLogger(); } - + static class StaticInnerByClass { final static Logger LOGGER = LogManager.getLogger(StaticInnerByClass.class); } - + @Test public void testGetLogger() { Logger logger = LogManager.getLogger(); @@ -79,9 +79,9 @@ public class LogManagerTest { @Test public void testGetLoggerForAnonymousInnerClass1() throws IOException { final Closeable closeable = new Closeable() { - + Logger LOGGER = LogManager.getLogger(); - + @Override public void close() throws IOException { Assert.assertEquals("org.apache.logging.log4j.LogManagerTest$1", LOGGER.getName()); @@ -93,9 +93,9 @@ public class LogManagerTest { @Test public void testGetLoggerForAnonymousInnerClass2() throws IOException { final Closeable closeable = new Closeable() { - + Logger LOGGER = LogManager.getLogger(getClass()); - + @Override public void close() throws IOException { Assert.assertEquals("org.apache.logging.log4j.LogManagerTest$2", LOGGER.getName()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java index 7b78fe1..bf28a1e 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java @@ -1,235 +1,235 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ -package org.apache.logging.log4j; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; - -import java.util.List; -import java.util.Locale; - -import org.apache.logging.log4j.message.FormattedMessage; -import org.apache.logging.log4j.message.JsonMessage; -import org.apache.logging.log4j.message.LocalizedMessage; -import org.apache.logging.log4j.message.MessageFormatMessage; -import org.apache.logging.log4j.message.ObjectArrayMessage; -import org.apache.logging.log4j.message.ObjectMessage; -import org.apache.logging.log4j.message.ParameterizedMessage; -import org.apache.logging.log4j.message.SimpleMessage; -import org.apache.logging.log4j.message.StringFormattedMessage; -import org.apache.logging.log4j.message.ThreadDumpMessage; -import org.apache.logging.log4j.util.Supplier; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests Logger APIs with {@link Supplier}. - */ -public class LoggerSupplierTest { - - private final TestLogger logger = (TestLogger) LogManager.getLogger("LoggerTest"); - - private final List<String> results = logger.getEntries(); - - Locale defaultLocale; - - @Test - public void flowTracing_SupplierOfFormattedMessage() { - logger.traceEntry(new Supplier<FormattedMessage>() { - @Override - public FormattedMessage get() { - return new FormattedMessage("int foo={}", 1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("FormattedMessage"))); - } - - @Test - public void flowTracing_SupplierOfJsonMessage() { - logger.traceEntry(new Supplier<JsonMessage>() { - @Override - public JsonMessage get() { - return new JsonMessage(System.getProperties()); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("\"java.runtime.name\":")); - assertThat("Bad toString()", results.get(0), not(containsString("JsonMessage"))); - } - - @Test - public void flowTracing_SupplierOfLocalizedMessage() { - logger.traceEntry(new Supplier<LocalizedMessage>() { - @Override - public LocalizedMessage get() { - return new LocalizedMessage("int foo={}", 1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("LocalizedMessage"))); - } - - @Test - public void flowTracing_SupplierOfLong() { - logger.traceEntry(new Supplier<Long>() { - @Override - public Long get() { - return Long.valueOf(1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); - } - - @Test - public void flowTracing_SupplierOfMessageFormatMessage() { - logger.traceEntry(new Supplier<MessageFormatMessage>() { - @Override - public MessageFormatMessage get() { - return new MessageFormatMessage("int foo={0}", 1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(int foo=1,234,567,890)")); - assertThat("Bad toString()", results.get(0), not(containsString("MessageFormatMessage"))); - } - - @Test - public void flowTracing_SupplierOfObjectArrayMessage() { - logger.traceEntry(new Supplier<ObjectArrayMessage>() { - @Override - public ObjectArrayMessage get() { - return new ObjectArrayMessage(1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing Enter data", results.get(0), containsString("([1234567890])")); - assertThat("Bad toString()", results.get(0), not(containsString("ObjectArrayMessage"))); - } - - @Test - public void flowTracing_SupplierOfObjectMessage() { - logger.traceEntry(new Supplier<ObjectMessage>() { - @Override - public ObjectMessage get() { - return new ObjectMessage(1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("ObjectMessage"))); - } - - @Test - public void flowTracing_SupplierOfParameterizedMessage() { - logger.traceEntry(new Supplier<ParameterizedMessage>() { - @Override - public ParameterizedMessage get() { - return new ParameterizedMessage("int foo={}", 1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("ParameterizedMessage"))); - } - - @Test - public void flowTracing_SupplierOfSimpleMessage() { - logger.traceEntry(new Supplier<SimpleMessage>() { - @Override - public SimpleMessage get() { - return new SimpleMessage("1234567890"); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); - } - - @Test - public void flowTracing_SupplierOfString() { - logger.traceEntry(new Supplier<String>() { - @Override - public String get() { - return "1234567890"; - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); - assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); - } - - @Test - public void flowTracing_SupplierOfStringFormattedMessage() { - logger.traceEntry(new Supplier<StringFormattedMessage>() { - @Override - public StringFormattedMessage get() { - return new StringFormattedMessage("int foo=%,d", 1234567890); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("(int foo=1,234,567,890)")); - assertThat("Bad toString()", results.get(0), not(containsString("StringFormattedMessage"))); - } - - @Test - public void flowTracing_SupplierOfThreadDumpMessage() { - logger.traceEntry(new Supplier<ThreadDumpMessage>() { - @Override - public ThreadDumpMessage get() { - return new ThreadDumpMessage("Title of ..."); - } - }); - assertEquals(1, results.size()); - assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); - assertThat("Missing entry data", results.get(0), containsString("RUNNABLE")); - assertThat("Missing entry data", results.get(0), containsString("Title of ...")); - assertThat("Missing entry data", results.get(0), containsString(getClass().getName())); - } - - @Before - public void setup() { - results.clear(); - defaultLocale = Locale.getDefault(Locale.Category.FORMAT); - Locale.setDefault(Locale.Category.FORMAT, java.util.Locale.US); - } - - @After - public void tearDown() { - Locale.setDefault(Locale.Category.FORMAT, defaultLocale); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import java.util.List; +import java.util.Locale; + +import org.apache.logging.log4j.message.FormattedMessage; +import org.apache.logging.log4j.message.JsonMessage; +import org.apache.logging.log4j.message.LocalizedMessage; +import org.apache.logging.log4j.message.MessageFormatMessage; +import org.apache.logging.log4j.message.ObjectArrayMessage; +import org.apache.logging.log4j.message.ObjectMessage; +import org.apache.logging.log4j.message.ParameterizedMessage; +import org.apache.logging.log4j.message.SimpleMessage; +import org.apache.logging.log4j.message.StringFormattedMessage; +import org.apache.logging.log4j.message.ThreadDumpMessage; +import org.apache.logging.log4j.util.Supplier; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests Logger APIs with {@link Supplier}. + */ +public class LoggerSupplierTest { + + private final TestLogger logger = (TestLogger) LogManager.getLogger("LoggerTest"); + + private final List<String> results = logger.getEntries(); + + Locale defaultLocale; + + @Test + public void flowTracing_SupplierOfFormattedMessage() { + logger.traceEntry(new Supplier<FormattedMessage>() { + @Override + public FormattedMessage get() { + return new FormattedMessage("int foo={}", 1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("FormattedMessage"))); + } + + @Test + public void flowTracing_SupplierOfJsonMessage() { + logger.traceEntry(new Supplier<JsonMessage>() { + @Override + public JsonMessage get() { + return new JsonMessage(System.getProperties()); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("\"java.runtime.name\":")); + assertThat("Bad toString()", results.get(0), not(containsString("JsonMessage"))); + } + + @Test + public void flowTracing_SupplierOfLocalizedMessage() { + logger.traceEntry(new Supplier<LocalizedMessage>() { + @Override + public LocalizedMessage get() { + return new LocalizedMessage("int foo={}", 1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("LocalizedMessage"))); + } + + @Test + public void flowTracing_SupplierOfLong() { + logger.traceEntry(new Supplier<Long>() { + @Override + public Long get() { + return Long.valueOf(1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); + } + + @Test + public void flowTracing_SupplierOfMessageFormatMessage() { + logger.traceEntry(new Supplier<MessageFormatMessage>() { + @Override + public MessageFormatMessage get() { + return new MessageFormatMessage("int foo={0}", 1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(int foo=1,234,567,890)")); + assertThat("Bad toString()", results.get(0), not(containsString("MessageFormatMessage"))); + } + + @Test + public void flowTracing_SupplierOfObjectArrayMessage() { + logger.traceEntry(new Supplier<ObjectArrayMessage>() { + @Override + public ObjectArrayMessage get() { + return new ObjectArrayMessage(1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing Enter data", results.get(0), containsString("([1234567890])")); + assertThat("Bad toString()", results.get(0), not(containsString("ObjectArrayMessage"))); + } + + @Test + public void flowTracing_SupplierOfObjectMessage() { + logger.traceEntry(new Supplier<ObjectMessage>() { + @Override + public ObjectMessage get() { + return new ObjectMessage(1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("ObjectMessage"))); + } + + @Test + public void flowTracing_SupplierOfParameterizedMessage() { + logger.traceEntry(new Supplier<ParameterizedMessage>() { + @Override + public ParameterizedMessage get() { + return new ParameterizedMessage("int foo={}", 1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(int foo=1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("ParameterizedMessage"))); + } + + @Test + public void flowTracing_SupplierOfSimpleMessage() { + logger.traceEntry(new Supplier<SimpleMessage>() { + @Override + public SimpleMessage get() { + return new SimpleMessage("1234567890"); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); + } + + @Test + public void flowTracing_SupplierOfString() { + logger.traceEntry(new Supplier<String>() { + @Override + public String get() { + return "1234567890"; + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(1234567890)")); + assertThat("Bad toString()", results.get(0), not(containsString("SimpleMessage"))); + } + + @Test + public void flowTracing_SupplierOfStringFormattedMessage() { + logger.traceEntry(new Supplier<StringFormattedMessage>() { + @Override + public StringFormattedMessage get() { + return new StringFormattedMessage("int foo=%,d", 1234567890); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("(int foo=1,234,567,890)")); + assertThat("Bad toString()", results.get(0), not(containsString("StringFormattedMessage"))); + } + + @Test + public void flowTracing_SupplierOfThreadDumpMessage() { + logger.traceEntry(new Supplier<ThreadDumpMessage>() { + @Override + public ThreadDumpMessage get() { + return new ThreadDumpMessage("Title of ..."); + } + }); + assertEquals(1, results.size()); + assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); + assertThat("Missing entry data", results.get(0), containsString("RUNNABLE")); + assertThat("Missing entry data", results.get(0), containsString("Title of ...")); + assertThat("Missing entry data", results.get(0), containsString(getClass().getName())); + } + + @Before + public void setup() { + results.clear(); + defaultLocale = Locale.getDefault(Locale.Category.FORMAT); + Locale.setDefault(Locale.Category.FORMAT, java.util.Locale.US); + } + + @After + public void tearDown() { + Locale.setDefault(Locale.Category.FORMAT, defaultLocale); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java index 2321c64..c9a284f 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java @@ -538,7 +538,7 @@ public class LoggerTest { ThreadContext.put("TestYear", Integer.valueOf(2010).toString()); logger.debug("Debug message"); - String testYear = ThreadContext.get("TestYear"); + final String testYear = ThreadContext.get("TestYear"); assertNotNull("Test Year is null", testYear); assertEquals("Incorrect test year: " + testYear, "2010", testYear); ThreadContext.clearMap(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java index 2874016..db232bc 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java @@ -56,7 +56,7 @@ public class MarkerTest { existing.setParents(parent); assertTrue(existing.hasParents()); } - + @Test public void testMarker() { final Marker parent = MarkerManager.getMarker("PARENT"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java b/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java index 4c85bde..30bb27d 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java @@ -23,15 +23,15 @@ import org.apache.logging.log4j.ThreadContext.ContextStack; /** * Holds an immutable copy of the ThreadContext stack and map. - * + * * TODO Use LOG4J2-1517 Add ThreadContext.setContext(Map<String, String>) - * + * * or - * + * * TODO Might be replaced by something from LOG4J2-1447. - * + * * or do nothing. - * + * * @since 2.7 */ public class ThreadContextHolder { @@ -43,7 +43,7 @@ public class ThreadContextHolder { /** * Constructs a new holder initialized with an immutable copy of the ThreadContext stack and map. - * + * * @param restoreContext * @param restoreStack */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java index 57ac55d..c334ed8 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SecurityManagerTestRule.java @@ -28,7 +28,7 @@ import org.junit.runners.model.Statement; * Using a security manager can mess up other tests so this is best used from integration tests (classes that end in * "IT" instead of "Test" and "TestCase".) * </p> - * + * * <p> * When this test rule is evaluated, it will: * </p> @@ -38,7 +38,7 @@ import org.junit.runners.model.Statement; * <li>Evaluate the test statement.</li> * <li>Reset the current SecurityManager to the one from step (1).</li> * </ol> - * + * * @since 2.11.0 */ public class SecurityManagerTestRule implements TestRule { @@ -54,7 +54,7 @@ public class SecurityManagerTestRule implements TestRule { * <li>Evaluate the test statement.</li> * <li>Reset the current SecurityManager to the one from step (1).</li> * </ol> - * + * * @param securityManager * the {@link SecurityManager} to use while running a test. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java index 211eca6..4c8a420 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java @@ -46,7 +46,7 @@ public class SerialUtil { throw new IllegalStateException("Could not serialize", ex); } } - + /** * Deserialize an object from the specified byte array and returns the result. * @param data byte array representing the serialized object http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java index 4066303..be3047b 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java @@ -18,9 +18,9 @@ package org.apache.logging.log4j.junit; /** * Restores the ThreadContext to it's initial map values after a JUnit test. - * + * * Usage: - * + * * <pre> * @Rule * public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java index dad7b5b..e01ada3 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java @@ -22,9 +22,9 @@ import org.junit.rules.ExternalResource; /** * Restores the ThreadContext to it's initial map and stack values after a JUnit test. - * + * * Usage: - * + * * <pre> * @Rule * public final ThreadContextRule threadContextRule = new ThreadContextRule(); @@ -45,7 +45,7 @@ public class ThreadContextRule extends ExternalResource { /** * Constructs an instance initialized to restore the given structures. - * + * * @param restoreMap * Whether to restore the thread context map. * @param restoreStack http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java index 1581dc8..9c74662 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java @@ -18,9 +18,9 @@ package org.apache.logging.log4j.junit; /** * Restores the ThreadContext to it's initial stack values after a JUnit test. - * + * * Usage: - * + * * <pre> * @Rule * public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java index 44a15aa..d6c5cf7 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java @@ -231,7 +231,7 @@ public class MapMessageTest { } @Override - public void formatTo(StringBuilder buffer) { + public void formatTo(final StringBuilder buffer) { buffer.append("formatTo"); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java index 5f11cf8..55bf1b9 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectArrayMessageTest.java @@ -1,40 +1,40 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ -package org.apache.logging.log4j.message; - -import org.junit.Assert; -import org.junit.Test; - -/** - * @since 2.4 - */ -public class ObjectArrayMessageTest { - - private static final Object[] ARRAY = { "A", "B", "C" }; - private static final ObjectArrayMessage OBJECT_ARRAY_MESSAGE = new ObjectArrayMessage(ARRAY); - - @Test - public void testGetParameters() { - Assert.assertArrayEquals(ARRAY, OBJECT_ARRAY_MESSAGE.getParameters()); - } - - @Test - public void testGetThrowable() { - Assert.assertEquals(null, OBJECT_ARRAY_MESSAGE.getThrowable()); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.message; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @since 2.4 + */ +public class ObjectArrayMessageTest { + + private static final Object[] ARRAY = { "A", "B", "C" }; + private static final ObjectArrayMessage OBJECT_ARRAY_MESSAGE = new ObjectArrayMessage(ARRAY); + + @Test + public void testGetParameters() { + Assert.assertArrayEquals(ARRAY, OBJECT_ARRAY_MESSAGE.getParameters()); + } + + @Test + public void testGetThrowable() { + Assert.assertEquals(null, OBJECT_ARRAY_MESSAGE.getThrowable()); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java index d16beb3..93fe061 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java @@ -154,13 +154,13 @@ public class ReusableParameterizedMessageTest { final ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); final Throwable EXCEPTION1 = new IllegalAccessError("#1"); msg.set(testMsg, "msg", EXCEPTION1); - List<Object> expected = new LinkedList<>(); + final List<Object> expected = new LinkedList<>(); expected.add("msg"); expected.add(EXCEPTION1); final List<Object> actual = new LinkedList<>(); msg.forEachParameter(new ParameterConsumer<Void>() { @Override - public void accept(Object parameter, int parameterIndex, Void state) { + public void accept(final Object parameter, final int parameterIndex, final Void state) { actual.add(parameter); } }, null); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java index e3ad5d6..b3a7aa9 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.ThreadContext; import org.junit.Test; /** @@ -129,7 +128,7 @@ public class DefaultThreadContextMapTest { assertEquals("value2", map.get("key2")); return map; } - + @Test public void testGetCopyReturnsMutableMap() { final DefaultThreadContextMap map = new DefaultThreadContextMap(true); @@ -220,7 +219,7 @@ public class DefaultThreadContextMapTest { final ThreadLocal<Map<String, String>> threadLocal = DefaultThreadContextMap.createThreadLocalMap(true); assertFalse(threadLocal instanceof InheritableThreadLocal<?>); } - + @Test public void testThreadLocalInheritableIfConfigured() { System.setProperty(DefaultThreadContextMap.INHERITABLE_MAP, "true"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java index b82e135..64caaf3 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java @@ -24,11 +24,11 @@ public class CharsetForNameMain { /** * Checks that the given Charset names can be loaded. */ - public static void main(String[] args) { - for (String value : args) { + public static void main(final String[] args) { + for (final String value : args) { final String charsetName = value.trim(); if (Charset.isSupported(charsetName)) { - Charset cs = Charset.forName(charsetName); + final Charset cs = Charset.forName(charsetName); System.out.println(String.format("%s -> %s aliases: %s", charsetName, cs.name(), cs.aliases())); } else { System.err.println("Not supported:" + charsetName); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java index 0020c05..fef8d1b 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java @@ -30,7 +30,7 @@ import org.junit.Test; * integration tests (classes that end in "IT" instead of "Test" and * "TestCase".) * </p> - * + * * @see EnvironmentPropertySource * @see SecurityManager * @see System#setSecurityManager(SecurityManager) @@ -56,7 +56,7 @@ public class EnvironmentPropertySourceSecurityManagerIT { /** * Makes sure we do not blow up with exception below due to a security manager * rejecting environment variable access in {@link EnvironmentPropertySource}. - * + * * <pre> * java.lang.NoClassDefFoundError: Could not initialize class org.apache.logging.log4j.util.PropertiesUtil * at org.apache.logging.log4j.status.StatusLogger.<clinit>(StatusLogger.java:78) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java index ff8fd5f..916521b 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java @@ -31,13 +31,13 @@ public class Log4jCharsetsPropertiesTest { */ @Test public void testLoadAll() { - ResourceBundle resourceBundle = PropertiesUtil.getCharsetsResourceBundle(); - Enumeration<String> keys = resourceBundle.getKeys(); + final ResourceBundle resourceBundle = PropertiesUtil.getCharsetsResourceBundle(); + final Enumeration<String> keys = resourceBundle.getKeys(); while (keys.hasMoreElements()) { - String key = keys.nextElement(); + final String key = keys.nextElement(); Assert.assertFalse(String.format("The Charset %s is available and should not be mapped", key), Charset.isSupported(key)); - String value = resourceBundle.getString(key); + final String value = resourceBundle.getString(key); Assert.assertTrue(String.format("The Charset %s is is not available and is mapped from %s", value, key), Charset.isSupported(value)); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java index 13aaf9c..423532d 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java @@ -24,7 +24,7 @@ public class ProcessIdUtilTest { @Test public void processIdTest() throws Exception { - String processId = ProcessIdUtil.getProcessId(); + final String processId = ProcessIdUtil.getProcessId(); assertFalse("ProcessId is default", processId.equals(ProcessIdUtil.DEFAULT_PROCESSID)); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java index 49b62de..4f9b40e 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java @@ -79,25 +79,25 @@ public class PropertiesUtilTest { assertEquals(StandardCharsets.US_ASCII, pu.getCharsetProperty("e.1")); assertEquals(Charset.defaultCharset(), pu.getCharsetProperty("e.2")); } - + @Test public void testGetMappedProperty_sun_stdout_encoding() { final PropertiesUtil pu = new PropertiesUtil(System.getProperties()); - Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8; + final Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8; assertEquals(expected, pu.getCharsetProperty("sun.stdout.encoding")); } @Test public void testGetMappedProperty_sun_stderr_encoding() { final PropertiesUtil pu = new PropertiesUtil(System.getProperties()); - Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8; + final Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8; assertEquals(expected, pu.getCharsetProperty("sun.err.encoding")); } @Test public void testNonStringSystemProperties() { - Object key1 = "1"; - Object key2 = new Object(); + final Object key1 = "1"; + final Object key2 = new Object(); System.getProperties().put(key1, new Object()); System.getProperties().put(key2, "value-2"); try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java index e59e77e..3985c29 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java @@ -36,7 +36,7 @@ import org.junit.Test; * integration tests (classes that end in "IT" instead of "Test" and * "TestCase".) * </p> - * + * * @see PropertyFilePropertySource * @see SecurityManager * @see System#setSecurityManager(SecurityManager) @@ -48,7 +48,7 @@ public class PropertyFilePropertySourceSecurityManagerIT { public static void beforeClass() { Assert.assertTrue(TEST_FIXTURE_PATH, Files.exists(Paths.get(TEST_FIXTURE_PATH))); } - + @Rule public final SecurityManagerTestRule rule = new SecurityManagerTestRule(new TestSecurityManager()); @@ -72,7 +72,7 @@ public class PropertyFilePropertySourceSecurityManagerIT { * Makes sure we do not blow up with exception below due to a security manager * rejecting environment variable access in * {@link SystemPropertiesPropertySource}. - * + * * <pre> * </pre> */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java index dd1d49c..38afa0f 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java @@ -60,7 +60,7 @@ public class PropertySourceTokenizerTest { @Test public void testTokenize() throws Exception { - List<CharSequence> tokens = PropertySource.Util.tokenize(value); + final List<CharSequence> tokens = PropertySource.Util.tokenize(value); assertEquals(expectedTokens, tokens); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java index ce4236a..6c03f81 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java @@ -31,9 +31,9 @@ public class ProviderUtilTest { @Test public void complexTest() throws Exception { - File file = new File("target/classes"); - ClassLoader classLoader = new URLClassLoader(new URL[] {file.toURI().toURL()}); - Worker worker = new Worker(); + final File file = new File("target/classes"); + final ClassLoader classLoader = new URLClassLoader(new URL[] {file.toURI().toURL()}); + final Worker worker = new Worker(); worker.setContextClassLoader(classLoader); worker.start(); worker.join(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java index 3d9ce3e..54e5ccb 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java @@ -48,7 +48,7 @@ public class SortedArrayStringMapTest { } public void testConstructorAllowsZeroCapacity() throws Exception { - SortedArrayStringMap sortedArrayStringMap = new SortedArrayStringMap(0); + final SortedArrayStringMap sortedArrayStringMap = new SortedArrayStringMap(0); assertEquals(0, sortedArrayStringMap.size()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java index 6feecbb..6fa7a6f 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java @@ -49,8 +49,8 @@ public class StringBuildersTest { @Test public void escapeJsonCharactersCorrectly() { - String jsonValueNotEscaped = "{\"field\n1\":\"value_1\"}"; - String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value_1\\\"}"; + final String jsonValueNotEscaped = "{\"field\n1\":\"value_1\"}"; + final String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value_1\\\"}"; StringBuilder sb = new StringBuilder(); sb.append(jsonValueNotEscaped); @@ -59,7 +59,7 @@ public class StringBuildersTest { assertEquals(jsonValueEscaped, sb.toString()); sb = new StringBuilder(); - String jsonValuePartiallyEscaped = "{\"field\n1\":\\\"value_1\\\"}"; + final String jsonValuePartiallyEscaped = "{\"field\n1\":\\\"value_1\\\"}"; sb.append(jsonValueNotEscaped); assertEquals(jsonValueNotEscaped, sb.toString()); StringBuilders.escapeJson(sb, 10); @@ -68,10 +68,10 @@ public class StringBuildersTest { @Test public void escapeJsonCharactersISOControl() { - String jsonValueNotEscaped = "{\"field\n1\":\"value" + (char) 0x8F + "_1\"}"; - String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value\\u008F_1\\\"}"; + final String jsonValueNotEscaped = "{\"field\n1\":\"value" + (char) 0x8F + "_1\"}"; + final String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value\\u008F_1\\\"}"; - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append(jsonValueNotEscaped); assertEquals(jsonValueNotEscaped, sb.toString()); StringBuilders.escapeJson(sb, 0); @@ -80,10 +80,10 @@ public class StringBuildersTest { @Test public void escapeXMLCharactersCorrectly() { - String xmlValueNotEscaped = "<\"Salt&Peppa'\">"; - String xmlValueEscaped = "<"Salt&Peppa'">"; + final String xmlValueNotEscaped = "<\"Salt&Peppa'\">"; + final String xmlValueEscaped = "<"Salt&Peppa'">"; - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append(xmlValueNotEscaped); assertEquals(xmlValueNotEscaped, sb.toString()); StringBuilders.escapeXml(sb, 0);
