You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/30 03:50:36 UTC
[11/13] logging-log4j2 git commit: Revert "Use final. Remove trailing
spaces."
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
index 605afb4..19b4981 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
@@ -28,20 +28,19 @@ public class SystemPropertiesMain {
/**
* Prints system properties to the console.
- *
+ *
* @param args
* unused
*/
- public static void main(final String[] args) {
+ public static void main(String[] args) {
@SuppressWarnings("unchecked")
- final
Enumeration<String> keyEnum = (Enumeration<String>) System.getProperties().propertyNames();
- final List<String> list = new ArrayList<>();
+ List<String> list = new ArrayList<>();
while (keyEnum.hasMoreElements()) {
list.add(keyEnum.nextElement());
}
Collections.sort(list);
- for (final String key : list) {
+ for (String key : list) {
System.out.println(key + " = " + System.getProperty(key));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
index aeb31f6..ebab710 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
@@ -32,7 +32,7 @@ import org.junit.Test;
* integration tests (classes that end in "IT" instead of "Test" and
* "TestCase".)
* </p>
- *
+ *
* @see SystemPropertiesPropertySource
* @see SecurityManager
* @see System#setSecurityManager(SecurityManager)
@@ -60,7 +60,7 @@ public class SystemPropertiesPropertySourceSecurityManagerIT {
* Makes sure we do not blow up with exception below due to a security manager
* rejecting environment variable access in
* {@link SystemPropertiesPropertySource}.
- *
+ *
* <pre>
* java.lang.ExceptionInInitializerError
* at org.apache.logging.log4j.util.SystemPropertiesPropertySourceSecurityManagerTest.test(SystemPropertiesPropertySourceSecurityManagerTest.java:64)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
index 5075111..e492e4a 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
@@ -34,7 +34,7 @@ public class SystemPropertiesPropertySourceTest {
/**
* Tests avoiding a ConcurrentModificationException. For example:
- *
+ *
* <pre>
* java.util.ConcurrentModificationException
* at java.util.Hashtable$Enumerator.next(Hashtable.java:1167)
@@ -44,9 +44,9 @@ public class SystemPropertiesPropertySourceTest {
*/
@Test
public void testMultiThreadedAccess() throws InterruptedException, ExecutionException {
- final ExecutorService threadPool = Executors.newSingleThreadExecutor();
+ ExecutorService threadPool = Executors.newSingleThreadExecutor();
try {
- final Future<?> future = threadPool.submit(new Runnable() {
+ Future<?> future = threadPool.submit(new Runnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
index 5b4bac2..561cfaf 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
@@ -26,7 +26,7 @@ import org.eclipse.jetty.util.log.Logger;
/**
* Provides a native Apache Log4j 2 logger for Eclipse Jetty logging.
- *
+ *
* <p>
* To direct Jetty to use this class, set the system property {{org.eclipse.jetty.util.log.class}} to this class name.
* </p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
----------------------------------------------------------------------
diff --git a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
index 391857b..65ee60e 100644
--- a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
+++ b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
@@ -92,7 +92,7 @@ public class CassandraManager extends AbstractDatabaseManager {
protected void writeInternal(final LogEvent event) {
writeInternal(event, null);
}
-
+
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
for (int i = 0; i < columnMappings.size(); i++) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
index e24f5f8..97ed395 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
@@ -49,7 +49,7 @@ public class SimplePerfTest {
public static void setupClass() {
final Configuration config = LoggerContext.getContext().getConfiguration();
-
+
if (!DefaultConfiguration.DEFAULT_NAME.equals(config.getName())) {
System.out.println("Configuration was " + config.getName());
LoggerContext.getContext().start(new DefaultConfiguration());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index 46b10a5..cf2961d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -39,7 +39,7 @@ public class AbstractLifeCycle implements LifeCycle2 {
/**
* Gets the status logger.
- *
+ *
* @return the status logger.
*/
protected static org.apache.logging.log4j.Logger getStatusLogger() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
index ef9837e..4401247 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
@@ -29,7 +29,7 @@ public class DefaultLoggerContextAccessor implements LoggerContextAccessor {
/*
* Returns the current LoggerContext.
- *
+ *
* @see org.apache.logging.log4j.core.LoggerContextAccessor#getLoggerContext()
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
index 0aa77a0..0879f40 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
@@ -51,7 +51,7 @@ public interface LogEvent extends Serializable {
/**
* Returns an immutable version of this log event, which MAY BE a copy of this event.
- *
+ *
* @return an immutable version of this log event
*/
LogEvent toImmutable();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
index 895393f..3eb99e8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
@@ -1,33 +1,33 @@
-/*
- * 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.core;
-
-import java.nio.charset.Charset;
-
-/**
- * Instantiates the @{link Layout} type for String-based layouts.
- */
-public interface StringLayout extends Layout<String> {
-
- /**
- * Gets the Charset this layout uses to encode Strings into bytes.
- *
- * @return the Charset this layout uses to encode Strings into bytes.
- */
- Charset getCharset();
-
-}
+/*
+ * 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.core;
+
+import java.nio.charset.Charset;
+
+/**
+ * Instantiates the @{link Layout} type for String-based layouts.
+ */
+public interface StringLayout extends Layout<String> {
+
+ /**
+ * Gets the Charset this layout uses to encode Strings into bytes.
+ *
+ * @return the Charset this layout uses to encode Strings into bytes.
+ */
+ Charset getCharset();
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
index 13e2bf8..afab5c9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
@@ -22,7 +22,7 @@ public class Version {
public static void main(final String[] args) {
System.out.println(getProductString());
}
-
+
public static String getProductString() {
final Package pkg = Version.class.getPackage();
if (pkg == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index aa844ff..77e547e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -42,15 +42,15 @@ import org.apache.logging.log4j.core.util.Integers;
public abstract class AbstractAppender extends AbstractFilterable implements Appender {
/**
- * Subclasses can extend this abstract Builder.
- *
+ * Subclasses can extend this abstract Builder.
+ *
* @param <B> The type to build.
*/
public abstract static class Builder<B extends Builder<B>> extends AbstractFilterable.Builder<B> {
@PluginBuilderAttribute
private boolean ignoreExceptions = true;
-
+
@PluginElement("Layout")
private Layout<? extends Serializable> layout;
@@ -110,7 +110,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
this.name = name;
return asBuilder();
}
-
+
/**
* @deprecated Use {@link #setConfiguration(Configuration)}
*/
@@ -143,9 +143,9 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
public B withName(final String name) {
return setName(name);
}
-
+
}
-
+
public static int parseInt(final String s, final int defaultValue) {
try {
return Integers.parseInt(s, defaultValue);
@@ -162,7 +162,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor that defaults to suppressing exceptions.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -175,7 +175,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -191,7 +191,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -209,7 +209,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message using the {@link ErrorHandler} configured for this Appender.
- *
+ *
* @param msg The message.
*/
public void error(final String msg) {
@@ -219,7 +219,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message, exception, and a logging event, using the {@link ErrorHandler} configured for
* this Appender.
- *
+ *
* @param msg The message.
* @param event The LogEvent.
* @param t The Throwable.
@@ -230,7 +230,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message and an exception using the {@link ErrorHandler} configured for this Appender.
- *
+ *
* @param msg The message.
* @param t The Throwable.
*/
@@ -240,7 +240,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the ErrorHandler, if any.
- *
+ *
* @return The ErrorHandler.
*/
@Override
@@ -250,7 +250,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the Layout for the appender.
- *
+ *
* @return The Layout used to format the event.
*/
@Override
@@ -260,7 +260,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the name of the Appender.
- *
+ *
* @return The name of the Appender.
*/
@Override
@@ -281,7 +281,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* The handler must be set before the appender is started.
- *
+ *
* @param handler The ErrorHandler to use.
*/
@Override
@@ -299,7 +299,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Serializes the given event using the appender's layout if present.
- *
+ *
* @param event
* the event to serialize.
* @return the serialized event or null if no layout is present.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
index f9283f0..7537d99 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
@@ -35,7 +35,7 @@ public abstract class AbstractFileAppender<M extends OutputStreamManager> extend
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -151,7 +151,7 @@ public abstract class AbstractFileAppender<M extends OutputStreamManager> extend
}
}
-
+
private final String fileName;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 25803a3..d6acc08 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -34,12 +34,12 @@ import org.apache.logging.log4j.core.util.Constants;
public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager> extends AbstractAppender {
/**
- * Subclasses can extend this abstract Builder.
- *
+ * Subclasses can extend this abstract Builder.
+ *
* @param <B> The type to build.
*/
public abstract static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> {
-
+
@PluginBuilderAttribute
private boolean bufferedIo = true;
@@ -60,12 +60,12 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
public boolean isImmediateFlush() {
return immediateFlush;
}
-
+
public B withImmediateFlush(final boolean immediateFlush) {
this.immediateFlush = immediateFlush;
return asBuilder();
}
-
+
public B withBufferedIo(final boolean bufferedIo) {
this.bufferedIo = bufferedIo;
return asBuilder();
@@ -77,7 +77,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
}
}
-
+
/**
* Immediate flush means that the underlying writer or output stream will be flushed at the end of each append
* operation. Immediate flush is slower but ensures that each append request is actually written. If
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
index 078f6cb..f94ef59 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.config.Property;
/**
* Appends log events as strings to a writer.
- *
+ *
* @param <M>
* The kind of {@link WriterManager} under management
*/
@@ -49,18 +49,18 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Instantiates.
- *
+ *
* @param name
* The name of the Appender.
* @param layout
* The layout to format the message.
- * @param properties
+ * @param properties
* Optional properties.
* @param manager
* The OutputStreamManager.
*/
protected AbstractWriterAppender(final String name, final StringLayout layout, final Filter filter,
- final boolean ignoreExceptions, final boolean immediateFlush, final Property[] properties, final M manager) {
+ final boolean ignoreExceptions, final boolean immediateFlush, Property[] properties, final M manager) {
super(name, filter, layout, ignoreExceptions, properties);
this.manager = manager;
this.immediateFlush = immediateFlush;
@@ -68,7 +68,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Instantiates.
- *
+ *
* @param name
* The name of the Appender.
* @param layout
@@ -90,7 +90,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
* <p>
* Most subclasses will need to override this method.
* </p>
- *
+ *
* @param event
* The LogEvent.
*/
@@ -115,7 +115,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Gets the manager.
- *
+ *
* @return the manager.
*/
public M getManager() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 533a604..5400d13 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -50,7 +50,7 @@ public class AppenderSet {
public AppenderSet build() {
if (configuration == null) {
LOGGER.error("Configuration is missing from AppenderSet {}", this);
- return null;
+ return null;
}
if (node == null) {
LOGGER.error("No node in AppenderSet {}", this);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index f7c9694..bf8a163 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -529,8 +529,8 @@ public final class AsyncAppender extends AbstractAppender {
/**
* Returns the number of elements in the queue.
- *
- * @return the number of elements in the queue.
+ *
+ * @return the number of elements in the queue.
* @since 2.11.1
*/
public int getQueueSize() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
index 7a93ad1..cadfea0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
@@ -40,7 +40,7 @@ public class ConfigurationFactoryData {
/**
* Gets the LoggerContext from the Configuration or null.
- *
+ *
* @return the LoggerContext from the Configuration or null.
*/
public LoggerContext getLoggerContext() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 540c39d..7a9864f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -84,7 +84,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
public abstract Charset getDefaultCharset();
- protected Charset getCharset(final String property, final Charset defaultCharset) {
+ protected Charset getCharset(final String property, Charset defaultCharset) {
return new PropertiesUtil(PropertiesUtil.getSystemProperties()).getCharsetProperty(property, defaultCharset);
}
@@ -92,7 +92,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
private ConsoleAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final OutputStreamManager manager, final boolean ignoreExceptions, final Target target,
- final Property[] properties) {
+ Property[] properties) {
super(name, layout, filter, ignoreExceptions, true, properties, manager);
this.target = target;
}
@@ -275,7 +275,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
return outputStream;
}
- private static String clean(final String string) {
+ private static String clean(String string) {
return string.replace(Chars.NUL, Chars.SPACE);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
index 14ee729..3032e30 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
@@ -64,7 +64,7 @@ public final class FailoverAppender extends AbstractAppender {
private FailoverAppender(final String name, final Filter filter, final String primary, final String[] failovers,
final int intervalMillis, final Configuration config, final boolean ignoreExceptions,
- final Property[] properties) {
+ Property[] properties) {
super(name, filter, null, ignoreExceptions, properties);
this.primaryRef = primary;
this.failovers = failovers;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 7c55fac..7dd239b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -45,7 +45,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -186,9 +186,9 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
}
}
-
+
private static final int DEFAULT_BUFFER_SIZE = 8192;
-
+
/**
* Create a File Appender.
* @param fileName The name and path of the file.
@@ -240,12 +240,12 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
.build();
// @formatter:on
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
}
-
+
private final String fileName;
private final Advertiser advertiser;
@@ -254,7 +254,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final FileManager manager, final String filename, final boolean ignoreExceptions,
- final boolean immediateFlush, final Advertiser advertiser, final Property[] properties) {
+ final boolean immediateFlush, final Advertiser advertiser, Property[] properties) {
super(name, layout, filter, ignoreExceptions, immediateFlush, properties, manager);
if (advertiser != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
index 54b8402..15a3a63 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
@@ -45,7 +45,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -118,7 +118,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
}
}
-
+
private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB
private static final int MAX_REGION_LENGTH = 1 << BIT_POSITION_1GB;
private static final int MIN_REGION_LENGTH = 256;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
index 7dfd187..3c84938 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.MemoryMappedFileAppender.Builder;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
@@ -49,7 +50,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
private boolean follow = false;
- private final boolean ignoreExceptions = true;
+ private boolean ignoreExceptions = true;
private OutputStream target;
@@ -72,7 +73,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
return asBuilder();
}
}
-
+
/**
* Holds data to pass to factory method.
*/
@@ -83,7 +84,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Builds instances.
- *
+ *
* @param os
* The OutputStream.
* @param type
@@ -105,7 +106,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Creates an OutputStreamManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -122,7 +123,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Creates an OutputStream Appender.
- *
+ *
* @param layout
* The layout to use or null to get the default layout.
* @param filter
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index 6970126..98df988 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -43,7 +43,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -107,14 +107,14 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
}
}
-
+
private final String fileName;
private Object advertisement;
private final Advertiser advertiser;
private RandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout,
final Filter filter, final RandomAccessFileManager manager, final String filename,
- final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser,
+ final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser,
final Property[] properties) {
super(name, layout, filter, ignoreExceptions, immediateFlush, properties, manager);
@@ -233,7 +233,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
.withImmediateFlush(isFlush).setLayout(layout).setName(name)
.build();
}
-
+
/**
* Creates a builder for a RandomAccessFileAppender.
* @return a builder for a RandomAccessFileAppender.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index 8373441..ed42236 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -54,7 +54,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
* @since 2.7
@@ -75,11 +75,11 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
@PluginBuilderAttribute
private boolean locking;
- @PluginElement("Policy")
+ @PluginElement("Policy")
@Required
private TriggeringPolicy policy;
-
- @PluginElement("Strategy")
+
+ @PluginElement("Strategy")
private RolloverStrategy strategy;
@PluginBuilderAttribute
@@ -266,7 +266,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
}
}
-
+
private static final int DEFAULT_BUFFER_SIZE = 8192;
private final String fileName;
@@ -400,7 +400,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Creates a new Builder.
- *
+ *
* @return a new Builder.
* @since 2.7
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index b84275b..87bd023 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -195,7 +195,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
}
}
-
+
private final String fileName;
private final String filePattern;
private final Object advertisement;
@@ -342,7 +342,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
.withStrategy(strategy)
.build();
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 316663c..39be95e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -65,7 +65,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
* <li>Removed deprecated "delayMillis", use "reconnectionDelayMillis".</li>
* <li>Removed deprecated "reconnectionDelay", use "reconnectionDelayMillis".</li>
* </ul>
- *
+ *
* @param <B>
* The type to build.
*/
@@ -94,10 +94,10 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
@PluginBuilderAttribute
@PluginAliases({ "reconnectDelay", "reconnectionDelay", "delayMillis", "reconnectionDelayMillis" })
private int reconnectDelayMillis;
-
+
@PluginElement("SocketOptions")
private SocketOptions socketOptions;
-
+
@PluginElement("SslConfiguration")
@PluginAliases({ "SslConfig" })
private SslConfiguration sslConfiguration;
@@ -184,13 +184,13 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
}
}
-
+
/**
* Builds a SocketAppender.
- * <ul>
+ * <ul>
* <li>Removed deprecated "delayMillis", use "reconnectionDelayMillis".</li>
* <li>Removed deprecated "reconnectionDelay", use "reconnectionDelayMillis".</li>
- * </ul>
+ * </ul>
*/
public static class Builder extends AbstractBuilder<Builder>
implements org.apache.logging.log4j.core.util.Builder<SocketAppender> {
@@ -226,7 +226,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
getPropertyArray());
}
}
-
+
@PluginBuilderFactory
public static Builder newBuilder() {
return new Builder();
@@ -341,7 +341,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
.build();
// @formatter:on
}
-
+
/**
* Creates a socket appender.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index 7ccb80d..87ec9f8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -55,52 +55,52 @@ public class SyslogAppender extends SocketAppender {
@PluginBuilderAttribute("id")
private String id;
-
+
@PluginBuilderAttribute(value = "enterpriseNumber")
private int enterpriseNumber = Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER;
-
+
@PluginBuilderAttribute(value = "includeMdc")
private boolean includeMdc = true;
-
+
@PluginBuilderAttribute("mdcId")
private String mdcId;
-
+
@PluginBuilderAttribute("mdcPrefix")
private String mdcPrefix;
-
+
@PluginBuilderAttribute("eventPrefix")
private String eventPrefix;
-
+
@PluginBuilderAttribute(value = "newLine")
private boolean newLine;
-
+
@PluginBuilderAttribute("newLineEscape")
private String escapeNL;
-
+
@PluginBuilderAttribute("appName")
private String appName;
-
+
@PluginBuilderAttribute("messageId")
private String msgId;
-
+
@PluginBuilderAttribute("mdcExcludes")
private String excludes;
-
+
@PluginBuilderAttribute("mdcIncludes")
private String includes;
-
+
@PluginBuilderAttribute("mdcRequired")
private String required;
-
+
@PluginBuilderAttribute("format")
private String format;
-
+
@PluginBuilderAttribute("charset")
private Charset charsetName = StandardCharsets.UTF_8;
-
+
@PluginBuilderAttribute("exceptionPattern")
private String exceptionPattern;
-
+
@PluginElement("LoggerFields")
private LoggerFields[] loggerFields;
@@ -301,12 +301,12 @@ public class SyslogAppender extends SocketAppender {
return asBuilder();
}
}
-
+
protected static final String RFC5424 = "RFC5424";
protected SyslogAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final boolean ignoreExceptions, final boolean immediateFlush,
- final AbstractSocketManager manager, final Advertiser advertiser, final Property[] properties) {
+ final AbstractSocketManager manager, final Advertiser advertiser, Property[] properties) {
super(name, layout, filter, manager, ignoreExceptions, immediateFlush, advertiser, properties);
}
@@ -392,7 +392,7 @@ public class SyslogAppender extends SocketAppender {
final Configuration configuration,
final Charset charset,
final String exceptionPattern,
- final LoggerFields[] loggerFields,
+ final LoggerFields[] loggerFields,
final boolean advertise) {
// @formatter:on
@@ -428,7 +428,7 @@ public class SyslogAppender extends SocketAppender {
.build();
// @formatter:on
}
-
+
// Calling this method newBuilder() does not compile
@PluginBuilderFactory
public static <B extends Builder<B>> B newSyslogAppenderBuilder() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
index 27e90cd..1b1a61a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.util.Chars;
/**
* Wraps messages that are formatted according to RFC 5425.
- *
+ *
* @see <a href="https://tools.ietf.org/html/rfc5425">RFC 5425</a>
*/
public class TlsSyslogFrame {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index 249fb9f..a5683eb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -16,12 +16,15 @@
*/
package org.apache.logging.log4j.core.appender;
+import java.io.Serializable;
import java.io.Writer;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.StringLayout;
+import org.apache.logging.log4j.core.appender.HttpAppender.Builder;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
@@ -47,8 +50,8 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
@Override
public WriterAppender build() {
- final StringLayout layout = (StringLayout) getLayout();
- final StringLayout actualLayout = layout != null ? layout : PatternLayout.createDefaultLayout();
+ StringLayout layout = (StringLayout) getLayout();
+ StringLayout actualLayout = layout != null ? layout : PatternLayout.createDefaultLayout();
return new WriterAppender(getName(), actualLayout, getFilter(), getManager(target, follow, actualLayout),
isIgnoreExceptions(), getPropertyArray());
}
@@ -73,7 +76,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Builds instances.
- *
+ *
* @param writer
* The OutputStream.
* @param type
@@ -92,7 +95,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Creates a WriterManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -109,7 +112,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Creates a WriterAppender.
- *
+ *
* @param layout
* The layout to use or null to get the default layout.
* @param filter
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
index e977c1b..f720461 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
@@ -92,7 +92,7 @@ public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager
* @param manager The matching {@link AbstractDatabaseManager} implementation.
*/
protected AbstractDatabaseAppender(final String name, final Filter filter,
- final Layout<? extends Serializable> layout, final boolean ignoreExceptions,
+ final Layout<? extends Serializable> layout, final boolean ignoreExceptions,
final Property[] properties, final T manager) {
super(name, filter, layout, ignoreExceptions, properties);
this.manager = manager;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index f9a0082..0350543 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -272,7 +272,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
/**
* Gets the layout.
- *
+ *
* @return the layout.
*/
public Layout<? extends Serializable> getLayout() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
index 1178156..8d2759b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
@@ -106,8 +106,8 @@ public class ColumnMapping {
/**
* Layout of value to write to database (before type conversion). Not applicable if {@link #setType(Class)} is
* a {@link ReadOnlyStringMap}, {@link ThreadContextMap}, or {@link ThreadContextStack}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLayout(final StringLayout layout) {
this.layout = layout;
@@ -117,8 +117,8 @@ public class ColumnMapping {
/**
* Literal value to use for populating a column. This is generally useful for functions, stored procedures,
* etc. No escaping will be done on this value.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLiteral(final String literal) {
this.literal = literal;
@@ -127,8 +127,8 @@ public class ColumnMapping {
/**
* Column name.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setName(final String name) {
this.name = name;
@@ -138,8 +138,8 @@ public class ColumnMapping {
/**
* Parameter value to use for populating a column, MUST contain a single parameter marker '?'. This is generally useful for functions, stored procedures,
* etc. No escaping will be done on this value.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setParameter(final String parameter) {
this.parameter= parameter;
@@ -149,8 +149,8 @@ public class ColumnMapping {
/**
* Pattern to use as a {@link PatternLayout}. Convenient shorthand for {@link #setLayout(StringLayout)} with a
* PatternLayout.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setPattern(final String pattern) {
this.pattern = pattern;
@@ -160,7 +160,7 @@ public class ColumnMapping {
/**
* Source name. Useful when combined with a {@link org.apache.logging.log4j.message.MapMessage} depending on the
* appender.
- *
+ *
* @return this.
*/
public Builder setSource(final String source) {
@@ -172,8 +172,8 @@ public class ColumnMapping {
* Class to convert value to before storing in database. If the type is compatible with {@link ThreadContextMap} or
* {@link ReadOnlyStringMap}, then the MDC will be used. If the type is compatible with {@link ThreadContextStack},
* then the NDC will be used. If the type is compatible with {@link Date}, then the event timestamp will be used.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setType(final Class<?> type) {
this.type = type;
@@ -192,7 +192,7 @@ public class ColumnMapping {
public static Builder newBuilder() {
return new Builder();
}
-
+
private final StringLayout layout;
private final String literalValue;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
index 72698b9..bd04eac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.appender.db.jdbc;
import org.apache.logging.log4j.core.AbstractLifeCycle;
public abstract class AbstractConnectionSource extends AbstractLifeCycle implements ConnectionSource {
-
+
// nothing yet
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
index 0a67d69..06e5cce 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
@@ -127,7 +127,7 @@ public class AbstractDriverManagerConnectionSource extends AbstractConnectionSou
private final char[] userName;
public AbstractDriverManagerConnectionSource(final String driverClassName, final String connectionString,
- final String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
+ String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
super();
this.driverClassName = driverClassName;
this.connectionString = connectionString;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
index ba0ad25..1377b2a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
@@ -147,8 +147,8 @@ public final class ColumnConfig {
/**
* The configuration object.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setConfiguration(final Configuration configuration) {
this.configuration = configuration;
@@ -157,8 +157,8 @@ public final class ColumnConfig {
/**
* The name of the database column as it exists within the database table.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setName(final String name) {
this.name = name;
@@ -168,8 +168,8 @@ public final class ColumnConfig {
/**
* The {@link PatternLayout} pattern to insert in this column. Mutually exclusive with
* {@code literal!=null} and {@code eventTimestamp=true}
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setPattern(final String pattern) {
this.pattern = pattern;
@@ -179,8 +179,8 @@ public final class ColumnConfig {
/**
* The literal value to insert into the column as-is without any quoting or escaping. Mutually exclusive with
* {@code pattern!=null} and {@code eventTimestamp=true}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLiteral(final String literal) {
this.literal = literal;
@@ -190,8 +190,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that this column is a date-time column in which the event timestamp should be
* inserted. Mutually exclusive with {@code pattern!=null} and {@code literal!=null}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setEventTimestamp(final boolean eventTimestamp) {
isEventTimestamp = eventTimestamp;
@@ -200,8 +200,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that the column is a Unicode String.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setUnicode(final boolean unicode) {
isUnicode = unicode;
@@ -210,8 +210,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that the column is a character LOB (CLOB).
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setClob(final boolean clob) {
isClob = clob;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
index 5ae51c6..42b6e1d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.LifeCycle;
* connection sources meet your needs, you can simply create your own connection source.
*/
public interface ConnectionSource extends LifeCycle {
-
+
/**
* This should return a new connection every time it is called.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
index 2f1b390..e390c5e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
@@ -57,7 +57,7 @@ public class DriverManagerConnectionSource extends AbstractDriverManagerConnecti
}
public DriverManagerConnectionSource(final String driverClassName, final String connectionString,
- final String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
+ String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
super(driverClassName, connectionString, actualConnectionString, userName, password, properties);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
index 6f98eba..b241f29 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
@@ -121,7 +121,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* The connections source from which database connections should be retrieved.
- *
+ *
* @return this
*/
public B setConnectionSource(final ConnectionSource connectionSource) {
@@ -132,7 +132,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* If an integer greater than 0, this causes the appender to buffer log events and flush whenever the buffer
* reaches this size.
- *
+ *
* @return this
*/
public B setBufferSize(final int bufferSize) {
@@ -142,7 +142,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* The name of the database table to insert log events into.
- *
+ *
* @return this
*/
public B setTableName(final String tableName) {
@@ -152,7 +152,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* Information about the columns that log event data should be inserted into and how to insert that data.
- *
+ *
* @return this
*/
public B setColumnConfigs(final ColumnConfig... columnConfigs) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index 72a3a3f..a026a3b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -78,7 +78,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
* Creates managers.
*/
private static final class JdbcDatabaseManagerFactory implements ManagerFactory<JdbcDatabaseManager, FactoryData> {
-
+
private static final char PARAMETER_MARKER = '?';
@Override
@@ -215,11 +215,11 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
private final String sqlStatement;
private Connection connection;
-
+
private PreparedStatement statement;
-
+
private boolean isBatchSupported;
-
+
private JdbcDatabaseManager(final String name, final int bufferSize, final ConnectionSource connectionSource,
final String sqlStatement, final List<ColumnConfig> columnConfigs,
final List<ColumnMapping> columnMappings) {
@@ -237,7 +237,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
if (this.connection != null && !this.connection.isClosed()) {
if (this.isBatchSupported) {
logger().debug("Executing batch PreparedStatement {}", this.statement);
- final int[] result = this.statement.executeBatch();
+ int[] result = this.statement.executeBatch();
logger().debug("Batch result: {}", Arrays.toString(result));
}
logger().debug("Committing Connection {}", this.connection);
@@ -361,7 +361,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
this.statement.setObject(i++, DateTypeConverter.fromMillis(event.getTimeMillis(),
mapping.getType().asSubclass(Date.class)));
} else {
- final StringLayout layout = mapping.getLayout();
+ StringLayout layout = mapping.getLayout();
if (layout != null) {
if (Clob.class.isAssignableFrom(mapping.getType())) {
this.statement.setClob(i++, new StringReader(layout.toSerializable(event)));
@@ -409,7 +409,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
// Release ASAP
try {
statement.clearParameters();
- } catch (final SQLException e) {
+ } catch (SQLException e) {
// Ignore
}
Closer.closeSilently(reader);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
index 59fd75b..7a7bd43 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
@@ -29,6 +29,8 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.AbstractManager;
+import org.apache.logging.log4j.core.appender.HttpAppender;
+import org.apache.logging.log4j.core.appender.HttpAppender.Builder;
import org.apache.logging.log4j.core.appender.mom.JmsManager.JmsManagerConfiguration;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Property;
@@ -36,6 +38,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAliases;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
import org.apache.logging.log4j.core.net.JndiManager;
@@ -109,7 +112,7 @@ public class JmsAppender extends AbstractAppender {
// JmsManagerFactory has already logged an ERROR.
return null;
}
- final Layout<? extends Serializable> layout = getLayout();
+ Layout<? extends Serializable> layout = getLayout();
if (layout == null) {
LOGGER.error("No layout provided for JmsAppender");
return null;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
index 1f7a278..e0b3921 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
@@ -29,7 +29,7 @@ public class DefaultKafkaProducerFactory implements KafkaProducerFactory {
/**
* Creates a new Kafka Producer from the given configuration properties.
- *
+ *
* @param config
* <a href="https://kafka.apache.org/documentation.html#producerconfigs">Kafka Producer configuration
* properties.</a>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
index ef4d656..642d6bb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
@@ -50,12 +50,12 @@ public final class KafkaAppender extends AbstractAppender {
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
implements org.apache.logging.log4j.core.util.Builder<KafkaAppender> {
- @PluginAttribute("topic")
+ @PluginAttribute("topic")
private String topic;
@PluginAttribute("key")
private String key;
-
+
@PluginAttribute(value = "syncSend", defaultBoolean = true)
private boolean syncSend;
@@ -92,7 +92,7 @@ public final class KafkaAppender extends AbstractAppender {
}
}
-
+
@Deprecated
public static KafkaAppender createAppender(
final Layout<? extends Serializable> layout,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
index a58fb38..7532bb8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
@@ -28,7 +28,7 @@ public interface KafkaProducerFactory {
/**
* Creates a new Kafka Producer from the given configuration properties.
- *
+ *
* @param config
* <a href="https://kafka.apache.org/documentation.html#producerconfigs">Kafka Producer configuration
* properties.</a>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
index 8ed9efa..fd3ca5d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.core.util.Booleans;
* For examples on how to write your own NoSQL provider, see the simple source code for the MongoDB and CouchDB
* providers.
* </p>
- *
+ *
* @see NoSqlObject
* @see NoSqlConnection
* @see NoSqlProvider
@@ -48,7 +48,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Builds ConsoleAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -84,25 +84,25 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Sets the buffer size.
- *
+ *
* @param bufferSize
* If an integer greater than 0, this causes the appender to buffer log events and flush whenever the
* buffer reaches this size.
* @return this
*/
- public B setBufferSize(final int bufferSize) {
+ public B setBufferSize(int bufferSize) {
this.bufferSize = bufferSize;
return asBuilder();
}
/**
* Sets the provider.
- *
+ *
* @param provider
* The NoSQL provider that provides connections to the chosen NoSQL database.
* @return this
*/
- public B setProvider(final NoSqlProvider<?> provider) {
+ public B setProvider(NoSqlProvider<?> provider) {
this.provider = provider;
return asBuilder();
}
@@ -131,7 +131,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
public static NoSqlAppender createAppender(
// @formatter:off
final String name,
- final String ignore,
+ final String ignore,
final Filter filter,
final String bufferSize,
final NoSqlProvider<?> provider) {
@@ -163,7 +163,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
private final String description;
- private NoSqlAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
+ private NoSqlAppender(final String name, final Filter filter, Layout<? extends Serializable> layout,
final boolean ignoreExceptions, final Property[] properties, final NoSqlDatabaseManager<?> manager) {
super(name, filter, layout, ignoreExceptions, properties, manager);
this.description = this.getName() + "{ manager=" + this.getManager() + " }";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
index 3f623ba..80acae7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
@@ -18,6 +18,8 @@ package org.apache.logging.log4j.core.appender.nosql;
import java.io.Serializable;
+import javax.jms.JMSException;
+
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.LogEvent;
@@ -72,7 +74,7 @@ public final class NoSqlDatabaseManager<W> extends AbstractDatabaseManager {
protected void writeInternal(final LogEvent event) {
writeInternal(event, null);
}
-
+
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.connection == null || this.connection.isClosed()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
index 2726795..39c4d60 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
@@ -23,7 +23,7 @@ package org.apache.logging.log4j.core.appender.nosql;
* @param <C> Specifies which implementation of {@link NoSqlConnection} this provider provides.
*/
public interface NoSqlProvider<C extends NoSqlConnection<?, ? extends NoSqlObject<?>>> {
-
+
/**
* Obtains a connection from this provider. The concept of a connection in this case is not strictly an active
* duplex UDP or TCP connection to the underlying database. It can be thought of more as a gateway, a path for
@@ -32,7 +32,7 @@ public interface NoSqlProvider<C extends NoSqlConnection<?, ? extends NoSqlObjec
* Where applicable, this method should return a connection from the connection pool as opposed to opening a
* brand new connection every time.
* </p>
- *
+ *
* @return a connection that can be used to create and persist objects to this database.
* @see NoSqlConnection
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
index c6f9d44..a1ef2ef 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.util.KeyValuePair;
/**
* Rewrites log event levels for a given logger name.
- *
+ *
* @since 2.4
*/
@Plugin(name = "LoggerNameLevelRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
@@ -40,7 +40,7 @@ public class LoggerNameLevelRewritePolicy implements RewritePolicy {
/**
* Creates a policy to rewrite levels for a given logger name.
- *
+ *
* @param loggerNamePrefix
* The logger name prefix for events to rewrite; all event logger names that start with this string will be
* rewritten.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
index 61b41b1..5302a07 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
@@ -37,7 +37,7 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "MapRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class MapRewritePolicy implements RewritePolicy {
-
+
/**
* Allow subclasses access to the status logger without creating another instance.
*/
@@ -90,12 +90,12 @@ public final class MapRewritePolicy implements RewritePolicy {
* keys should be updated.
*/
public enum Mode {
-
+
/**
* Keys should be added.
*/
Add,
-
+
/**
* Keys should be updated.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
index 687f916..88a574d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
@@ -40,7 +40,7 @@ import org.apache.logging.log4j.util.StringMap;
*/
@Plugin(name = "PropertiesRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class PropertiesRewritePolicy implements RewritePolicy {
-
+
/**
* Allows subclasses access to the status logger without creating another instance.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 060e7fa..6eb3e50 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -57,7 +57,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Initializes the policy.
- *
+ *
* @param aManager
* The RollingFileManager.
*/
@@ -91,7 +91,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Determines whether a rollover should occur.
- *
+ *
* @param event
* A reference to the currently event.
* @return true if a rollover should occur.
@@ -107,7 +107,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Creates a ScheduledTriggeringPolicy.
- *
+ *
* @param configuration
* the Configuration.
* @param evaluateOnStartup