logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1584470 [2/3] - in /logging/log4j/log4j2/trunk: log4j-1.2-api/src/test/java/org/apache/log4j/ log4j-api/src/main/java/org/apache/logging/log4j/ log4j-api/src/main/java/org/apache/logging/log4j/message/ log4j-api/src/main/java/org/apache/lo...
Date Thu, 03 Apr 2014 23:34:34 GMT
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Thu Apr  3 23:34:32 2014
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.status.S
 /**
  * When rolling over, <code>DefaultRolloverStrategy</code> renames files
  * according to an algorithm as described below.
- * 
+ *
  * <p>
  * The DefaultRolloverStrategy is a combination of a time-based policy and a fixed-window policy. When
  * the file name pattern contains a date format then the rollover time interval will be used to calculate the
@@ -76,7 +76,7 @@ import org.apache.logging.log4j.status.S
  */
 @Plugin(name = "DefaultRolloverStrategy", category = "Core", printObject = true)
 public class DefaultRolloverStrategy implements RolloverStrategy {
-    
+
     private static final String EXT_ZIP = ".zip";
     private static final String EXT_GZIP = ".gz";
 
@@ -183,7 +183,7 @@ public class DefaultRolloverStrategy imp
 
         final List<FileRenameAction> renames = new ArrayList<FileRenameAction>();
         final StringBuilder buf = new StringBuilder();
-        
+
         // LOG4J2-531: directory scan & rollover must use same format
         manager.getPatternProcessor().formatFileName(subst, buf, highIndex);
 
@@ -421,7 +421,7 @@ public class DefaultRolloverStrategy imp
             compressAction = new GZCompressAction(new File(renameTo), new File(compressedName), true);
         } else if (renameTo.endsWith(EXT_ZIP)) {
             renameTo = renameTo.substring(0, renameTo.length() - EXT_ZIP.length());
-            compressAction = new ZipCompressAction(new File(renameTo), new File(compressedName), true, 
+            compressAction = new ZipCompressAction(new File(renameTo), new File(compressedName), true,
                     compressionLevel);
         }
 
@@ -433,7 +433,7 @@ public class DefaultRolloverStrategy imp
 
     @Override
     public String toString() {
-        return "DefaultRolloverStrategy(min=" + minIndex + ", max=" + maxIndex + ")";
+        return "DefaultRolloverStrategy(min=" + minIndex + ", max=" + maxIndex + ')';
     }
 
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java Thu Apr  3 23:34:32 2014
@@ -97,7 +97,7 @@ public class SizeBasedTriggeringPolicy i
 
     @Override
     public String toString() {
-        return "SizeBasedTriggeringPolicy(size=" + maxFileSize + ")";
+        return "SizeBasedTriggeringPolicy(size=" + maxFileSize + ')';
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java Thu Apr  3 23:34:32 2014
@@ -143,10 +143,10 @@ public class FileRenameAction extends Ab
             }
         }
     }
-    
+
     @Override
     public String toString() {
-        return FileRenameAction.class.getSimpleName() + "[" + source + " to " + destination //
-                + ", renameEmptyFiles=" + renameEmptyFiles + "]";
+        return FileRenameAction.class.getSimpleName() + '[' + source + " to " + destination //
+                + ", renameEmptyFiles=" + renameEmptyFiles + ']';
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java Thu Apr  3 23:34:32 2014
@@ -125,10 +125,10 @@ public final class GZCompressAction exte
     protected void reportException(final Exception ex) {
         LOGGER.warn("Exception during compression of '" + source.toString() + "'.", ex);
     }
-    
+
     @Override
     public String toString() {
-        return GZCompressAction.class.getSimpleName() + "[" + source + " to " + destination //
-                + ", deleteSource=" + deleteSource + "]";
+        return GZCompressAction.class.getSimpleName() + '[' + source + " to " + destination //
+                + ", deleteSource=" + deleteSource + ']';
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java Thu Apr  3 23:34:32 2014
@@ -45,7 +45,7 @@ public final class ZipCompressAction ext
      * If true, attempt to delete file on completion.
      */
     private final boolean deleteSource;
-    
+
     /**
      * Compression level.
      */
@@ -137,10 +137,10 @@ public final class ZipCompressAction ext
     protected void reportException(final Exception ex) {
         LOGGER.warn("Exception during compression of '" + source.toString() + "'.", ex);
     }
-    
+
     @Override
     public String toString() {
-        return ZipCompressAction.class.getSimpleName() + "[" + source + " to " + destination //
-                + ", level=" + level + ", deleteSource=" + deleteSource + "]";
+        return ZipCompressAction.class.getSimpleName() + '[' + source + " to " + destination //
+                + ", level=" + level + ", deleteSource=" + deleteSource + ']';
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java Thu Apr  3 23:34:32 2014
@@ -77,11 +77,11 @@ public final class Route {
             sb.append("invalid Route");
         }
         if (key != null) {
-            sb.append(" key='").append(key).append("'");
+            sb.append(" key='").append(key).append('\'');
         } else {
             sb.append(" default");
         }
-        sb.append(")");
+        sb.append(')');
         return sb.toString();
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java Thu Apr  3 23:34:32 2014
@@ -61,12 +61,12 @@ public final class Routes {
         boolean first = true;
         for (final Route route : routes) {
             if (!first) {
-                sb.append(",");
+                sb.append(',');
             }
             first = false;
             sb.append(route.toString());
         }
-        sb.append("}");
+        sb.append('}');
         return sb.toString();
 
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java Thu Apr  3 23:34:32 2014
@@ -73,6 +73,6 @@ public final class Property {
 
     @Override
     public String toString() {
-        return name + "=" + value;
+        return name + '=' + value;
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java Thu Apr  3 23:34:32 2014
@@ -86,7 +86,7 @@ public class PluginManager {
             System.err.println("A target directory must be specified");
             System.exit(-1);
         }
-        rootDir = args[0].endsWith("/") || args[0].endsWith("\\") ? args[0] : args[0] + "/";
+        rootDir = args[0].endsWith("/") || args[0].endsWith("\\") ? args[0] : args[0] + '/';
 
         final PluginManager manager = new PluginManager("Core");
         final String packages = args.length == 2 ? args[1] : null;
@@ -205,7 +205,7 @@ public class PluginManager {
         sb.append(pkgs);
         sb.append(", preload: ");
         sb.append(preLoad);
-        sb.append(".");
+        sb.append('.');
         LOGGER.debug(sb.toString());
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java Thu Apr  3 23:34:32 2014
@@ -273,7 +273,7 @@ public class ResolverUtil {
     String extractPath(final URL url) throws UnsupportedEncodingException {
         String urlPath = url.getPath(); // same as getFile but without the Query portion
         //System.out.println(url.getProtocol() + "->" + urlPath);
-        
+
         // I would be surprised if URL.getPath() ever starts with "jar:" but no harm in checking
         if (urlPath.startsWith("jar:")) {
             urlPath = urlPath.substring(4);
@@ -286,7 +286,7 @@ public class ResolverUtil {
         if (urlPath.indexOf('!') > 0) {
             urlPath = urlPath.substring(0, urlPath.indexOf('!'));
         }
-        
+
         // LOG4J2-445
         // Finally, decide whether to URL-decode the file name or not...
         final String protocol = url.getProtocol();
@@ -335,7 +335,7 @@ public class ResolverUtil {
         StringBuilder builder;
         for (final File file : files) {
             builder = new StringBuilder();
-            builder.append(parent).append("/").append(file.getName());
+            builder.append(parent).append('/').append(file.getName());
             final String packageOrClass = parent == null ? file.getName() : builder.toString();
 
             if (file.isDirectory()) {
@@ -430,7 +430,7 @@ public class ResolverUtil {
             if (test.doesMatchClass()) {
                 final String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.');
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Checking to see if class " + externalName + " matches criteria [" + test + "]");
+                    LOGGER.debug("Checking to see if class " + externalName + " matches criteria [" + test + ']');
                 }
 
                 final Class<?> type = loader.loadClass(externalName);
@@ -612,7 +612,7 @@ public class ResolverUtil {
     public static class NameIs extends ResourceTest {
         private final String name;
 
-        public NameIs(final String name) { this.name = "/" + name; }
+        public NameIs(final String name) { this.name = '/' + name; }
 
         @Override
         public boolean matches(final URI resource) {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Thu Apr  3 23:34:32 2014
@@ -241,14 +241,14 @@ public final class CompositeFilter imple
         final StringBuilder sb = new StringBuilder();
         for (final Filter filter : filters) {
             if (sb.length() == 0) {
-                sb.append("{");
+                sb.append('{');
             } else {
                 sb.append(", ");
             }
             sb.append(filter.toString());
         }
         if (sb.length() > 0) {
-            sb.append("}");
+            sb.append('}');
         }
         return sb.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Thu Apr  3 23:34:32 2014
@@ -101,16 +101,16 @@ public final class DynamicThresholdFilte
         sb.append("key=").append(key);
         sb.append(", default=").append(defaultThreshold);
         if (levelMap.size() > 0) {
-            sb.append("{");
+            sb.append('{');
             boolean first = true;
             for (final Map.Entry<String, Level> entry : levelMap.entrySet()) {
                 if (!first) {
                     sb.append(", ");
                     first = false;
                 }
-                sb.append(entry.getKey()).append("=").append(entry.getValue());
+                sb.append(entry.getKey()).append('=').append(entry.getValue());
             }
-            sb.append("}");
+            sb.append('}');
         }
         return sb.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Thu Apr  3 23:34:32 2014
@@ -100,9 +100,9 @@ public class MapFilter extends AbstractF
                 first = false;
                 final List<String> list = entry.getValue();
                 final String value = list.size() > 1 ? list.get(0) : list.toString();
-                sb.append(entry.getKey()).append("=").append(value);
+                sb.append(entry.getKey()).append('=').append(value);
             }
-            sb.append("}");
+            sb.append('}');
         }
         return sb.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java Thu Apr  3 23:34:32 2014
@@ -57,7 +57,7 @@ public class KeyValuePair {
 
     @Override
     public String toString() {
-        return key + "=" + value;
+        return key + '=' + value;
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java Thu Apr  3 23:34:32 2014
@@ -136,7 +136,7 @@ public final class OptionConverter {
             try {
                 return Integer.parseInt(s);
             } catch (final NumberFormatException e) {
-                LOGGER.error("[" + s + "] is not in proper int form.");
+                LOGGER.error('[' + s + "] is not in proper int form.");
                 e.printStackTrace();
             }
         }
@@ -172,8 +172,8 @@ public final class OptionConverter {
             try {
                 return Long.parseLong(str) * multiplier;
             } catch (final NumberFormatException e) {
-                LOGGER.error("[" + str + "] is not in proper int form.");
-                LOGGER.error("[" + value + "] not in expected format.", e);
+                LOGGER.error('[' + str + "] is not in proper int form.");
+                LOGGER.error('[' + value + "] not in expected format.", e);
             }
         }
         return defaultValue;
@@ -222,7 +222,7 @@ public final class OptionConverter {
                         superClass.getName() + "\" variable.");
                     LOGGER.error("The class \"" + superClass.getName() + "\" was loaded by ");
                     LOGGER.error("[" + superClass.getClassLoader() + "] whereas object of type ");
-                    LOGGER.error("\"" + classObj.getName() + "\" was loaded by ["
+                    LOGGER.error('"' + classObj.getName() + "\" was loaded by ["
                         + classObj.getClassLoader() + "].");
                     return defaultValue;
                 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/UUIDUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/UUIDUtil.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/UUIDUtil.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/UUIDUtil.java Thu Apr  3 23:34:32 2014
@@ -147,7 +147,7 @@ public final class UUIDUtil {
                     rand = (rand + 1) & SEQUENCE_MASK;
                 }
             } while (duplicate);
-            assigned = assigned == null ? Long.toString(rand) : assigned + "," + Long.toString(rand);
+            assigned = assigned == null ? Long.toString(rand) : assigned + ',' + Long.toString(rand);
             System.setProperty(ASSIGNED_SEQUENCES, assigned);
         }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/StackTracePackageElement.java Thu Apr  3 23:34:32 2014
@@ -70,6 +70,6 @@ public class StackTracePackageElement im
     @Override
     public String toString() {
         final String exact = isExact ? "" : "~";
-        return exact + "[" + location + ":" + version + "]";
+        return exact + '[' + location + ':' + version + ']';
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java Thu Apr  3 23:34:32 2014
@@ -162,12 +162,12 @@ public final class ThrowableFormatOption
     @Override
     public String toString() {
         final StringBuilder s = new StringBuilder();
-        s.append("{").append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE).append("}");
+        s.append('{').append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE).append('}');
         s.append("{separator(").append(this.separator).append(")}");
         if (hasPackages()) {
             s.append("{filters(");
             for (final String p : this.packages) {
-                s.append(p).append(",");
+                s.append(p).append(',');
             }
             s.deleteCharAt(s.length() - 1);
             s.append(")}");
@@ -227,7 +227,7 @@ public final class ThrowableFormatOption
                     lines = 0;
                 } else if (option.equalsIgnoreCase(SHORT) || option.equalsIgnoreCase(CLASS_NAME) ||
                         option.equalsIgnoreCase(METHOD_NAME) || option.equalsIgnoreCase(LINE_NUMBER) ||
-                        option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE) || 
+                        option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE) ||
                         option.equalsIgnoreCase(LOCALIZED_MESSAGE)) {
                     lines = 2;
                 } else if (!option.equalsIgnoreCase(FULL)) {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java Thu Apr  3 23:34:32 2014
@@ -177,7 +177,7 @@ public class ThrowableProxy implements S
             sb.append("Wrapped by: ");
         }
         sb.append(toString());
-        sb.append("\n");
+        sb.append('\n');
         formatElements(sb, 0, throwable.getStackTrace(), callerPackageData, packages);
         return sb.toString();
     }
@@ -204,7 +204,7 @@ public class ThrowableProxy implements S
             formatWrapper(sb, cause.proxyCause);
             sb.append("Wrapped by: ");
         }
-        sb.append(cause).append("\n");
+        sb.append(cause).append('\n');
         formatElements(sb, cause.commonElementCount, cause.getThrowable().getStackTrace(), cause.callerPackageData,
             packages);
     }
@@ -228,7 +228,7 @@ public class ThrowableProxy implements S
         if (msg != null) {
             sb.append(": ").append(throwable.getMessage());
         }
-        sb.append("\n");
+        sb.append('\n');
         formatElements(sb, 0, throwable.getStackTrace(), callerPackageData, packages);
         if (proxyCause != null) {
             formatCause(sb, proxyCause, packages);
@@ -254,7 +254,7 @@ public class ThrowableProxy implements S
 
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     private void formatCause(final StringBuilder sb, final ThrowableProxy cause, final List<String> packages) {
-        sb.append("Caused by: ").append(cause).append("\n");
+        sb.append("Caused by: ").append(cause).append('\n');
         formatElements(sb, cause.commonElementCount, cause.getThrowable().getStackTrace(), cause.callerPackageData,
             packages);
         if (cause.getCause() != null) {
@@ -294,7 +294,7 @@ public class ThrowableProxy implements S
             }
         }
         if (commonCount != 0) {
-            sb.append("\t... ").append(commonCount).append(" more").append("\n");
+            sb.append("\t... ").append(commonCount).append(" more").append('\n');
         }
     }
 
@@ -302,9 +302,9 @@ public class ThrowableProxy implements S
                              final StringBuilder sb) {
         sb.append("\tat ");
         sb.append(element);
-        sb.append(" ");
+        sb.append(' ');
         sb.append(packageData);
-        sb.append("\n");
+        sb.append('\n');
     }
 
     private boolean isSuppressed(final StackTraceElement element, final List<String> packages) {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java Thu Apr  3 23:34:32 2014
@@ -35,19 +35,19 @@ import org.apache.logging.log4j.message.
 
 /**
  * Appends a series of JSON events as strings serialized as bytes.
- * 
+ *
  * TODO: Marker.
- * 
+ *
  * <h4>Complete well-formed JSON vs. fragment JSON</h4>
  * <p>
- * If you configure {@code complete="true"}, the appender outputs a well-formed JSON document. 
+ * If you configure {@code complete="true"}, the appender outputs a well-formed JSON document.
  * By default, with {@code complete="false"}, you should include the
  * output as an <em>external file</em> in a separate file to form a well-formed JSON document.
  * </p>
  * <p>
  * A well-formed JSON document follows this pattern:
  * </p>
- * 
+ *
  * <pre>[
  *   {
  *     "logger":"com.foo.Bar",
@@ -122,7 +122,7 @@ public class JSONLayout extends Abstract
 
     /**
      * Formats a {@link org.apache.logging.log4j.core.LogEvent} in conformance with the log4j.dtd.
-     * 
+     *
      * @param event
      *            The LogEvent.
      * @return The XML representation of the LogEvent.
@@ -131,7 +131,7 @@ public class JSONLayout extends Abstract
     public String toSerializable(final LogEvent event) {
         final StringBuilder buf = new StringBuilder(DEFAULT_SIZE);
         // DC locking to avoid synchronizing the whole layout.
-        boolean check = this.firstLayoutDone; 
+        boolean check = this.firstLayoutDone;
         if (!this.firstLayoutDone) {
             synchronized(this) {
                 check = this.firstLayoutDone;
@@ -139,12 +139,12 @@ public class JSONLayout extends Abstract
                     this.firstLayoutDone = true;
                 } else {
                     buf.append(',');
-                    buf.append(this.eol);                                
+                    buf.append(this.eol);
                 }
             }
         } else {
             buf.append(',');
-            buf.append(this.eol);                                            
+            buf.append(this.eol);
         }
         buf.append(this.indent1);
         buf.append('{');
@@ -197,16 +197,16 @@ public class JSONLayout extends Abstract
         }
 
         if (event.getContextStack().getDepth() > 0) {
-            buf.append(",");
+            buf.append(',');
             buf.append(this.eol);
             buf.append("\"ndc\":");
             buf.append(Transform.escapeJsonControlCharacters(event.getContextStack().toString()));
-            buf.append("\"");
+            buf.append('"');
         }
 
         final Throwable throwable = event.getThrown();
         if (throwable != null) {
-            buf.append(",");
+            buf.append(',');
             buf.append(this.eol);
             buf.append(this.indent2);
             buf.append("\"throwable\":\"");
@@ -215,12 +215,12 @@ public class JSONLayout extends Abstract
                 buf.append(Transform.escapeJsonControlCharacters(str));
                 buf.append("\\\\n");
             }
-            buf.append("\"");
+            buf.append('"');
         }
 
         if (this.locationInfo) {
             final StackTraceElement element = event.getSource();
-            buf.append(",");
+            buf.append(',');
             buf.append(this.eol);
             buf.append(this.indent2);
             buf.append("\"LocationInfo\":{");
@@ -243,14 +243,14 @@ public class JSONLayout extends Abstract
             buf.append(this.indent3);
             buf.append("\"line\":\"");
             buf.append(element.getLineNumber());
-            buf.append("\"");
+            buf.append('"');
             buf.append(this.eol);
             buf.append(this.indent2);
-            buf.append("}");
+            buf.append('}');
         }
 
         if (this.properties && event.getContextMap().size() > 0) {
-            buf.append(",");
+            buf.append(',');
             buf.append(this.eol);
             buf.append(this.indent2);
             buf.append("\"Properties\":[");
@@ -269,30 +269,30 @@ public class JSONLayout extends Abstract
                 buf.append(this.indent4);
                 buf.append("\"value\":\"");
                 buf.append(Transform.escapeJsonControlCharacters(String.valueOf(entry.getValue())));
-                buf.append("\"");
+                buf.append('"');
                 buf.append(this.eol);
                 buf.append(this.indent3);
-                buf.append("}");
+                buf.append('}');
                 if (i < entrySet.size()) {
-                    buf.append(",");
+                    buf.append(',');
                 }
                 buf.append(this.eol);
                 i++;
             }
             buf.append(this.indent2);
-            buf.append("]");
+            buf.append(']');
         }
 
         buf.append(this.eol);
         buf.append(this.indent1);
-        buf.append("}");
+        buf.append('}');
 
         return buf.toString();
     }
 
     /**
      * Returns appropriate JSON headers.
-     * 
+     *
      * @return a byte array containing the header, opening the JSON array.
      */
     @Override
@@ -308,7 +308,7 @@ public class JSONLayout extends Abstract
 
     /**
      * Returns appropriate JSON footer.
-     * 
+     *
      * @return a byte array containing the footer, closing the JSON array.
      */
     @Override
@@ -316,7 +316,7 @@ public class JSONLayout extends Abstract
         if (!this.complete) {
             return null;
         }
-        return (this.eol + "]" + this.eol).getBytes(this.getCharset());
+        return (this.eol + ']' + this.eol).getBytes(this.getCharset());
     }
 
     /**
@@ -325,7 +325,7 @@ public class JSONLayout extends Abstract
      * Key: "dtd" Value: "log4j-events.dtd"
      * <p/>
      * Key: "version" Value: "2.0"
-     * 
+     *
      * @return Map of content format keys supporting XMLLayout
      */
     @Override
@@ -345,7 +345,7 @@ public class JSONLayout extends Abstract
 
     /**
      * Creates an XML Layout.
-     * 
+     *
      * @param locationInfo
      *            If "true", includes the location information in the generated JSON.
      * @param properties
@@ -361,9 +361,9 @@ public class JSONLayout extends Abstract
     @PluginFactory
     public static JSONLayout createLayout(
             @PluginAttribute("locationInfo") final String locationInfo,
-            @PluginAttribute("properties") final String properties, 
+            @PluginAttribute("properties") final String properties,
             @PluginAttribute("complete") final String completeStr,
-            @PluginAttribute("compact") final String compactStr, 
+            @PluginAttribute("compact") final String compactStr,
             @PluginAttribute("charset") final String charsetName) {
         final Charset charset = Charsets.getSupportedCharset(charsetName, Charsets.UTF_8);
         final boolean info = Boolean.parseBoolean(locationInfo);

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Thu Apr  3 23:34:32 2014
@@ -280,7 +280,7 @@ public class RFC5424Layout extends Abstr
     }
 
     private void appendPriority(final StringBuilder buffer, final Level logLevel) {
-        buffer.append("<");
+        buffer.append('<');
         buffer.append(Priority.getPriority(facility, logLevel));
         buffer.append(">1 ");
     }
@@ -290,7 +290,7 @@ public class RFC5424Layout extends Abstr
     }
 
     private void appendSpace(final StringBuilder buffer) {
-        buffer.append(" ");
+        buffer.append(' ');
     }
 
     private void appendHostName(final StringBuilder buffer) {
@@ -303,7 +303,7 @@ public class RFC5424Layout extends Abstr
         } else if (configName != null) {
             buffer.append(configName);
         } else {
-            buffer.append("-");
+            buffer.append('-');
         }
     }
 
@@ -319,7 +319,7 @@ public class RFC5424Layout extends Abstr
         } else if (messageId != null) {
             buffer.append(messageId);
         } else {
-            buffer.append("-");
+            buffer.append('-');
         }
     }
 
@@ -329,7 +329,7 @@ public class RFC5424Layout extends Abstr
         final String text = (message instanceof StructuredDataMessage) ? message.getFormat() : message.getFormattedMessage();
 
         if (text != null && text.length() > 0) {
-            buffer.append(" ").append(escapeNewlines(text, escapeNewLine));
+            buffer.append(' ').append(escapeNewlines(text, escapeNewLine));
         }
 
         if (exceptionFormatters != null && event.getThrown() != null) {
@@ -349,7 +349,7 @@ public class RFC5424Layout extends Abstr
         final boolean isStructured = message instanceof StructuredDataMessage;
 
         if (!isStructured && (fieldFormatters!= null && fieldFormatters.size() == 0) && !includeMDC) {
-            buffer.append("-");
+            buffer.append('-');
             return;
         }
 
@@ -396,7 +396,7 @@ public class RFC5424Layout extends Abstr
         }
 
         if (sdElements.size() == 0) {
-            buffer.append("-");
+            buffer.append('-');
             return;
         }
 
@@ -437,15 +437,15 @@ public class RFC5424Layout extends Abstr
         final Calendar cal = new GregorianCalendar();
         cal.setTimeInMillis(now);
         buffer.append(Integer.toString(cal.get(Calendar.YEAR)));
-        buffer.append("-");
+        buffer.append('-');
         pad(cal.get(Calendar.MONTH) + 1, TWO_DIGITS, buffer);
-        buffer.append("-");
+        buffer.append('-');
         pad(cal.get(Calendar.DAY_OF_MONTH), TWO_DIGITS, buffer);
-        buffer.append("T");
+        buffer.append('T');
         pad(cal.get(Calendar.HOUR_OF_DAY), TWO_DIGITS, buffer);
-        buffer.append(":");
+        buffer.append(':');
         pad(cal.get(Calendar.MINUTE), TWO_DIGITS, buffer);
-        buffer.append(":");
+        buffer.append(':');
         pad(cal.get(Calendar.SECOND), TWO_DIGITS, buffer);
 
         final int millis = cal.get(Calendar.MILLISECOND);
@@ -456,18 +456,18 @@ public class RFC5424Layout extends Abstr
 
         int tzmin = (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)) / MILLIS_PER_MINUTE;
         if (tzmin == 0) {
-            buffer.append("Z");
+            buffer.append('Z');
         } else {
             if (tzmin < 0) {
                 tzmin = -tzmin;
-                buffer.append("-");
+                buffer.append('-');
             } else {
-                buffer.append("+");
+                buffer.append('+');
             }
             final int tzhour = tzmin / MINUTES_PER_HOUR;
             tzmin -= tzhour * MINUTES_PER_HOUR;
             pad(tzhour, TWO_DIGITS, buffer);
-            buffer.append(":");
+            buffer.append(':');
             pad(tzmin, TWO_DIGITS, buffer);
         }
         synchronized (this) {
@@ -482,7 +482,7 @@ public class RFC5424Layout extends Abstr
     private void pad(final int val, int max, final StringBuilder buf) {
         while (max > 1) {
             if (val < max) {
-                buf.append("0");
+                buf.append('0');
             }
             max = max / TWO_DIGITS;
         }
@@ -495,14 +495,14 @@ public class RFC5424Layout extends Abstr
             return;
         }
 
-        sb.append("[");
+        sb.append('[');
         sb.append(id);
         if (!mdcSDID.toString().equals(id)) {
             appendMap(prefix, data.getFields(), sb, noopChecker);
         } else {
             appendMap(prefix, data.getFields(), sb, checker);
         }
-        sb.append("]");
+        sb.append(']');
     }
 
     private String getId(final StructuredDataId id) {
@@ -517,7 +517,7 @@ public class RFC5424Layout extends Abstr
             ein = enterpriseNumber;
         }
         if (ein >= 0) {
-            sb.append("@").append(ein);
+            sb.append('@').append(ein);
         }
         return sb.toString();
     }
@@ -536,12 +536,12 @@ public class RFC5424Layout extends Abstr
         final SortedMap<String, String> sorted = new TreeMap<String, String>(map);
         for (final Map.Entry<String, String> entry : sorted.entrySet()) {
             if (checker.check(entry.getKey()) && entry.getValue() != null) {
-                sb.append(" ");
+                sb.append(' ');
                 if (prefix != null) {
                     sb.append(prefix);
                 }
                 sb.append(escapeNewlines(escapeSDParams(entry.getKey()), escapeNewLine)).append("=\"")
-                    .append(escapeNewlines(escapeSDParams(entry.getValue()), escapeNewLine)).append("\"");
+                    .append(escapeNewlines(escapeSDParams(entry.getValue()), escapeNewLine)).append('"');
             }
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java Thu Apr  3 23:34:32 2014
@@ -78,13 +78,13 @@ public class SyslogLayout extends Abstra
     public String toSerializable(final LogEvent event) {
         final StringBuilder buf = new StringBuilder();
 
-        buf.append("<");
+        buf.append('<');
         buf.append(Priority.getPriority(facility, event.getLevel()));
-        buf.append(">");
+        buf.append('>');
         addDate(event.getMillis(), buf);
-        buf.append(" ");
+        buf.append(' ');
         buf.append(localHostname);
-        buf.append(" ");
+        buf.append(' ');
 
         String message = event.getMessage().getFormattedMessage();
         if (null != escapeNewLine) {
@@ -93,7 +93,7 @@ public class SyslogLayout extends Abstra
         buf.append(message);
 
         if (includeNewLine) {
-            buf.append("\n");
+            buf.append('\n');
         }
         return buf.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Thu Apr  3 23:34:32 2014
@@ -112,7 +112,7 @@ public class XMLLayout extends AbstractS
         this.indent1 = compact ? COMPACT_INDENT : DEFAULT_INDENT;
         this.indent2 = this.indent1 + this.indent1;
         this.indent3 = this.indent2 + this.indent1;
-        this.namespacePrefix = (Strings.isEmpty(nsPrefix) ? DEFAULT_NS_PREFIX : nsPrefix) + ":";
+        this.namespacePrefix = (Strings.isEmpty(nsPrefix) ? DEFAULT_NS_PREFIX : nsPrefix) + ':';
     }
 
     /**
@@ -206,7 +206,7 @@ public class XMLLayout extends AbstractS
             buf.append("Marker");
             final Marker parent = marker.getParent();
             if (parent != null) {
-                buf.append(" parent=\"").append(Transform.escapeHtmlTags(parent.getName())).append("\"");
+                buf.append(" parent=\"").append(Transform.escapeHtmlTags(parent.getName())).append('"');
             }
             buf.append('>');
             buf.append(Transform.escapeHtmlTags(marker.getName()));
@@ -337,7 +337,7 @@ public class XMLLayout extends AbstractS
         if (!complete) {
             return null;
         }
-        return ("</" + ROOT_TAG + ">" + this.eol).getBytes(getCharset());
+        return ("</" + ROOT_TAG + '>' + this.eol).getBytes(getCharset());
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java Thu Apr  3 23:34:32 2014
@@ -146,7 +146,7 @@ public class Interpolator implements Str
         final StringBuilder sb = new StringBuilder();
         for (final String name : lookups.keySet()) {
             if (sb.length() == 0) {
-                sb.append("{");
+                sb.append('{');
             } else {
                 sb.append(", ");
             }
@@ -154,7 +154,7 @@ public class Interpolator implements Str
             sb.append(name);
         }
         if (sb.length() > 0) {
-            sb.append("}");
+            sb.append('}');
         }
         return sb.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java Thu Apr  3 23:34:32 2014
@@ -1129,6 +1129,6 @@ public class StrSubstitutor {
 
     @Override
     public String toString() {
-        return "StrSubstitutor(" + variableResolver.toString() + ")";
+        return "StrSubstitutor(" + variableResolver.toString() + ')';
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java Thu Apr  3 23:34:32 2014
@@ -109,7 +109,7 @@ public class WebLookup implements StrLoo
             return ctx.getInitParameter(key);
         }
 
-        ctx.log(getClass().getName() + " unable to resolve key '" + key + "'");
+        ctx.log(getClass().getName() + " unable to resolve key '" + key + '\'');
         return null;
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java Thu Apr  3 23:34:32 2014
@@ -62,7 +62,7 @@ public class DatagramSocketManager exten
         if (port <= 0) {
             throw new IllegalArgumentException("A port value is required");
         }
-        return (DatagramSocketManager) getManager("UDP:" + host + ":" + port, new FactoryData(host, port, layout),
+        return (DatagramSocketManager) getManager("UDP:" + host + ':' + port, new FactoryData(host, port, layout),
             FACTORY);
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java Thu Apr  3 23:34:32 2014
@@ -87,32 +87,32 @@ public class SMTPManager extends Abstrac
         if (to != null) {
             sb.append(to);
         }
-        sb.append(":");
+        sb.append(':');
         if (cc != null) {
             sb.append(cc);
         }
-        sb.append(":");
+        sb.append(':');
         if (bcc != null) {
             sb.append(bcc);
         }
-        sb.append(":");
+        sb.append(':');
         if (from != null) {
             sb.append(from);
         }
-        sb.append(":");
+        sb.append(':');
         if (replyTo != null) {
             sb.append(replyTo);
         }
-        sb.append(":");
+        sb.append(':');
         if (subject != null) {
             sb.append(subject);
         }
-        sb.append(":");
-        sb.append(protocol).append(":").append(host).append(":").append("port").append(":");
+        sb.append(':');
+        sb.append(protocol).append(':').append(host).append(':').append("port").append(':');
         if (username != null) {
             sb.append(username);
         }
-        sb.append(":");
+        sb.append(':');
         if (password != null) {
             sb.append(password);
         }
@@ -137,7 +137,7 @@ public class SMTPManager extends Abstrac
         try {
             final LogEvent[] priorEvents = buffer.removeAll();
             // LOG4J-310: log appendEvent even if priorEvents is empty
-            
+
             final byte[] rawBytes = formatContentToBytes(priorEvents, appendEvent, layout);
 
             final String contentType = layout.getContentType();

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java Thu Apr  3 23:34:32 2014
@@ -105,7 +105,7 @@ public class TCPSocketManager extends Ab
         if (delay == 0) {
             delay = DEFAULT_RECONNECTION_DELAY;
         }
-        return (TCPSocketManager) getManager("TCP:" + host + ":" + port,
+        return (TCPSocketManager) getManager("TCP:" + host + ':' + port,
             new FactoryData(host, port, delay, immediateFail, layout), FACTORY);
     }
 
@@ -207,13 +207,13 @@ public class TCPSocketManager extends Ab
                         connector = null;
                         shutdown = true;
                     }
-                    LOGGER.debug("Connection to " + host + ":" + port + " reestablished.");
+                    LOGGER.debug("Connection to " + host + ':' + port + " reestablished.");
                 } catch (final InterruptedException ie) {
                     LOGGER.debug("Reconnection interrupted.");
                 } catch (final ConnectException ex) {
-                    LOGGER.debug(host + ":" + port + " refused connection");
+                    LOGGER.debug(host + ':' + port + " refused connection");
                 } catch (final IOException ioe) {
-                    LOGGER.debug("Unable to reconnect to " + host + ":" + port);
+                    LOGGER.debug("Unable to reconnect to " + host + ':' + port);
                 } finally {
                     latch.countDown();
                 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java Thu Apr  3 23:34:32 2014
@@ -88,7 +88,7 @@ public class TLSSocketManager extends TC
         if (delay == 0) {
             delay = DEFAULT_RECONNECTION_DELAY;
         }
-        return (TLSSocketManager) getManager("TLS:" + host + ":" + port,
+        return (TLSSocketManager) getManager("TLS:" + host + ':' + port,
                 new TLSFactoryData(sslConfig, host, port, delay, immediateFail, layout), FACTORY);
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java Thu Apr  3 23:34:32 2014
@@ -72,7 +72,7 @@ public final class ExtendedThrowablePatt
             final String trace = proxy.getExtendedStackTrace(options.getPackages());
             final int len = toAppendTo.length();
             if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len - 1))) {
-                toAppendTo.append(" ");
+                toAppendTo.append(' ');
             }
             if (!options.allLines() || !Constants.LINE_SEP.equals(options.getSeparator())) {
                 final StringBuilder sb = new StringBuilder();

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java Thu Apr  3 23:34:32 2014
@@ -48,7 +48,7 @@ public final class FormattingInfo {
 
     /**
      * Creates new instance.
-     * 
+     *
      * @param leftAlign
      *            left align if true.
      * @param minLength
@@ -64,7 +64,7 @@ public final class FormattingInfo {
 
     /**
      * Gets default instance.
-     * 
+     *
      * @return default instance.
      */
     public static FormattingInfo getDefault() {
@@ -73,7 +73,7 @@ public final class FormattingInfo {
 
     /**
      * Determine if left aligned.
-     * 
+     *
      * @return true if left aligned.
      */
     public boolean isLeftAligned() {
@@ -82,7 +82,7 @@ public final class FormattingInfo {
 
     /**
      * Get minimum length.
-     * 
+     *
      * @return minimum length.
      */
     public int getMinLength() {
@@ -91,7 +91,7 @@ public final class FormattingInfo {
 
     /**
      * Get maximum length.
-     * 
+     *
      * @return maximum length.
      */
     public int getMaxLength() {
@@ -100,7 +100,7 @@ public final class FormattingInfo {
 
     /**
      * Adjust the content of the buffer based on the specified lengths and alignment.
-     * 
+     *
      * @param fieldStart
      *            start of field in buffer.
      * @param buffer
@@ -133,7 +133,7 @@ public final class FormattingInfo {
 
     /**
      * Returns a String suitable for debugging.
-     * 
+     *
      * @return a String suitable for debugging.
      */
     @Override
@@ -146,7 +146,7 @@ public final class FormattingInfo {
         sb.append(maxLength);
         sb.append(", minLength=");
         sb.append(minLength);
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java Thu Apr  3 23:34:32 2014
@@ -44,7 +44,7 @@ public final class MDCPatternConverter e
      * @param options options, may be null.
      */
     private MDCPatternConverter(final String[] options) {
-        super(options != null && options.length > 0 ? "MDC{" + options[0] + "}" : "MDC", "mdc");
+        super(options != null && options.length > 0 ? "MDC{" + options[0] + '}' : "MDC", "mdc");
         key = options != null && options.length > 0 ? options[0] : null;
     }
 
@@ -79,10 +79,10 @@ public final class MDCPatternConverter e
                 if (sb.length() > 1) {
                     sb.append(", ");
                 }
-                sb.append(key).append("=").append(contextMap.get(key));
+                sb.append(key).append('=').append(contextMap.get(key));
 
             }
-            sb.append("}");
+            sb.append('}');
             toAppendTo.append(sb);
         } else if (contextMap != null) {
             // otherwise they just want a single key output

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java Thu Apr  3 23:34:32 2014
@@ -44,7 +44,7 @@ public final class MapPatternConverter e
      * @param options options, may be null.
      */
     private MapPatternConverter(final String[] options) {
-        super(options != null && options.length > 0 ? "MAP{" + options[0] + "}" : "MAP", "map");
+        super(options != null && options.length > 0 ? "MAP{" + options[0] + '}' : "MAP", "map");
         key = options != null && options.length > 0 ? options[0] : null;
     }
 
@@ -83,10 +83,10 @@ public final class MapPatternConverter e
                 if (sb.length() > 1) {
                     sb.append(", ");
                 }
-                sb.append(key).append("=").append(map.get(key));
+                sb.append(key).append('=').append(map.get(key));
 
             }
-            sb.append("}");
+            sb.append('}');
             toAppendTo.append(sb);
         } else {
             // otherwise they just want a single key output

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java Thu Apr  3 23:34:32 2014
@@ -44,7 +44,7 @@ public class PatternFormatter {
     public FormattingInfo getFormattingInfo() {
         return field;
     }
-    
+
     /**
      * Normally pattern formatters are not meant to handle Exceptions although
      * few pattern formatters might.
@@ -60,7 +60,7 @@ public class PatternFormatter {
 
     /**
      * Returns a String suitable for debugging.
-     * 
+     *
      * @return a String suitable for debugging.
      */
     @Override
@@ -71,7 +71,7 @@ public class PatternFormatter {
         sb.append(converter);
         sb.append(", field=");
         sb.append(field);
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java Thu Apr  3 23:34:32 2014
@@ -88,7 +88,7 @@ public final class PatternParser {
 
     /**
      * Constructor.
-     * 
+     *
      * @param converterKey
      *            The type of converters that will be used.
      */
@@ -98,7 +98,7 @@ public final class PatternParser {
 
     /**
      * Constructor.
-     * 
+     *
      * @param config
      *            The current Configuration.
      * @param converterKey
@@ -112,7 +112,7 @@ public final class PatternParser {
 
     /**
      * Constructor.
-     * 
+     *
      * @param config
      *            The current Configuration.
      * @param converterKey
@@ -197,7 +197,7 @@ public final class PatternParser {
      * <p/>
      * If i points to a char which is not a character acceptable at the start of a unicode identifier, the value null is
      * returned.
-     * 
+     *
      * @param lastChar
      *            last processed character.
      * @param pattern
@@ -236,7 +236,7 @@ public final class PatternParser {
 
     /**
      * Extract options.
-     * 
+     *
      * @param pattern
      *            conversion pattern.
      * @param i
@@ -277,7 +277,7 @@ public final class PatternParser {
 
     /**
      * Parse a format specifier.
-     * 
+     *
      * @param pattern
      *            pattern to parse.
      * @param patternConverters
@@ -436,7 +436,7 @@ public final class PatternParser {
 
     /**
      * Creates a new PatternConverter.
-     * 
+     *
      * @param converterId
      *            converterId.
      * @param currentLiteral
@@ -455,7 +455,7 @@ public final class PatternParser {
         Class<PatternConverter> converterClass = null;
 
         if (rules == null) {
-            LOGGER.error("Null rules for [" + converterId + "]");
+            LOGGER.error("Null rules for [" + converterId + ']');
             return null;
         }
         for (int i = converterId.length(); i > 0 && converterClass == null; i--) {
@@ -464,12 +464,12 @@ public final class PatternParser {
         }
 
         if (converterClass == null) {
-            LOGGER.error("Unrecognized format specifier [" + converterId + "]");
+            LOGGER.error("Unrecognized format specifier [" + converterId + ']');
             return null;
         }
 
         if (AnsiConverter.class.isAssignableFrom(converterClass)) {
-            options.add(NO_CONSOLE_NO_ANSI + "=" + noConsoleNoAnsi);
+            options.add(NO_CONSOLE_NO_ANSI + '=' + noConsoleNoAnsi);
         }
         // Work around the regression bug in Class.getDeclaredMethods() in Oracle Java in version > 1.6.0_17:
         // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6815786
@@ -534,7 +534,7 @@ public final class PatternParser {
 
     /**
      * Processes a format specifier sequence.
-     * 
+     *
      * @param c
      *            initial character of format specifier.
      * @param pattern

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java Thu Apr  3 23:34:32 2014
@@ -58,7 +58,7 @@ public final class RegexReplacement {
 
     @Override
     public String toString() {
-        return "replace(regex=" + pattern.pattern() + ", replacement=" + substitution + ")";
+        return "replace(regex=" + pattern.pattern() + ", replacement=" + substitution + ')';
     }
 
     /**

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java Thu Apr  3 23:34:32 2014
@@ -72,7 +72,7 @@ public final class RootThrowablePatternC
             final String trace = proxy.getRootCauseStackTrace(options.getPackages());
             final int len = toAppendTo.length();
             if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len - 1))) {
-                toAppendTo.append(" ");
+                toAppendTo.append(' ');
             }
             if (!options.allLines() || !Constants.LINE_SEP.equals(options.getSeparator())) {
                 final StringBuilder sb = new StringBuilder();

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java Thu Apr  3 23:34:32 2014
@@ -33,7 +33,7 @@ public final class StyleConverter extend
 
     /**
      * Gets an instance of the class.
-     * 
+     *
      * @param config
      *            The current Configuration.
      * @param options
@@ -73,13 +73,13 @@ public final class StyleConverter extend
 
     /**
      * Constructs the converter.
-     * 
+     *
      * @param patternFormatters
      *            The PatternFormatters to generate the text to manipulate.
      * @param style
      *            The style that should encapsulate the pattern.
      * @param noAnsi
-     *            If true, do not output ANSI escape codes. 
+     *            If true, do not output ANSI escape codes.
      */
     private StyleConverter(final List<PatternFormatter> patternFormatters, final String style, boolean noAnsi) {
         super("style", "style");
@@ -121,7 +121,7 @@ public final class StyleConverter extend
 
     /**
      * Returns a String suitable for debugging.
-     * 
+     *
      * @return a String suitable for debugging.
      */
     @Override
@@ -136,7 +136,7 @@ public final class StyleConverter extend
         sb.append(patternFormatters);
         sb.append(", noAnsi=");
         sb.append(noAnsi);
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java Thu Apr  3 23:34:32 2014
@@ -126,7 +126,7 @@ public class ThrowablePatternConverter e
 
             len = buffer.length();
             if (len > 0 && !Character.isWhitespace(buffer.charAt(len - 1))) {
-                buffer.append(" ");
+                buffer.append(' ');
             }
             buffer.append(toAppend);
         }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/Timer.java Thu Apr  3 23:34:32 2014
@@ -226,7 +226,7 @@ public class Timer implements Serializab
         }
         else
         {
-            result.append(" ").append(m_status);
+            result.append(' ').append(m_status);
         }
         return result.toString();
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -66,23 +66,23 @@ public class JSONCompleteFileAppenderTes
         }
         assertNotNull("line1", line1);
         final String msg1 = "[";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.equals(msg1));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + ']', line1.equals(msg1));
 
         assertNotNull("line2", line2);
         final String msg2 = "  {";
-        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]", line2.equals(msg2));
+        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + ']', line2.equals(msg2));
 
         assertNotNull("line3", line3);
         final String msg3 = "    \"logger\":\"com.foo.Bar\",";
-        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]", line3.contains(msg3));
+        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + ']', line3.contains(msg3));
 
         assertNotNull("line4", line4);
         final String msg4 = "\"timestamp\":";
-        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + "]", line4.contains(msg4));
+        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + ']', line4.contains(msg4));
 
         assertNotNull("line5", line5);
         final String msg5 = "    \"level\":\"INFO\",";
-        assertTrue("line5 incorrect: [" + line5 + "], does not contain: [" + msg5 + "]", line5.contains(msg5));
+        assertTrue("line5 incorrect: [" + line5 + "], does not contain: [" + msg5 + ']', line5.contains(msg5));
 
         final String location = "testFlushAtEndOfBatch";
         assertTrue("no location", !line1.contains(location));

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -60,16 +60,16 @@ public class XmlCompactFileAppenderTest 
         }
         assertNotNull("line1", line1);
         final String msg1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.contains(msg1));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + ']', line1.contains(msg1));
 
         final String msg2 = "<Events xmlns=\"http://logging.apache.org/log4j/2.0/events\">";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg2 + "]", line1.contains(msg2));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg2 + ']', line1.contains(msg2));
 
         final String msg3 = "<Event ";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg3 + "]", line1.contains(msg3));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg3 + ']', line1.contains(msg3));
 
         final String msg4 = logMsg;
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg4 + "]", line1.contains(msg4));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg4 + ']', line1.contains(msg4));
 
         final String location = "testFlushAtEndOfBatch";
         assertTrue("no location", !line1.contains(location));

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -67,19 +67,19 @@ public class XmlCompleteFileAppenderTest
         }
         assertNotNull("line1", line1);
         final String msg1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.equals(msg1));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + ']', line1.equals(msg1));
 
         assertNotNull("line2", line2);
         final String msg2 = "<Events xmlns=\"http://logging.apache.org/log4j/2.0/events\">";
-        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]", line2.equals(msg2));
+        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + ']', line2.equals(msg2));
 
         assertNotNull("line3", line3);
         final String msg3 = "<Event ";
-        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]", line3.contains(msg3));
+        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + ']', line3.contains(msg3));
 
         assertNotNull("line4", line4);
         final String msg4 = logMsg;
-        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + "]", line4.contains(msg4));
+        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + ']', line4.contains(msg4));
 
         final String location = "testFlushAtEndOfBatch";
         assertTrue("no location", !line1.contains(location));

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -67,15 +67,15 @@ public class XmlFileAppenderTest {
 
         assertNotNull("line1", line1);
         final String msg1 = "<log4j:Event ";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.contains(msg1));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + ']', line1.contains(msg1));
 
         assertNotNull("line2", line2);
         final String msg2 = logMsg;
-        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]", line2.contains(msg2));
+        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + ']', line2.contains(msg2));
 
         assertNotNull("line3", line3);
         final String msg3 = "</log4j:Event>";
-        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]", line3.contains(msg3));
+        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + ']', line3.contains(msg3));
 
         final String location = "testFlushAtEndOfBatch";
         assertTrue("no location", !line1.contains(location));

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -69,19 +69,19 @@ public class XmlRandomAccessFileAppender
         }
         assertNotNull("line1", line1);
         final String msg1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.equals(msg1));
+        assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + ']', line1.equals(msg1));
 
         assertNotNull("line2", line2);
         final String msg2 = "<log4j:events xmlns:log4j=\"http://logging.apache.org/log4j/\">";
-        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]", line2.equals(msg2));
+        assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + ']', line2.equals(msg2));
 
         assertNotNull("line3", line3);
         final String msg3 = "<log4j:event ";
-        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]", line3.contains(msg3));
+        assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + ']', line3.contains(msg3));
 
         assertNotNull("line4", line4);
         final String msg4 = logMsg;
-        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + "]", line4.contains(msg4));
+        assertTrue("line4 incorrect: [" + line4 + "], does not contain: [" + msg4 + ']', line4.contains(msg4));
 
         final String location = "testFlushAtEndOfBatch";
         assertTrue("no location", !line1.contains(location));

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -227,7 +227,7 @@ public abstract class AbstractJdbcAppend
                 ".testPerformanceOfAppenderWith10000Events");
         logger.info("This is a warm-up message.");
 
-        System.out.println("Starting a performance test for JDBC Appender for " + this.databaseType + ".");
+        System.out.println("Starting a performance test for JDBC Appender for " + this.databaseType + '.');
 
         long start = System.nanoTime();
 
@@ -250,6 +250,6 @@ public abstract class AbstractJdbcAppend
         assertEquals("The number of records is not correct.", 10001, resultSet.getRow());
 
         System.out.println("Wrote 10,000 log events in " + elapsed + " nanoseconds (" + elapsedMilli +
-                " milliseconds) for " + this.databaseType + ".");
+                " milliseconds) for " + this.databaseType + '.');
     }
 }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java Thu Apr  3 23:34:32 2014
@@ -223,7 +223,7 @@ public abstract class AbstractJpaAppende
                     ".testPerformanceOfAppenderWith10000EventsUsingBasicEntity");
             logger.info("This is a warm-up message.");
 
-            System.out.println("Starting a performance test for JPA Appender for " + this.databaseType + ".");
+            System.out.println("Starting a performance test for JPA Appender for " + this.databaseType + '.');
 
             long start = System.nanoTime();
 
@@ -246,7 +246,7 @@ public abstract class AbstractJpaAppende
             assertEquals("The number of records is not correct.", 10001, resultSet.getRow());
 
             System.out.println("Wrote 10,000 log events in " + elapsed + " nanoseconds (" + elapsedMilli +
-                    " milliseconds) for " + this.databaseType + ".");
+                    " milliseconds) for " + this.databaseType + '.');
         } finally {
             this.tearDown();
         }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ThrowableAttributeConverterTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ThrowableAttributeConverterTest.java?rev=1584470&r1=1584469&r2=1584470&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ThrowableAttributeConverterTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ThrowableAttributeConverterTest.java Thu Apr  3 23:34:32 2014
@@ -85,10 +85,10 @@ public class ThrowableAttributeConverter
     }
 
     private static String getStackTrace(final Throwable throwable) {
-        String returnValue = throwable.toString() + "\n";
+        String returnValue = throwable.toString() + '\n';
 
         for (final StackTraceElement element : throwable.getStackTrace()) {
-            returnValue += "\tat " + element.toString() + "\n";
+            returnValue += "\tat " + element.toString() + '\n';
         }
 
         if (throwable.getCause() != null) {



Mime
View raw message