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/29 22:54:26 UTC
[2/3] logging-log4j2 git commit: [LOG4J2-2493] Remove deprecated
code. A bit more to do.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index 06d219a..560a778 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -196,52 +196,6 @@ public class AsyncLoggerConfig extends LoggerConfig {
* Factory method to create a LoggerConfig.
*
* @param additivity True if additive, false otherwise.
- * @param levelName The Level to be associated with the Logger.
- * @param loggerName The name of the Logger.
- * @param includeLocation "true" if location should be passed downstream
- * @param refs An array of Appender names.
- * @param properties Properties to pass to the Logger.
- * @param config The Configuration.
- * @param filter A Filter.
- * @return A new LoggerConfig.
- * @deprecated use {@link #createLogger(boolean, Level, String, String, AppenderRef[], Property[], Configuration, Filter)}
- */
- @Deprecated
- public static LoggerConfig createLogger(
- final String additivity,
- final String levelName,
- final String loggerName,
- final String includeLocation,
- final AppenderRef[] refs,
- final Property[] properties,
- final Configuration config,
- final Filter filter) {
- if (loggerName == null) {
- LOGGER.error("Loggers cannot be configured without a name");
- return null;
- }
-
- final List<AppenderRef> appenderRefs = Arrays.asList(refs);
- Level level;
- try {
- level = Level.toLevel(levelName, Level.ERROR);
- } catch (final Exception ex) {
- LOGGER.error(
- "Invalid Log level specified: {}. Defaulting to Error",
- levelName);
- level = Level.ERROR;
- }
- final String name = loggerName.equals(LoggerConfig.ROOT) ? Strings.EMPTY : loggerName;
- final boolean additive = Booleans.parseBoolean(additivity, true);
-
- return new AsyncLoggerConfig(name, appenderRefs, filter, level,
- additive, properties, config, includeLocation(includeLocation));
- }
-
- /**
- * Factory method to create a LoggerConfig.
- *
- * @param additivity True if additive, false otherwise.
* @param level The Level to be associated with the Logger.
* @param loggerName The name of the Logger.
* @param includeLocation "true" if location should be passed downstream
@@ -279,32 +233,6 @@ public class AsyncLoggerConfig extends LoggerConfig {
public static class RootLogger extends LoggerConfig {
/**
- * @deprecated use {@link #createLogger(String, Level, String, AppenderRef[], Property[], Configuration, Filter)}
- */
- @Deprecated
- public static LoggerConfig createLogger(
- final String additivity,
- final String levelName,
- final String includeLocation,
- final AppenderRef[] refs,
- final Property[] properties,
- final Configuration config,
- final Filter filter) {
- final List<AppenderRef> appenderRefs = Arrays.asList(refs);
- Level level = null;
- try {
- level = Level.toLevel(levelName, Level.ERROR);
- } catch (final Exception ex) {
- LOGGER.error("Invalid Log level specified: {}. Defaulting to Error", levelName);
- level = Level.ERROR;
- }
- final boolean additive = Booleans.parseBoolean(additivity, true);
- return new AsyncLoggerConfig(LogManager.ROOT_LOGGER_NAME,
- appenderRefs, filter, level, additive, properties, config,
- AsyncLoggerConfig.includeLocation(includeLocation));
- }
-
- /**
* @since 3.0
*/
@PluginFactory
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1022f2d..9e4c2e3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.core.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -318,34 +317,6 @@ public class LoggerConfig extends AbstractFilterable {
}
/**
- * Returns an unmodifiable map with the configuration properties, or {@code null} if this {@code LoggerConfig} does
- * not have any configuration properties.
- * <p>
- * For each {@code Property} key in the map, the value is {@code true} if the property value has a variable that
- * needs to be substituted.
- *
- * @return an unmodifiable map with the configuration properties, or {@code null}
- * @see Configuration#getStrSubstitutor()
- * @see StrSubstitutor
- * @deprecated use {@link #getPropertyList()} instead
- */
- // LOG4J2-157
- @Deprecated
- public Map<Property, Boolean> getProperties() {
- if (properties == null) {
- return null;
- }
- if (propertiesMap == null) { // lazily initialize: only used by user custom code, not by Log4j any more
- final Map<Property, Boolean> result = new HashMap<>(properties.size() * 2);
- for (int i = 0; i < properties.size(); i++) {
- result.put(properties.get(i), Boolean.valueOf(properties.get(i).isValueNeedsLookup()));
- }
- propertiesMap = Collections.unmodifiableMap(result);
- }
- return propertiesMap;
- }
-
- /**
* Returns an unmodifiable list with the configuration properties, or {@code null} if this {@code LoggerConfig} does
* not have any configuration properties.
* <p>
@@ -473,44 +444,6 @@ public class LoggerConfig extends AbstractFilterable {
/**
* Factory method to create a LoggerConfig.
*
- * @param additivity True if additive, false otherwise.
- * @param level The Level to be associated with the Logger.
- * @param loggerName The name of the Logger.
- * @param includeLocation whether location should be passed downstream
- * @param refs An array of Appender names.
- * @param properties Properties to pass to the Logger.
- * @param config The Configuration.
- * @param filter A Filter.
- * @return A new LoggerConfig.
- * @deprecated Deprecated in 2.7; use {@link #createLogger(boolean, Level, String, String, AppenderRef[], Property[], Configuration, Filter)}
- */
- @Deprecated
- public static LoggerConfig createLogger(final String additivity,
- // @formatter:off
- final Level level,
- @PluginAttribute("name") final String loggerName,
- final String includeLocation,
- final AppenderRef[] refs,
- final Property[] properties,
- @PluginConfiguration final Configuration config,
- final Filter filter) {
- // @formatter:on
- if (loggerName == null) {
- LOGGER.error("Loggers cannot be configured without a name");
- return null;
- }
-
- final List<AppenderRef> appenderRefs = Arrays.asList(refs);
- final String name = loggerName.equals(ROOT) ? Strings.EMPTY : loggerName;
- final boolean additive = Booleans.parseBoolean(additivity, true);
-
- return new LoggerConfig(name, appenderRefs, filter, level, additive, properties, config,
- includeLocation(includeLocation, config));
- }
-
- /**
- * Factory method to create a LoggerConfig.
- *
* @param additivity true if additive, false otherwise.
* @param level The Level to be associated with the Logger.
* @param loggerName The name of the Logger.
@@ -540,14 +473,6 @@ public class LoggerConfig extends AbstractFilterable {
includeLocation(includeLocation, config));
}
- /**
- * @deprecated Please use {@link #includeLocation(String, Configuration)}
- */
- @Deprecated
- protected static boolean includeLocation(final String includeLocationConfigValue) {
- return includeLocation(includeLocationConfigValue, null);
- }
-
// Note: for asynchronous loggers, includeLocation default is FALSE,
// for synchronous loggers, includeLocation default is TRUE.
protected static boolean includeLocation(final String includeLocationConfigValue, final Configuration configuration) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index 06c8c1d..b842715 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -196,17 +196,6 @@ public class Log4jLogEvent implements LogEvent {
return this;
}
- @Deprecated
- public Builder setContextMap(final Map<String, String> contextMap) {
- contextData = ContextDataFactory.createContextData(); // replace with new instance
- if (contextMap != null) {
- for (final Map.Entry<String, String> entry : contextMap.entrySet()) {
- contextData.putValue(entry.getKey(), entry.getValue());
- }
- }
- return this;
- }
-
public Builder setContextData(final StringMap contextData) {
this.contextData = contextData;
return this;
@@ -290,32 +279,6 @@ public class Log4jLogEvent implements LogEvent {
}
/**
- *
- * @deprecated use {@link Log4jLogEvent.Builder} instead. This constructor will be removed in an upcoming release.
- */
- @Deprecated
- public Log4jLogEvent(final long timestamp) {
- this(Strings.EMPTY, null, Strings.EMPTY, null, null, (Throwable) null, null, null, null, 0, null,
- 0, null, timestamp, 0, nanoClock.nanoTime());
- }
-
- /**
- * Constructor.
- * @param loggerName The name of the Logger.
- * @param marker The Marker or null.
- * @param loggerFQCN The fully qualified class name of the caller.
- * @param level The logging Level.
- * @param message The Message.
- * @param t A Throwable or null.
- * @deprecated use {@link Log4jLogEvent.Builder} instead. This constructor will be removed in an upcoming release.
- */
- @Deprecated
- public Log4jLogEvent(final String loggerName, final Marker marker, final String loggerFQCN, final Level level,
- final Message message, final Throwable t) {
- this(loggerName, marker, loggerFQCN, level, message, null, t);
- }
-
- /**
* Constructor.
* @param loggerName The name of the Logger.
* @param marker The Marker or null.
@@ -339,59 +302,6 @@ public class Log4jLogEvent implements LogEvent {
}
/**
- * Constructor.
- * @param loggerName The name of the Logger.
- * @param marker The Marker or null.
- * @param loggerFQCN The fully qualified class name of the caller.
- * @param level The logging Level.
- * @param message The Message.
- * @param t A Throwable or null.
- * @param mdc The mapped diagnostic context.
- * @param ndc the nested diagnostic context.
- * @param threadName The name of the thread.
- * @param location The locations of the caller.
- * @param timestampMillis The timestamp of the event.
- * @deprecated use {@link Log4jLogEvent.Builder} instead. This constructor will be removed in an upcoming release.
- */
- @Deprecated
- public Log4jLogEvent(final String loggerName, final Marker marker, final String loggerFQCN, final Level level,
- final Message message, final Throwable t, final Map<String, String> mdc,
- final ThreadContext.ContextStack ndc, final String threadName,
- final StackTraceElement location, final long timestampMillis) {
- this(loggerName, marker, loggerFQCN, level, message, t, null, createContextData(mdc), ndc, 0,
- threadName, 0, location, timestampMillis, 0, nanoClock.nanoTime());
- }
-
- /**
- * Create a new LogEvent.
- * @param loggerName The name of the Logger.
- * @param marker The Marker or null.
- * @param loggerFQCN The fully qualified class name of the caller.
- * @param level The logging Level.
- * @param message The Message.
- * @param thrown A Throwable or null.
- * @param thrownProxy A ThrowableProxy or null.
- * @param mdc The mapped diagnostic context.
- * @param ndc the nested diagnostic context.
- * @param threadName The name of the thread.
- * @param location The locations of the caller.
- * @param timestamp The timestamp of the event.
- * @return a new LogEvent
- * @deprecated use {@link Log4jLogEvent.Builder} instead. This method will be removed in an upcoming release.
- */
- @Deprecated
- public static Log4jLogEvent createEvent(final String loggerName, final Marker marker, final String loggerFQCN,
- final Level level, final Message message, final Throwable thrown,
- final ThrowableProxy thrownProxy,
- final Map<String, String> mdc, final ThreadContext.ContextStack ndc,
- final String threadName, final StackTraceElement location,
- final long timestamp) {
- final Log4jLogEvent result = new Log4jLogEvent(loggerName, marker, loggerFQCN, level, message, thrown,
- thrownProxy, createContextData(mdc), ndc, 0, threadName, 0, location, timestamp, 0, nanoClock.nanoTime());
- return result;
- }
-
- /**
* Constructor.
* @param loggerName The name of the Logger.
* @param marker The Marker or null.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index c8bb1be..3f44749 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -114,20 +114,6 @@ public abstract class AbstractLayout<T extends Serializable> implements Layout<T
/**
* Constructs a layout with an optional header and footer.
*
- * @param header
- * The header to include when the stream is opened. May be null.
- * @param footer
- * The footer to add when the stream is closed. May be null.
- * @deprecated Use {@link #AbstractLayout(Configuration, byte[], byte[])}
- */
- @Deprecated
- public AbstractLayout(final byte[] header, final byte[] footer) {
- this(null, header, footer);
- }
-
- /**
- * Constructs a layout with an optional header and footer.
- *
* @param configuration
* The configuration
* @param header
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index 7f01f8e..3158fa1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -233,15 +233,6 @@ public final class GelfLayout extends AbstractStringLayout {
}
}
- /**
- * @deprecated Use {@link #newBuilder()} instead
- */
- @Deprecated
- public GelfLayout(final String host, final KeyValuePair[] additionalFields, final CompressionType compressionType,
- final int compressionThreshold, final boolean includeStacktrace) {
- this(null, host, additionalFields, compressionType, compressionThreshold, includeStacktrace, true, false);
- }
-
private GelfLayout(final Configuration config, final String host, final KeyValuePair[] additionalFields, final CompressionType compressionType,
final int compressionThreshold, final boolean includeStacktrace, final boolean includeThreadContext, final boolean includeNullDelimiter) {
super(config, StandardCharsets.UTF_8, null, null);
@@ -264,24 +255,6 @@ public final class GelfLayout extends AbstractStringLayout {
}
}
- /**
- * @deprecated Use {@link #newBuilder()} instead
- */
- @Deprecated
- public static GelfLayout createLayout(
- //@formatter:off
- @PluginAttribute("host") final String host,
- @PluginElement("AdditionalField") final KeyValuePair[] additionalFields,
- @PluginAttribute(value = "compressionType",
- defaultString = "GZIP") final CompressionType compressionType,
- @PluginAttribute(value = "compressionThreshold",
- defaultInt = COMPRESSION_THRESHOLD) final int compressionThreshold,
- @PluginAttribute(value = "includeStacktrace",
- defaultBoolean = true) final boolean includeStacktrace) {
- // @formatter:on
- return new GelfLayout(null, host, additionalFields, compressionType, compressionThreshold, includeStacktrace, true, false);
- }
-
@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/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 97fcc3b..0e01674 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -198,22 +198,6 @@ public final class SyslogLayout extends AbstractStringLayout {
}
/**
- * Creates a SyslogLayout.
- *
- * @param facility The Facility is used to try to classify the message.
- * @param includeNewLine If true a newline will be appended to the result.
- * @param escapeNL Pattern to use for replacing newlines.
- * @param charset The character set.
- * @return A SyslogLayout.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static SyslogLayout createLayout(final Facility facility, final boolean includeNewLine,
- final String escapeNL, final Charset charset) {
- return new SyslogLayout(facility, includeNewLine, escapeNL, charset);
- }
-
- /**
* Gets the facility.
*
* @return the facility
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index 2a4593d..296b4ea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -39,31 +39,6 @@ public class SslSocketManager extends TcpSocketManager {
private final SslConfiguration sslConfig;
/**
- *
- *
- * @param name The unique name of this connection.
- * @param os The OutputStream.
- * @param sock The Socket.
- * @param inetAddress The Internet address of the host.
- * @param host The name of the host.
- * @param port The port number on the host.
- * @param connectTimeoutMillis the connect timeout in milliseconds.
- * @param reconnectionDelayMillis Reconnection interval.
- * @param immediateFail
- * @param layout The Layout.
- * @param bufferSize The buffer size.
- * @deprecated Use {@link #SslSocketManager(String, OutputStream, Socket, SslConfiguration, InetAddress, String, int, int, int, boolean, Layout, int, SocketOptions)}.
- */
- @Deprecated
- public SslSocketManager(final String name, final OutputStream os, final Socket sock,
- final SslConfiguration sslConfig, final InetAddress inetAddress, final String host, final int port,
- final int connectTimeoutMillis, final int reconnectionDelayMillis, final boolean immediateFail,
- final Layout<? extends Serializable> layout, final int bufferSize) {
- super(name, os, sock, inetAddress, host, port, connectTimeoutMillis, reconnectionDelayMillis, immediateFail, layout, bufferSize, null);
- this.sslConfig = sslConfig;
- }
-
- /**
*
*
* @param name The unique name of this connection.
@@ -106,16 +81,6 @@ public class SslSocketManager extends TcpSocketManager {
}
}
- /**
- * @deprecated Use {@link SslSocketManager#getSocketManager(SslConfiguration, String, int, int, int, boolean, Layout, int, SocketOptions)}.
- */
- @Deprecated
- public static SslSocketManager getSocketManager(final SslConfiguration sslConfig, final String host, final int port,
- final int connectTimeoutMillis, final int reconnectDelayMillis, final boolean immediateFail,
- final Layout<? extends Serializable> layout, final int bufferSize) {
- return getSocketManager(sslConfig, host, port, connectTimeoutMillis, reconnectDelayMillis, immediateFail, layout, bufferSize, null);
- }
-
public static SslSocketManager getSocketManager(final SslConfiguration sslConfig, final String host, int port,
final int connectTimeoutMillis, int reconnectDelayMillis, final boolean immediateFail,
final Layout<? extends Serializable> layout, final int bufferSize, final SocketOptions socketOptions) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index f5b971d..d30d7de 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -91,43 +91,6 @@ public class TcpSocketManager extends AbstractSocketManager {
* The Layout.
* @param bufferSize
* The buffer size.
- * @deprecated Use
- * {@link TcpSocketManager#TcpSocketManager(String, OutputStream, Socket, InetAddress, String, int, int, int, boolean, Layout, int, SocketOptions)}.
- */
- @Deprecated
- public TcpSocketManager(final String name, final OutputStream os, final Socket socket,
- final InetAddress inetAddress, final String host, final int port, final int connectTimeoutMillis,
- final int reconnectionDelayMillis, final boolean immediateFail, final Layout<? extends Serializable> layout,
- final int bufferSize) {
- this(name, os, socket, inetAddress, host, port, connectTimeoutMillis, reconnectionDelayMillis, immediateFail,
- layout, bufferSize, null);
- }
-
- /**
- * Constructs.
- *
- * @param name
- * The unique name of this connection.
- * @param os
- * The OutputStream.
- * @param socket
- * The Socket.
- * @param inetAddress
- * The Internet address of the host.
- * @param host
- * The name of the host.
- * @param port
- * The port number on the host.
- * @param connectTimeoutMillis
- * the connect timeout in milliseconds.
- * @param reconnectionDelayMillis
- * Reconnection interval.
- * @param immediateFail
- * True if the write should fail if no socket is immediately available.
- * @param layout
- * The Layout.
- * @param bufferSize
- * The buffer size.
*/
public TcpSocketManager(final String name, final OutputStream os, final Socket socket,
final InetAddress inetAddress, final String host, final int port, final int connectTimeoutMillis,
@@ -160,30 +123,6 @@ public class TcpSocketManager extends AbstractSocketManager {
* @param bufferSize
* The buffer size.
* @return A TcpSocketManager.
- * @deprecated Use {@link #getSocketManager(String, int, int, int, boolean, Layout, int, SocketOptions)}.
- */
- @Deprecated
- public static TcpSocketManager getSocketManager(final String host, final int port, final int connectTimeoutMillis,
- final int reconnectDelayMillis, final boolean immediateFail, final Layout<? extends Serializable> layout,
- final int bufferSize) {
- return getSocketManager(host, port, connectTimeoutMillis, reconnectDelayMillis, immediateFail, layout,
- bufferSize, null);
- }
-
- /**
- * Obtains a TcpSocketManager.
- *
- * @param host
- * The host to connect to.
- * @param port
- * The port on the host.
- * @param connectTimeoutMillis
- * the connect timeout in milliseconds
- * @param reconnectDelayMillis
- * The interval to pause between retries.
- * @param bufferSize
- * The buffer size.
- * @return A TcpSocketManager.
*/
public static TcpSocketManager getSocketManager(final String host, int port, final int connectTimeoutMillis,
int reconnectDelayMillis, final boolean immediateFail, final Layout<? extends Serializable> layout,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index 5855026..511fd56 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -42,24 +42,6 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
this.keyStore = this.load();
}
- /**
- * @deprecated Use {@link #AbstractKeyStoreConfiguration(String, PasswordProvider, String)} instead
- */
- @Deprecated
- public AbstractKeyStoreConfiguration(final String location, final char[] password, final String keyStoreType)
- throws StoreConfigurationException {
- this(location, new MemoryPasswordProvider(password), keyStoreType);
- }
-
- /**
- * @deprecated Use {@link #AbstractKeyStoreConfiguration(String, PasswordProvider, String)} instead
- */
- @Deprecated
- public AbstractKeyStoreConfiguration(final String location, final String password, final String keyStoreType)
- throws StoreConfigurationException {
- this(location, new MemoryPasswordProvider(password == null ? null : password.toCharArray()), keyStoreType);
- }
-
@Override
protected KeyStore load() throws StoreConfigurationException {
final String loadLocation = this.getLocation();
@@ -70,7 +52,7 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
}
try (final InputStream fin = openInputStream(loadLocation)) {
final KeyStore ks = KeyStore.getInstance(this.keyStoreType);
- char[] password = this.getPasswordAsCharArray();
+ char[] password = this.getPassword();
try {
ks.load(fin, password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index 0c9e3ce..dfc3750 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -123,50 +123,10 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
}
}
- /**
- * @deprecated use {@link #createKeyStoreConfiguration(String, char[], String, String, String, String)}
- */
- @Deprecated
- public static KeyStoreConfiguration createKeyStoreConfiguration(
- // @formatter:off
- final String location,
- final char[] password,
- final String keyStoreType,
- final String keyManagerFactoryAlgorithm) throws StoreConfigurationException {
- // @formatter:on
- return createKeyStoreConfiguration(location, password, null, null, keyStoreType, keyManagerFactoryAlgorithm);
- }
-
- /**
- * Creates a KeyStoreConfiguration.
- *
- * @param location The location of the KeyStore, a file path, URL or resource.
- * @param password The password to access the KeyStore.
- * @param keyStoreType The KeyStore type, null defaults to {@code "JKS"}.
- * @param keyManagerFactoryAlgorithm The standard name of the requested algorithm. See the Java Secure Socket
- * Extension Reference Guide for information about these names.
- * @return a new KeyStoreConfiguration
- * @throws StoreConfigurationException Thrown if this call cannot load the KeyStore.
- * @deprecated Use createKeyStoreConfiguration(String, char[], String, String)
- */
- @Deprecated
- public static KeyStoreConfiguration createKeyStoreConfiguration(
- // @formatter:off
- final String location,
- final String password,
- final String keyStoreType,
- final String keyManagerFactoryAlgorithm) throws StoreConfigurationException {
- // @formatter:on
- return createKeyStoreConfiguration(location,
- (password == null ? null : password.toCharArray()),
- keyStoreType,
- keyManagerFactoryAlgorithm);
- }
-
public KeyManagerFactory initKeyManagerFactory() throws NoSuchAlgorithmException, UnrecoverableKeyException,
KeyStoreException {
final KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(this.keyManagerFactoryAlgorithm);
- char[] password = this.getPasswordAsCharArray();
+ char[] password = this.getPassword();
try {
kmFactory.init(this.getKeyStore(), password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
index 9bdeaf5..d1462f1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
@@ -36,22 +36,6 @@ public class StoreConfiguration<T> {
}
/**
- * @deprecated Use {@link #StoreConfiguration(String, PasswordProvider)}
- */
- @Deprecated
- public StoreConfiguration(final String location, final char[] password) {
- this(location, new MemoryPasswordProvider(password));
- }
-
- /**
- * @deprecated Use {@link #StoreConfiguration(String, PasswordProvider)}
- */
- @Deprecated
- public StoreConfiguration(final String location, final String password) {
- this(location, new MemoryPasswordProvider(password == null ? null : password.toCharArray()));
- }
-
- /**
* Clears the secret fields in this object.
*/
public void clearSecrets() {
@@ -67,16 +51,7 @@ public class StoreConfiguration<T> {
this.location = location;
}
- /**
- *
- * @deprecated Use getPasswordAsCharArray()
- */
- @Deprecated
- public String getPassword() {
- return String.valueOf(this.passwordProvider.getPassword());
- }
-
- public char[] getPasswordAsCharArray() {
+ public char[] getPassword() {
return this.passwordProvider.getPassword();
}
@@ -85,15 +60,6 @@ public class StoreConfiguration<T> {
}
/**
- *
- * @deprecated Use getPasswordAsCharArray()
- */
- @Deprecated
- public void setPassword(final String password) {
- this.passwordProvider = new MemoryPasswordProvider(password == null ? null : password.toCharArray());
- }
-
- /**
* @throws StoreConfigurationException May be thrown by subclasses
*/
protected T load() throws StoreConfigurationException {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index b5c282b..d386b61 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -57,16 +57,6 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
/**
- * @deprecated Use {@link #TrustStoreConfiguration(String, PasswordProvider, String, String)} instead
- */
- @Deprecated
- public TrustStoreConfiguration(final String location, final String password, final String keyStoreType,
- final String trustManagerFactoryAlgorithm) throws StoreConfigurationException {
- this(location, new MemoryPasswordProvider(password == null ? null : password.toCharArray()), keyStoreType,
- trustManagerFactoryAlgorithm);
- }
-
- /**
* Creates a KeyStoreConfiguration.
*
* @param location
@@ -112,44 +102,6 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
}
- /**
- * @deprecated Use {@link #createKeyStoreConfiguration(String, char[], String, String, String, String)}
- */
- @Deprecated
- public static TrustStoreConfiguration createKeyStoreConfiguration(
- // @formatter:off
- final String location,
- final char[] password,
- final String keyStoreType,
- final String trustManagerFactoryAlgorithm) throws StoreConfigurationException {
- // @formatter:on
- return createKeyStoreConfiguration(location, password, null, null, keyStoreType, trustManagerFactoryAlgorithm);
- }
-
- /**
- * Creates a KeyStoreConfiguration.
- *
- * @param location The location of the KeyStore, a file path, URL or resource.
- * @param password The password to access the KeyStore.
- * @param keyStoreType The KeyStore type, null defaults to {@code "JKS"}.
- * @param trustManagerFactoryAlgorithm The standard name of the requested trust management algorithm. See the Java
- * Secure Socket Extension Reference Guide for information these names.
- * @return a new TrustStoreConfiguration
- * @throws StoreConfigurationException Thrown if this instance cannot load the KeyStore.
- * @deprecated Use createKeyStoreConfiguration(String, char[], String, String)
- */
- @Deprecated
- public static TrustStoreConfiguration createKeyStoreConfiguration(
- // @formatter:off
- final String location,
- final String password,
- final String keyStoreType,
- final String trustManagerFactoryAlgorithm) throws StoreConfigurationException {
- // @formatter:on
- return createKeyStoreConfiguration(location, (password == null ? null : password.toCharArray()),
- null, null, keyStoreType, trustManagerFactoryAlgorithm);
- }
-
public TrustManagerFactory initTrustManagerFactory() throws NoSuchAlgorithmException, KeyStoreException {
final TrustManagerFactory tmFactory = TrustManagerFactory.getInstance(this.trustManagerFactoryAlgorithm);
tmFactory.init(this.getKeyStore());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
index 0798fcd..2e2a12e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
@@ -519,21 +519,6 @@ public class FastDatePrinter implements DatePrinter, Serializable {
}
/**
- * Performs the formatting by applying the rules to the
- * specified calendar.
- *
- * @param calendar the calendar to format
- * @param buf the buffer to format into
- * @return the specified string buffer
- *
- * @deprecated use {@link #format(Calendar)} or {@link #format(Calendar, Appendable)}
- */
- @Deprecated
- protected StringBuffer applyRules(final Calendar calendar, final StringBuffer buf) {
- return (StringBuffer) applyRules(calendar, (Appendable)buf);
- }
-
- /**
* <p>Performs the formatting by applying the rules to the
* specified calendar.</p>
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Clock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Clock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Clock.java
deleted file mode 100644
index 15d6f65..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Clock.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.util;
-
-/**
- * @deprecated Use {@link org.apache.logging.log4j.core.time.Clock} instead
- * @see org.apache.logging.log4j.core.time.Clock
- */
-@Deprecated
-public interface Clock extends org.apache.logging.log4j.core.time.Clock {
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
deleted file mode 100644
index 9ef4dbd..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.logging.log4j.core.time.Clock;
-
-/**
- * @deprecated Use {@link org.apache.logging.log4j.core.time.ClockFactory} instead.
- */
-@Deprecated
-public final class ClockFactory {
-
- /** @see org.apache.logging.log4j.core.time.ClockFactory#PROPERTY_NAME */
- @Deprecated
- public static final String PROPERTY_NAME = org.apache.logging.log4j.core.time.ClockFactory.PROPERTY_NAME;
-
- private ClockFactory() {}
-
- /** @see org.apache.logging.log4j.core.time.ClockFactory#getClock() */
- @Deprecated
- public static Clock getClock() {
- return org.apache.logging.log4j.core.time.ClockFactory.getClock();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClock.java
deleted file mode 100644
index a0afda6..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClock.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.util;
-
-/**
- * @deprecated Use {@link org.apache.logging.log4j.core.time.NanoClock} instead
- * @see org.apache.logging.log4j.core.time.NanoClock
- */
-@Deprecated
-public interface NanoClock extends org.apache.logging.log4j.core.time.NanoClock {
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
index 7403215..85dd4e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
@@ -34,12 +34,6 @@ public class NullOutputStream extends OutputStream {
private static final NullOutputStream INSTANCE = new NullOutputStream();
/**
- * @deprecated Deprecated in 2.7: use {@link #getInstance()}.
- */
- @Deprecated
- public static final NullOutputStream NULL_OUTPUT_STREAM = INSTANCE;
-
- /**
* Gets the singleton instance.
*
* @return the singleton instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
deleted file mode 100644
index d4ce19b..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.logging.log4j.core.time.NanoClock;
-
-/**
- * @deprecated Use {@link org.apache.logging.log4j.core.time.SystemNanoClock} instead.
- */
-@Deprecated
-public final class SystemNanoClock implements NanoClock {
-
- /**
- * @see org.apache.logging.log4j.core.time.SystemNanoClock#nanoTime()
- * @deprecated use {@link org.apache.logging.log4j.core.time.SystemNanoClock} instead.
- */
- @Deprecated
- @Override
- public long nanoTime() {
- return System.nanoTime();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java
index ae567a0..57e69db 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java
@@ -23,6 +23,7 @@ import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import org.apache.logging.log4j.core.net.Facility;
+import org.apache.logging.log4j.core.net.Protocol;
import org.apache.logging.log4j.core.net.mock.MockSyslogServerFactory;
import org.apache.logging.log4j.core.net.ssl.KeyStoreConfiguration;
import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
@@ -31,6 +32,7 @@ import org.apache.logging.log4j.core.net.ssl.TestConstants;
import org.apache.logging.log4j.core.net.ssl.TlsSyslogMessageFormat;
import org.apache.logging.log4j.core.net.ssl.TlsSyslogTestUtil;
import org.apache.logging.log4j.core.net.ssl.TrustStoreConfiguration;
+import org.apache.logging.log4j.util.EnglishEnums;
import org.junit.Test;
public class TlsSyslogAppenderTest extends SyslogAppenderTest {
@@ -92,10 +94,43 @@ public class TlsSyslogAppenderTest extends SyslogAppenderTest {
} else {
format = "RFC5424";
}
-
- return SyslogAppender.createAppender("localhost", PORTNUM, "SSL", sslConfiguration, 0, -1, true, "Test", true,
- false, Facility.LOCAL0, "Audit", 18060, true, "RequestContext", null, null, includeNewLine, null,
- "TestApp", "Test", null, "ipAddress,loginId", null, format, null, null, null, null, null, false);
+ final SslConfiguration sslConfiguration1 = sslConfiguration;
+ final boolean newLine = includeNewLine;
+ final String format1 = format;
+
+ // @formatter:off
+ return SyslogAppender.newSyslogAppenderBuilder()
+ .setHost("localhost")
+ .setPort(PORTNUM)
+ .setProtocol(EnglishEnums.valueOf(Protocol.class, "SSL"))
+ .setSslConfiguration(sslConfiguration1)
+ .setConnectTimeoutMillis(0)
+ .setReconnectDelayMillis(-1)
+ .setImmediateFail(true)
+ .setName("TestApp")
+ .setImmediateFlush(true)
+ .setIgnoreExceptions(false).setFilter(null)
+ .setConfiguration(null)
+ .setAdvertise(false)
+ .setFacility(Facility.LOCAL0)
+ .setId("Audit")
+ .setEnterpriseNumber(18060)
+ .setIncludeMdc(true)
+ .setMdcId("RequestContext")
+ .setMdcPrefix(null)
+ .setEventPrefix(null)
+ .setNewLine(newLine)
+ .setAppName("TestApp")
+ .setMsgId("Test")
+ .setExcludes(null)
+ .setIncludeMdc(true)
+ .setRequired(null)
+ .setFormat(format1)
+ .setCharsetName(null)
+ .setExceptionPattern(null)
+ .setLoggerFields(null)
+ .build();
+ // @formatter:on
}
private void initTlsTestEnvironment(final int numberOfMessages, final TlsSyslogMessageFormat messageFormat) throws IOException {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
index 932724d..a7e0b1a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
@@ -239,12 +239,6 @@ public class AbstractDatabaseManagerTest {
// noop
}
- @Deprecated
- @Override
- protected void writeInternal(final LogEvent event) {
- // noop
- }
-
@Override
protected void writeInternal(LogEvent event, Serializable serializable) {
// noop
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppenderTest.java
index 6ab9419..24e01ac 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppenderTest.java
@@ -31,14 +31,14 @@ public class NoSqlAppenderTest {
@Test
public void testNoProvider() {
- final NoSqlAppender appender = NoSqlAppender.createAppender("myName01", null, null, null, null);
+ final NoSqlAppender appender = NoSqlAppender.newBuilder().setName("myName01").build();
assertNull("The appender should be null.", appender);
}
@Test
public void testProvider() {
- final NoSqlAppender appender = NoSqlAppender.createAppender("myName01", null, null, null, provider);
+ final NoSqlAppender appender = NoSqlAppender.newBuilder().setName("myName01").setProvider(provider).build();
assertNotNull("The appender should not be null.", appender);
assertEquals("The toString value is not correct.",
@@ -50,12 +50,14 @@ public class NoSqlAppenderTest {
@Test
public void testProviderBuffer() {
- final NoSqlAppender appender = NoSqlAppender.createAppender("anotherName02", null, null, "25", provider);
+ final NoSqlAppender appender = NoSqlAppender.newBuilder().setName("anotherName02").setProvider(provider)
+ .setBufferSize(25).build();
assertNotNull("The appender should not be null.", appender);
assertEquals("The toString value is not correct.",
"anotherName02{ manager=noSqlManager{ description=anotherName02, bufferSize=25, provider=" + provider
- + " } }", appender.toString());
+ + " } }",
+ appender.toString());
appender.stop();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
index 9fed4bc..04085ae 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
@@ -29,12 +29,12 @@ import org.junit.Test;
public class CronTriggeringPolicyTest {
private static final String CRON_EXPRESSION = "0 0 0 * * ?";
-
+
private NullConfiguration configuration;
- // TODO Need a CleanRegexFiles("testcmd.\\.log\\..*");
- //@Rule
- //public CleanFiles cleanFiles = new CleanFiles("testcmd1.log", "testcmd2.log", "testcmd3.log");
+ // TODO Need a CleanRegexFiles("testcmd.\\.log\\..*");
+ // @Rule
+ // public CleanFiles cleanFiles = new CleanFiles("testcmd1.log", "testcmd2.log", "testcmd3.log");
@Before
public void before() {
@@ -46,7 +46,8 @@ public class CronTriggeringPolicyTest {
}
private DefaultRolloverStrategy createStrategy() {
- return DefaultRolloverStrategy.createStrategy("7", "1", "max", null, null, false, configuration);
+ return DefaultRolloverStrategy.newBuilder().setMax("7").setMin("1").setFileIndex("max")
+ .setStopCustomActionsOnError(false).setConfig(configuration).build();
}
private void testBuilder() {
@@ -98,7 +99,6 @@ public class CronTriggeringPolicyTest {
// @formatter:on
}
-
/**
* Tests LOG4J2-1474 CronTriggeringPolicy raise exception and fail to rollover log file when evaluateOnStartup is
* true.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
index f40e99b..9e36a62 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
/**
* Tests {@link OnStartupTriggeringPolicy}.
*/
-//@Ignore
+// @Ignore
public class OnStartupTriggeringPolicyTest {
private static final String TARGET_FOLDER = "target/rollOnStartup";
@@ -74,11 +74,11 @@ public class OnStartupTriggeringPolicyTest {
Assert.assertTrue(target.toFile().setLastModified(timeStamp));
final PatternLayout layout = PatternLayout.newBuilder().setPattern("%msg").setConfiguration(configuration)
.build();
- final RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true,
- configuration);
+ final RolloverStrategy strategy = DefaultRolloverStrategy.newBuilder().setCompressionLevelStr("0")
+ .setStopCustomActionsOnError(true).setConfig(configuration).build();
final OnStartupTriggeringPolicy policy = OnStartupTriggeringPolicy.createPolicy(1);
- try (final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false,
- policy, strategy, null, layout, 8192, true, false, null, null, null, configuration)) {
+ try (final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true,
+ false, policy, strategy, null, layout, 8192, true, false, null, null, null, configuration)) {
manager.initialize();
final String files = Arrays.toString(new File(TARGET_FOLDER).listFiles());
assertTrue(target.toString() + ", files = " + files, Files.exists(target));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
index a63817e..4a1e9dc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
@@ -66,9 +66,15 @@ public class RollingFileAppenderAccessTest {
final Configuration config = ctx.getConfiguration();
final File file = File.createTempFile("RollingFileAppenderAccessTest", ".tmp");
file.deleteOnExit();
- final RollingFileAppender appender = RollingFileAppender.createAppender(file.getCanonicalPath(),
- "FilePattern", null, "Name", null, null, null, OnStartupTriggeringPolicy.createPolicy(1), null,
- null, null, null, null, null, config);
+ // @formatter:off
+ final RollingFileAppender appender = RollingFileAppender.newBuilder()
+ .setFileName(file.getCanonicalPath())
+ .setFilePattern("FilePattern")
+ .setName("Name")
+ .setPolicy(OnStartupTriggeringPolicy.createPolicy(1))
+ .setConfiguration(config)
+ .build();
+ // @formatter:on
final RollingFileManager manager = appender.getManager();
// Since the RolloverStrategy and TriggeringPolicy are immutable, we could also use generics to type their
// access.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java
index aaf3fa6..a11365e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java
@@ -16,10 +16,15 @@
*/
package org.apache.logging.log4j.core.async;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.categories.AsyncLoggers;
@@ -32,8 +37,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
-
@Category(AsyncLoggers.class)
public class AsyncLoggerConfigTest {
@@ -70,13 +73,13 @@ public class AsyncLoggerConfigTest {
public void testIncludeLocationDefaultsToFalse() {
final LoggerConfig rootLoggerConfig =
AsyncLoggerConfig.RootLogger.createLogger(
- null, "INFO", null, new AppenderRef[0], null, new DefaultConfiguration(), null);
+ null, Level.INFO, null, new AppenderRef[0], null, new DefaultConfiguration(), null);
assertFalse("Include location should default to false for async logggers",
rootLoggerConfig.isIncludeLocation());
final LoggerConfig loggerConfig =
AsyncLoggerConfig.createLogger(
- null, "INFO", "com.foo.Bar", null, new AppenderRef[0], null, new DefaultConfiguration(),
+ false, Level.INFO, "com.foo.Bar", null, new AppenderRef[0], null, new DefaultConfiguration(),
null);
assertFalse("Include location should default to false for async logggers",
loggerConfig.isIncludeLocation());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
index 65e73fe..a9fa588 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
@@ -99,13 +99,26 @@ public class JiraLog4j2_2134Test {
final Configuration config = ctx.getConfiguration();
PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null,
null, false, false, null, null);
- Appender appender = FileAppender.createAppender("target/test.log", "false", "false", "File", "true", "false",
- "false", "4000", layout, null, "false", null, config);
+ // @formatter:off
+ Appender appender = FileAppender.newBuilder()
+ .setFileName("target/test.log")
+ .setAppend(false)
+ .setLocking(false)
+ .setName("File")
+ .setImmediateFlush(true)
+ .setIgnoreExceptions(false)
+ .setBufferedIo(false)
+ .setBufferSize(4000)
+ .setLayout(layout)
+ .setAdvertise(false)
+ .setConfiguration(config)
+ .build();
+ // @formatter:on
appender.start();
config.addAppender(appender);
AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
AppenderRef[] refs = new AppenderRef[] { ref };
- LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.INFO, "testlog4j2refresh", "true", refs,
+ LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.INFO, "testlog4j2refresh", "true", refs,
null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger("testlog4j2refresh", loggerConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
index a7cceff..30de999 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
@@ -46,7 +46,6 @@ public class LoggerConfigTest {
@Test
public void testPropertiesWithoutSubstitution() {
assertNull("null propertiesList", createForProperties(null).getPropertyList());
- assertNull("null property Map", createForProperties(null).getProperties());
final Property[] all = new Property[] {
Property.createProperty("key1", "value1"),
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
index 4489564..ebc8209 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
@@ -242,22 +242,14 @@ public class Log4jLogEventTest {
verifyNanoTimeWithAllConstructors(87654);
}
- @SuppressWarnings("deprecation")
private void verifyNanoTimeWithAllConstructors(final long expected) {
assertEquals(expected, Log4jLogEvent.getNanoClock().nanoTime());
assertEquals("No-arg constructor", expected, new Log4jLogEvent().getNanoTime());
- assertEquals("1-arg constructor", expected, new Log4jLogEvent(98).getNanoTime());
- assertEquals("6-arg constructor", expected, new Log4jLogEvent("l", null, "a", null, null, null).getNanoTime());
assertEquals("7-arg constructor", expected, new Log4jLogEvent("l", null, "a", null, null, null, null)
.getNanoTime());
- assertEquals("11-arg constructor", expected, new Log4jLogEvent("l", null, "a", null, null, null, null, null,
- null, null, 0).getNanoTime());
- assertEquals("12-arg factory method", expected, Log4jLogEvent.createEvent("l", null, "a", null, null, null,
- null, null, null, null, null, 0).getNanoTime());
}
- @SuppressWarnings("deprecation")
@Test
public void testBuilderCorrectlyCopiesAllEventAttributes() {
final StringMap contextData = ContextDataFactory.createContextData();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java
----------------------------------------------------------------------
diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java
index 424020a..e47a866 100644
--- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java
+++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ColumnConfig.java
@@ -86,36 +86,6 @@ public final class ColumnConfig {
+ ", timestamp=" + this.eventTimestamp + " }";
}
- /**
- * Factory method for creating a column config within the plugin manager.
- *
- * @see Builder
- * @deprecated use {@link #newBuilder()}
- */
- @Deprecated
- public static ColumnConfig createColumnConfig(final Configuration config, final String name, final String pattern,
- final String literalValue, final String eventTimestamp,
- final String unicode, final String clob) {
- if (Strings.isEmpty(name)) {
- LOGGER.error("The column config is not valid because it does not contain a column name.");
- return null;
- }
-
- final boolean isEventTimestamp = Boolean.parseBoolean(eventTimestamp);
- final boolean isUnicode = Booleans.parseBoolean(unicode, true);
- final boolean isClob = Boolean.parseBoolean(clob);
-
- return newBuilder()
- .setConfiguration(config)
- .setName(name)
- .setPattern(pattern)
- .setLiteral(literalValue)
- .setEventTimestamp(isEventTimestamp)
- .setUnicode(isUnicode)
- .setClob(isClob)
- .build();
- }
-
@PluginBuilderFactory
public static Builder newBuilder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java
----------------------------------------------------------------------
diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java
index 418af37..9b682a5 100644
--- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java
+++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcAppender.java
@@ -65,36 +65,6 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
return this.description;
}
- /**
- * Factory method for creating a JDBC appender within the plugin manager.
- *
- * @see Builder
- * @deprecated use {@link #newBuilder()}
- */
- @Deprecated
- public static <B extends Builder<B>> JdbcAppender createAppender(final String name, final String ignore,
- final Filter filter,
- final ConnectionSource connectionSource,
- final String bufferSize, final String tableName,
- final ColumnConfig[] columnConfigs) {
- Assert.requireNonEmpty(name, "Name cannot be empty");
- Objects.requireNonNull(connectionSource, "ConnectionSource cannot be null");
- Assert.requireNonEmpty(tableName, "Table name cannot be empty");
- Assert.requireNonEmpty(columnConfigs, "ColumnConfigs cannot be empty");
-
- final int bufferSizeInt = AbstractAppender.parseInt(bufferSize, 0);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
-
- return JdbcAppender.<B>newBuilder()
- .setBufferSize(bufferSizeInt)
- .setColumnConfigs(columnConfigs)
- .setConnectionSource(connectionSource)
- .setTableName(tableName)
- .setName(name)
- .setIgnoreExceptions(ignoreExceptions).setFilter(filter)
- .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/0c1ad7cc/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
index e11f831..d8a15f6 100644
--- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
+++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/JdbcDatabaseManager.java
@@ -116,12 +116,6 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
return sqlStatement;
}
- @Deprecated
- @Override
- protected void writeInternal(final LogEvent event) {
- writeInternal(event, null);
- }
-
private void setFields(final MapMessage<?, ?> mapMessage) throws SQLException {
final IndexedReadOnlyStringMap map = mapMessage.getIndexedReadOnlyStringMap();
final String simpleName = statement.getClass().getName();
@@ -266,60 +260,6 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
* The name of the manager, which should include connection details and hashed passwords where possible.
* @param bufferSize
* The size of the log event buffer.
- * @param connectionSource
- * The source for connections to the database.
- * @param tableName
- * The name of the database table to insert log events into.
- * @param columnConfigs
- * Configuration information about the log table columns.
- * @return a new or existing JDBC manager as applicable.
- * @deprecated use
- * {@link #getManager(String, int, Layout, ConnectionSource, String, ColumnConfig[], ColumnMapping[])}
- */
- @Deprecated
- public static JdbcDatabaseManager getJDBCDatabaseManager(final String name, final int bufferSize,
- final ConnectionSource connectionSource, final String tableName, final ColumnConfig[] columnConfigs) {
-
- return getManager(name,
- new FactoryData(bufferSize, null, connectionSource, tableName, columnConfigs, new ColumnMapping[0]),
- getFactory());
- }
-
- /**
- * Creates a JDBC manager for use within the {@link JdbcAppender}, or returns a suitable one if it already exists.
- *
- * @param name
- * The name of the manager, which should include connection details and hashed passwords where possible.
- * @param bufferSize
- * The size of the log event buffer.
- * @param connectionSource
- * The source for connections to the database.
- * @param tableName
- * The name of the database table to insert log events into.
- * @param columnConfigs
- * Configuration information about the log table columns.
- * @param columnMappings
- * column mapping configuration (including type conversion).
- * @return a new or existing JDBC manager as applicable.
- * @deprecated use
- * {@link #getManager(String, int, Layout, ConnectionSource, String, ColumnConfig[], ColumnMapping[])}
- */
- @Deprecated
- public static JdbcDatabaseManager getManager(final String name, final int bufferSize,
- final ConnectionSource connectionSource, final String tableName, final ColumnConfig[] columnConfigs,
- final ColumnMapping[] columnMappings) {
- return getManager(name,
- new FactoryData(bufferSize, null, connectionSource, tableName, columnConfigs, columnMappings),
- getFactory());
- }
-
- /**
- * Creates a JDBC manager for use within the {@link JdbcAppender}, or returns a suitable one if it already exists.
- *
- * @param name
- * The name of the manager, which should include connection details and hashed passwords where possible.
- * @param bufferSize
- * The size of the log event buffer.
* @param layout
* The Appender-level layout
* @param connectionSource
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
index fb21f80..ff75cf0 100644
--- a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
+++ b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
@@ -183,18 +183,6 @@ public class JmsAppender extends AbstractAppender {
return this;
}
- /**
- * Sets the Password.
- * @param password The new password.
- * @deprecated Use setPassword(char[])
- * @return the Builder.
- */
- @Deprecated
- public Builder setPassword(final String password) {
- this.password = password == null ? null : password.toCharArray();
- return this;
- }
-
public Builder setProviderUrl(final String providerUrl) {
this.providerUrl = providerUrl;
return this;
@@ -220,18 +208,6 @@ public class JmsAppender extends AbstractAppender {
return this;
}
- /**
- * Sets the user name.
- * @param username The user's name.
- * @deprecated Use {@link #setUserName(String)}.
- * @return the Builder.
- */
- @Deprecated
- public Builder setUsername(final String username) {
- this.userName = username;
- return this;
- }
-
public Builder setUserName(final String userName) {
this.userName = userName;
return this;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaDatabaseManager.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaDatabaseManager.java
index fda26af..bc07491 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaDatabaseManager.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaDatabaseManager.java
@@ -84,12 +84,6 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
}
}
- @Deprecated
- @Override
- protected void writeInternal(final LogEvent event) {
- writeInternal(event, null);
- }
-
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager == null
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
index b5c9939..8122fa3 100644
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
@@ -91,26 +91,6 @@ public final class KafkaAppender extends AbstractAppender {
}
}
- @Deprecated
- public static KafkaAppender createAppender(
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final String name,
- final boolean ignoreExceptions,
- final String topic,
- final Property[] properties,
- final Configuration configuration,
- final String key) {
-
- if (layout == null) {
- AbstractLifeCycle.LOGGER.error("No layout provided for KafkaAppender");
- return null;
- }
- final KafkaManager kafkaManager =
- new KafkaManager(configuration.getLoggerContext(), name, topic, true, properties, key);
- return new KafkaAppender(name, layout, filter, ignoreExceptions, kafkaManager);
- }
-
/**
* Creates a builder for a KafkaAppender.
* @return a builder for a KafkaAppender.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout/JsonLayout.java b/log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout/JsonLayout.java
index 224cfb4..3eb70c6 100644
--- a/log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout/JsonLayout.java
+++ b/log4j-layout-jackson-json/src/main/java/org/apache/logging/log4j/jackson/json/layout/JsonLayout.java
@@ -170,77 +170,11 @@ public final class JsonLayout extends AbstractJacksonLayout {
DEFAULT_HEADER, DEFAULT_FOOTER, StandardCharsets.UTF_8, true, false, false, null, false);
}
- /**
- * Creates a JSON Layout.
- * @param config
- * The plugin configuration.
- * @param locationInfo
- * If "true", includes the location information in the generated JSON.
- * @param properties
- * If "true", includes the thread context map in the generated JSON.
- * @param propertiesAsList
- * If true, the thread context map is included as a list of map entry objects, where each entry has
- * a "key" attribute (whose value is the key) and a "value" attribute (whose value is the value).
- * Defaults to false, in which case the thread context map is included as a simple map of key-value
- * pairs.
- * @param complete
- * If "true", includes the JSON header and footer, and comma between records.
- * @param compact
- * If "true", does not use end-of-lines and indentation, defaults to "false".
- * @param eventEol
- * If "true", forces an EOL after each log event (even if compact is "true"), defaults to "false". This
- * allows one even per line, even in compact mode.
- * @param headerPattern
- * The header pattern, defaults to {@code "["} if null.
- * @param footerPattern
- * The header pattern, defaults to {@code "]"} if null.
- * @param charset
- * The character set to use, if {@code null}, uses "UTF-8".
- * @param includeStacktrace
- * If "true", includes the stacktrace of any Throwable in the generated JSON, defaults to "true".
- * @return A JSON Layout.
- *
- * @deprecated Use {@link #newBuilder()} instead
- */
- @Deprecated
- public static JsonLayout createLayout(
- final Configuration config,
- final boolean locationInfo,
- final boolean properties,
- final boolean propertiesAsList,
- final boolean complete,
- final boolean compact,
- final boolean eventEol,
- final String headerPattern,
- final String footerPattern,
- final Charset charset,
- final boolean includeStacktrace) {
- final boolean encodeThreadContextAsList = properties && propertiesAsList;
- return new JsonLayout(config, locationInfo, properties, encodeThreadContextAsList, complete, compact, eventEol,
- headerPattern, footerPattern, charset, includeStacktrace, false, false, null, false);
- }
-
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
}
- /**
- * @deprecated Use {@link #newBuilder()} instead
- */
- @Deprecated
- protected JsonLayout(final Configuration config, final boolean locationInfo, final boolean properties,
- final boolean encodeThreadContextAsList,
- final boolean complete, final boolean compact, final boolean eventEol, final String headerPattern,
- final String footerPattern, final Charset charset, final boolean includeStacktrace) {
- super(config, new JsonJacksonFactory(encodeThreadContextAsList, includeStacktrace, false, false).newWriter(
- locationInfo, properties, compact),
- charset, compact, complete, eventEol,
- PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(headerPattern).setDefaultPattern(DEFAULT_HEADER).build(),
- PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footerPattern).setDefaultPattern(DEFAULT_FOOTER).build(),
- false, null);
- }
-
private JsonLayout(final Configuration config, final boolean locationInfo, final boolean properties,
final boolean encodeThreadContextAsList,
final boolean complete, final boolean compact, final boolean eventEol,