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:27 UTC
[3/3] logging-log4j2 git commit: [LOG4J2-2493] Remove deprecated
code. A bit more to do.
[LOG4J2-2493] Remove deprecated code. A bit more to do.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0c1ad7cc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0c1ad7cc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0c1ad7cc
Branch: refs/heads/master
Commit: 0c1ad7ccdeb1e03f0bf6a28006030ce57f769685
Parents: 4a610a1
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Oct 29 16:54:17 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Oct 29 16:54:17 2018 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/MarkerManager.java | 32 ----
.../log4j/message/ParameterizedMessage.java | 15 --
.../logging/log4j/spi/LoggerContextKey.java | 47 ------
.../apache/logging/log4j/util/ProviderUtil.java | 12 --
.../org/apache/logging/log4j/LoggerTest.java | 4 +-
.../log4j/cassandra/CassandraManager.java | 6 -
.../log4j/core/appender/HttpAppenderTest.java | 4 +-
.../log4j/core/appender/AbstractManager.java | 9 --
.../log4j/core/appender/AsyncAppender.java | 37 -----
.../log4j/core/appender/ConsoleAppender.java | 74 ---------
.../log4j/core/appender/FileAppender.java | 14 +-
.../log4j/core/appender/FileManager.java | 50 ------
.../core/appender/MemoryMappedFileAppender.java | 59 -------
.../core/appender/RandomAccessFileAppender.java | 59 -------
.../core/appender/RollingFileAppender.java | 64 --------
.../RollingRandomAccessFileAppender.java | 68 ---------
.../log4j/core/appender/SocketAppender.java | 152 -------------------
.../log4j/core/appender/SyslogAppender.java | 110 --------------
.../appender/db/AbstractDatabaseManager.java | 21 ---
.../core/appender/nosql/NoSqlAppender.java | 48 ------
.../appender/nosql/NoSqlDatabaseManager.java | 6 -
.../rolling/DefaultRolloverStrategy.java | 57 -------
.../rolling/DirectWriteRolloverStrategy.java | 47 ------
.../appender/rolling/RollingFileManager.java | 41 -----
.../rolling/RollingRandomAccessFileManager.java | 10 --
.../rolling/TimeBasedTriggeringPolicy.java | 17 ---
.../log4j/core/appender/routing/Routes.java | 18 ---
.../core/appender/routing/RoutingAppender.java | 34 -----
.../log4j/core/async/AsyncLoggerConfig.java | 72 ---------
.../logging/log4j/core/config/LoggerConfig.java | 75 ---------
.../logging/log4j/core/impl/Log4jLogEvent.java | 90 -----------
.../log4j/core/layout/AbstractLayout.java | 14 --
.../logging/log4j/core/layout/GelfLayout.java | 27 ----
.../logging/log4j/core/layout/SyslogLayout.java | 16 --
.../log4j/core/net/SslSocketManager.java | 35 -----
.../log4j/core/net/TcpSocketManager.java | 61 --------
.../net/ssl/AbstractKeyStoreConfiguration.java | 20 +--
.../core/net/ssl/KeyStoreConfiguration.java | 42 +----
.../log4j/core/net/ssl/StoreConfiguration.java | 36 +----
.../core/net/ssl/TrustStoreConfiguration.java | 48 ------
.../time/internal/format/FastDatePrinter.java | 15 --
.../apache/logging/log4j/core/util/Clock.java | 25 ---
.../logging/log4j/core/util/ClockFactory.java | 39 -----
.../logging/log4j/core/util/NanoClock.java | 26 ----
.../log4j/core/util/NullOutputStream.java | 6 -
.../log4j/core/util/SystemNanoClock.java | 37 -----
.../core/appender/TlsSyslogAppenderTest.java | 43 +++++-
.../db/AbstractDatabaseManagerTest.java | 6 -
.../core/appender/nosql/NoSqlAppenderTest.java | 10 +-
.../rolling/CronTriggeringPolicyTest.java | 12 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 10 +-
.../rolling/RollingFileAppenderAccessTest.java | 12 +-
.../log4j/core/async/AsyncLoggerConfigTest.java | 11 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 19 ++-
.../log4j/core/config/LoggerConfigTest.java | 1 -
.../log4j/core/impl/Log4jLogEventTest.java | 8 -
.../log4j/jdbc/appender/ColumnConfig.java | 30 ----
.../log4j/jdbc/appender/JdbcAppender.java | 30 ----
.../jdbc/appender/JdbcDatabaseManager.java | 60 --------
.../logging/log4j/jms/appender/JmsAppender.java | 24 ---
.../log4j/jpa/appender/JpaDatabaseManager.java | 6 -
.../log4j/kafka/appender/KafkaAppender.java | 20 ---
.../log4j/jackson/json/layout/JsonLayout.java | 66 --------
.../log4j/jackson/xml/layout/XmlLayout.java | 35 -----
.../log4j/jackson/yaml/layout/YamlLayout.java | 16 --
.../log4j/jackson/AbstractJacksonLayout.java | 15 --
.../jackson/layout/AbstractJacksonLayout.java | 15 --
.../logging/log4j/mongodb2/MongoDbProvider.java | 41 -----
.../logging/log4j/smtp/MimeMessageBuilder.java | 8 -
.../log4j/web/appender/ServletAppender.java | 22 ---
src/changes/changes.xml | 3 +
71 files changed, 105 insertions(+), 2217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
index 8843883..46d5cb0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
@@ -69,38 +69,6 @@ public final class MarkerManager {
}
/**
- * Retrieves or creates a Marker with the specified parent. The parent must have been previously created.
- *
- * @param name The name of the Marker.
- * @param parent The name of the parent Marker.
- * @return The Marker with the specified name.
- * @throws IllegalArgumentException if the parent Marker does not exist.
- * @deprecated Use the Marker add or set methods to add parent Markers. Will be removed by final GA release.
- */
- @Deprecated
- public static Marker getMarker(final String name, final String parent) {
- final Marker parentMarker = MARKERS.get(parent);
- if (parentMarker == null) {
- throw new IllegalArgumentException("Parent Marker " + parent + " has not been defined");
- }
- return getMarker(name, parentMarker);
- }
-
- /**
- * Retrieves or creates a Marker with the specified parent.
- *
- * @param name The name of the Marker.
- * @param parent The parent Marker.
- * @return The Marker with the specified name.
- * @throws IllegalArgumentException if any argument is {@code null}
- * @deprecated Use the Marker add or set methods to add parent Markers. Will be removed by final GA release.
- */
- @Deprecated
- public static Marker getMarker(final String name, final Marker parent) {
- return getMarker(name).addParents(parent);
- }
-
- /**
* <em>Consider this class private, it is only public to satisfy Jackson for XML and JSON IO.</em>
* <p>
* The actual Marker implementation.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
index c4a1bbf..dfc04f8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
@@ -85,21 +85,6 @@ public class ParameterizedMessage implements Message, StringBuilderFormattable {
* where parameters should be substituted.
* @param arguments The arguments for substitution.
* @param throwable A Throwable.
- * @deprecated Use constructor ParameterizedMessage(String, Object[], Throwable) instead
- */
- @Deprecated
- public ParameterizedMessage(final String messagePattern, final String[] arguments, final Throwable throwable) {
- this.argArray = arguments;
- this.throwable = throwable;
- init(messagePattern);
- }
-
- /**
- * Creates a parameterized message.
- * @param messagePattern The message "format" string. This will be a String containing "{}" placeholders
- * where parameters should be substituted.
- * @param arguments The arguments for substitution.
- * @param throwable A Throwable.
*/
public ParameterizedMessage(final String messagePattern, final Object[] arguments, final Throwable throwable) {
this.argArray = arguments;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextKey.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextKey.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextKey.java
deleted file mode 100644
index 113bc45..0000000
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextKey.java
+++ /dev/null
@@ -1,47 +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.spi;
-
-import org.apache.logging.log4j.message.MessageFactory;
-
-/**
- * Creates keys used in maps for use in LoggerContext implementations.
- *
- * @deprecated with no replacement - no longer used
- * @since 2.5
- */
-@Deprecated
-public class LoggerContextKey {
-
- public static String create(final String name) {
- return create(name, AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS);
- }
-
- public static String create(final String name, final MessageFactory messageFactory) {
- final Class<? extends MessageFactory> messageFactoryClass = messageFactory != null ? messageFactory.getClass()
- : AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS;
- return create(name, messageFactoryClass);
- }
-
- public static String create(final String name, final Class<? extends MessageFactory> messageFactoryClass) {
- final Class<? extends MessageFactory> mfClass = messageFactoryClass != null ? messageFactoryClass
- : AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS;
- return name + "." + mfClass.getName();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index 9645a71..93fad64 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -113,18 +113,6 @@ public final class ProviderUtil {
}
}
- /**
- * @deprecated Use {@link #loadProvider(java.net.URL, ClassLoader)} instead. Will be removed in 3.0.
- */
- @Deprecated
- protected static void loadProviders(final Enumeration<URL> urls, final ClassLoader cl) {
- if (urls != null) {
- while (urls.hasMoreElements()) {
- loadProvider(urls.nextElement(), cl);
- }
- }
- }
-
public static Iterable<Provider> getProviders() {
lazyInit();
return PROVIDERS;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index 2321c64..351b36f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -59,8 +59,8 @@ public class LoggerTest {
@Test
public void basicFlow() {
- logger.entry();
- logger.exit();
+ logger.traceEntry();
+ logger.traceExit();
assertEquals(2, results.size());
assertThat("Incorrect Entry", results.get(0), equalTo("ENTER[ FLOW ] TRACE Enter"));
assertThat("incorrect Exit", results.get(1), equalTo("EXIT[ FLOW ] TRACE Exit"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 8b54a0b..ad1a4a6 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
@@ -87,12 +87,6 @@ public class CassandraManager extends AbstractDatabaseManager {
// a Session automatically manages connections for us
}
- @Deprecated
- @Override
- 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/0c1ad7cc/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
index 6bdbf9c..8b7fbdb 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
@@ -187,8 +187,8 @@ public class HttpAppenderTest {
.setConfiguration(ctx.getConfiguration())
.setUrl(new URL("https://localhost:" + wireMockRule.httpsPort() + "/test/log4j/"))
.setSslConfiguration(SslConfiguration.createSSLConfiguration(null,
- KeyStoreConfiguration.createKeyStoreConfiguration(TestConstants.KEYSTORE_FILE, TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE, null),
- TrustStoreConfiguration.createKeyStoreConfiguration(TestConstants.TRUSTSTORE_FILE, TestConstants.TRUSTSTORE_PWD(), TestConstants.TRUSTSTORE_TYPE, null)))
+ KeyStoreConfiguration.createKeyStoreConfiguration(TestConstants.KEYSTORE_FILE, TestConstants.KEYSTORE_PWD(), null, null, TestConstants.KEYSTORE_TYPE, null),
+ TrustStoreConfiguration.createKeyStoreConfiguration(TestConstants.TRUSTSTORE_FILE, TestConstants.TRUSTSTORE_PWD(), null ,null, TestConstants.TRUSTSTORE_TYPE, null)))
.setVerifyHostname(false)
.build();
appender.append(createLogEvent());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index e85871f..ec8e9d5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -196,15 +196,6 @@ public abstract class AbstractManager implements AutoCloseable {
}
/**
- * Called to signify that this Manager is no longer required by an Appender.
- * @deprecated In 2.7, use {@link #close()}.
- */
- @Deprecated
- public void release() {
- close();
- }
-
- /**
* Returns the name of the Manager.
* @return The name of the Manager.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 b0ed1d9..ca1c960 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
@@ -236,43 +236,6 @@ public final class AsyncAppender extends AbstractAppender {
}
}
- /**
- * Create an AsyncAppender. This method is retained for backwards compatibility. New code should use the
- * {@link Builder} instead. This factory will use {@link ArrayBlockingQueueFactory} by default as was the behavior
- * pre-2.7.
- *
- * @param appenderRefs The Appenders to reference.
- * @param errorRef An optional Appender to write to if the queue is full or other errors occur.
- * @param blocking True if the Appender should wait when the queue is full. The default is true.
- * @param shutdownTimeout How many milliseconds the Appender should wait to flush outstanding log events
- * in the queue on shutdown. The default is zero which means to wait forever.
- * @param size The size of the event queue. The default is 128.
- * @param name The name of the Appender.
- * @param includeLocation whether to include location information. The default is false.
- * @param filter The Filter or null.
- * @param config The Configuration.
- * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged;
- * otherwise they are propagated to the caller.
- * @return The AsyncAppender.
- * @deprecated use {@link Builder} instead
- */
- @Deprecated
- public static AsyncAppender createAppender(final AppenderRef[] appenderRefs, final String errorRef,
- final boolean blocking, final long shutdownTimeout, final int size,
- final String name, final boolean includeLocation, final Filter filter,
- final Configuration config, final boolean ignoreExceptions) {
- if (name == null) {
- LOGGER.error("No name provided for AsyncAppender");
- return null;
- }
- if (appenderRefs == null) {
- LOGGER.error("No appender references provided to AsyncAppender {}", name);
- }
-
- return new AsyncAppender(name, filter, appenderRefs, errorRef, size, blocking, ignoreExceptions,
- shutdownTimeout, config, includeLocation, new ArrayBlockingQueueFactory<LogEvent>());
- }
-
@PluginBuilderFactory
public static Builder newBuilder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 d82191c..2e64e24 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
@@ -95,80 +95,6 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
this.target = target;
}
- /**
- * Creates a Console Appender.
- *
- * @param layout The layout to use (required).
- * @param filter The Filter or null.
- * @param targetStr The target ("SYSTEM_OUT" or "SYSTEM_ERR"). The default is "SYSTEM_OUT".
- * @param name The name of the Appender (required).
- * @param follow If true will follow changes to the underlying output stream.
- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @return The ConsoleAppender.
- * @deprecated Deprecated in 2.7; use {@link #newBuilder()}.
- */
- @Deprecated
- public static ConsoleAppender createAppender(Layout<? extends Serializable> layout,
- final Filter filter,
- final String targetStr,
- final String name,
- final String follow,
- final String ignore) {
- if (name == null) {
- LOGGER.error("No name provided for ConsoleAppender");
- return null;
- }
- if (layout == null) {
- layout = PatternLayout.createDefaultLayout();
- }
- final boolean isFollow = Boolean.parseBoolean(follow);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final Target target = targetStr == null ? DEFAULT_TARGET : Target.valueOf(targetStr);
- return new ConsoleAppender(name, layout, filter, getManager(target, isFollow, false, layout), ignoreExceptions, target);
- }
-
- /**
- * Creates a Console Appender.
- *
- * @param layout The layout to use (required).
- * @param filter The Filter or null.
- * @param target The target (SYSTEM_OUT or SYSTEM_ERR). The default is SYSTEM_OUT.
- * @param name The name of the Appender (required).
- * @param follow If true will follow changes to the underlying output stream.
- * @param direct If true will write directly to {@link java.io.FileDescriptor} and bypass
- * {@link System#out}/{@link System#err}.
- * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @return The ConsoleAppender.
- * @deprecated Deprecated in 2.7; use {@link #newBuilder()}.
- */
- @Deprecated
- public static ConsoleAppender createAppender(
- // @formatter:off
- Layout<? extends Serializable> layout,
- final Filter filter,
- Target target,
- final String name,
- final boolean follow,
- final boolean direct,
- final boolean ignoreExceptions) {
- // @formatter:on
- if (name == null) {
- LOGGER.error("No name provided for ConsoleAppender");
- return null;
- }
- if (layout == null) {
- layout = PatternLayout.createDefaultLayout();
- }
- target = target == null ? Target.SYSTEM_OUT : target;
- if (follow && direct) {
- LOGGER.error("Cannot use both follow and direct on ConsoleAppender");
- return null;
- }
- return new ConsoleAppender(name, layout, filter, getManager(target, follow, direct, layout), ignoreExceptions, target);
- }
-
public static ConsoleAppender createDefaultAppenderForLayout(final Layout<? extends Serializable> layout) {
// this method cannot use the builder class without introducing an infinite loop due to DefaultConfiguration
return new ConsoleAppender("DefaultConsole-" + COUNT.incrementAndGet(), layout, null,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 d368956..dd86a2c 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
@@ -226,13 +226,13 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
final String advertiseUri,
final Configuration config) {
return FileAppender.<B>newBuilder()
- .setAdvertise(Boolean.parseBoolean(advertise))
- .setAdvertiseUri(advertiseUri)
- .setAppend(Booleans.parseBoolean(append, true))
- .setBufferedIo(Booleans.parseBoolean(bufferedIo, true))
- .setBufferSize(Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE))
- .setConfiguration(config)
- .setFileName(fileName).setFilter(filter)
+ .setAdvertise(Boolean.parseBoolean(advertise))
+ .setAdvertiseUri(advertiseUri)
+ .setAppend(Booleans.parseBoolean(append, true))
+ .setBufferedIo(Booleans.parseBoolean(bufferedIo, true))
+ .setBufferSize(Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE))
+ .setConfiguration(config)
+ .setFileName(fileName).setFilter(filter)
.setIgnoreExceptions(Booleans.parseBoolean(ignoreExceptions, true))
.setImmediateFlush(Booleans.parseBoolean(immediateFlush, true))
.setLayout(layout)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index 0906534..45a64ea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -61,56 +61,6 @@ public class FileManager extends OutputStreamManager {
private final boolean attributeViewEnabled;
/**
- * @deprecated
- */
- @Deprecated
- protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking,
- final String advertiseURI, final Layout<? extends Serializable> layout, final int bufferSize,
- final boolean writeHeader) {
- this(fileName, os, append, locking, advertiseURI, layout, writeHeader, ByteBuffer.wrap(new byte[bufferSize]));
- }
-
- /**
- * @deprecated
- * @since 2.6
- */
- @Deprecated
- protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking,
- final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader,
- final ByteBuffer buffer) {
- super(os, fileName, layout, writeHeader, buffer);
- this.isAppend = append;
- this.createOnDemand = false;
- this.isLocking = locking;
- this.advertiseURI = advertiseURI;
- this.bufferSize = buffer.capacity();
- this.filePermissions = null;
- this.fileOwner = null;
- this.fileGroup = null;
- this.attributeViewEnabled = false;
- }
-
- /**
- * @deprecated
- * @since 2.7
- */
- @Deprecated
- protected FileManager(final LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
- final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
- final boolean writeHeader, final ByteBuffer buffer) {
- super(loggerContext, os, fileName, createOnDemand, layout, writeHeader, buffer);
- this.isAppend = append;
- this.createOnDemand = createOnDemand;
- this.isLocking = locking;
- this.advertiseURI = advertiseURI;
- this.bufferSize = buffer.capacity();
- this.filePermissions = null;
- this.fileOwner = null;
- this.fileGroup = null;
- this.attributeViewEnabled = false;
- }
-
- /**
* @since 2.9
*/
protected FileManager(final LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 09b65bc..7168f5d 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
@@ -188,65 +188,6 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
return getManager().getRegionLength();
}
- /**
- * Create a Memory Mapped File Appender.
- *
- * @param fileName The name and path of the file.
- * @param append "True" if the file should be appended to, "false" if it should be overwritten. The default is
- * "true".
- * @param name The name of the Appender.
- * @param immediateFlush "true" if the contents should be flushed on every write, "false" otherwise. The default is
- * "false".
- * @param regionLengthStr The buffer size, defaults to {@value MemoryMappedFileManager#DEFAULT_REGION_LENGTH}.
- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @param layout The layout to use to format the event. If no layout is provided the default PatternLayout will be
- * used.
- * @param filter The filter, if any, to use.
- * @param advertise "true" if the appender configuration should be advertised, "false" otherwise.
- * @param advertiseURI The advertised URI which can be used to retrieve the file contents.
- * @param config The Configuration.
- * @return The FileAppender.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static <B extends Builder<B>> MemoryMappedFileAppender createAppender(
- // @formatter:off
- final String fileName, //
- final String append, //
- final String name, //
- final String immediateFlush, //
- final String regionLengthStr, //
- final String ignore, //
- final Layout<? extends Serializable> layout, //
- final Filter filter, //
- final String advertise, //
- final String advertiseURI, //
- final Configuration config) {
- // @formatter:on
-
- final boolean isAppend = Booleans.parseBoolean(append, true);
- final boolean isImmediateFlush = Booleans.parseBoolean(immediateFlush, false);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final boolean isAdvertise = Boolean.parseBoolean(advertise);
- final int regionLength = Integers.parseInt(regionLengthStr, MemoryMappedFileManager.DEFAULT_REGION_LENGTH);
-
- // @formatter:off
- return MemoryMappedFileAppender.<B>newBuilder()
- .setAdvertise(isAdvertise)
- .setAdvertiseURI(advertiseURI)
- .setAppend(isAppend)
- .setConfiguration(config)
- .setFileName(fileName).setFilter(filter)
- .setIgnoreExceptions(ignoreExceptions)
- .setImmediateFlush(isImmediateFlush)
- .setLayout(layout)
- .setName(name)
- .setRegionLength(regionLength)
- .build();
- // @formatter:on
- }
-
@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/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 12c8d93..539d56c 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
@@ -176,65 +176,6 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
return getManager().getBufferSize();
}
- // difference from standard File Appender:
- // locking is not supported and buffering cannot be switched off
- /**
- * Create a File Appender.
- *
- * @param fileName The name and path of the file.
- * @param append "True" if the file should be appended to, "false" if it
- * should be overwritten. The default is "true".
- * @param name The name of the Appender.
- * @param immediateFlush "true" if the contents should be flushed on every
- * write, "false" otherwise. The default is "true".
- * @param bufferSizeStr The buffer size, defaults to {@value RandomAccessFileManager#DEFAULT_BUFFER_SIZE}.
- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
- * they are propagated to the caller.
- * @param layout The layout to use to format the event. If no layout is
- * provided the default PatternLayout will be used.
- * @param filter The filter, if any, to use.
- * @param advertise "true" if the appender configuration should be
- * advertised, "false" otherwise.
- * @param advertiseURI The advertised URI which can be used to retrieve the
- * file contents.
- * @param configuration The Configuration.
- * @return The FileAppender.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static <B extends Builder<B>> RandomAccessFileAppender createAppender(
- final String fileName,
- final String append,
- final String name,
- final String immediateFlush,
- final String bufferSizeStr,
- final String ignore,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final String advertise,
- final String advertiseURI,
- final Configuration configuration) {
-
- final boolean isAppend = Booleans.parseBoolean(append, true);
- final boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final boolean isAdvertise = Boolean.parseBoolean(advertise);
- final int bufferSize = Integers.parseInt(bufferSizeStr, RandomAccessFileManager.DEFAULT_BUFFER_SIZE);
-
- return RandomAccessFileAppender.<B>newBuilder()
- .setAdvertise(isAdvertise)
- .setAdvertiseURI(advertiseURI)
- .setAppend(isAppend)
- .setBufferSize(bufferSize)
- .setConfiguration(configuration)
- .setFileName(fileName).setFilter(filter)
- .setIgnoreExceptions(ignoreExceptions)
- .setImmediateFlush(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/0c1ad7cc/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 b06b573..7633145 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
@@ -335,70 +335,6 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
}
/**
- * Creates a RollingFileAppender.
- * @param fileName The name of the file that is actively written to. (required).
- * @param filePattern The pattern of the file name to use on rollover. (required).
- * @param append If true, events are appended to the file. If false, the file
- * is overwritten when opened. Defaults to "true"
- * @param name The name of the Appender (required).
- * @param bufferedIO When true, I/O will be buffered. Defaults to "true".
- * @param bufferSizeStr buffer size for buffered IO (default is 8192).
- * @param immediateFlush When true, events are immediately flushed. Defaults to "true".
- * @param policy The triggering policy. (required).
- * @param strategy The rollover strategy. Defaults to DefaultRolloverStrategy.
- * @param layout The layout to use (defaults to the default PatternLayout).
- * @param filter The Filter or null.
- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
- * they are propagated to the caller.
- * @param advertise "true" if the appender configuration should be advertised, "false" otherwise.
- * @param advertiseUri The advertised URI which can be used to retrieve the file contents.
- * @param config The Configuration.
- * @return A RollingFileAppender.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static <B extends Builder<B>> RollingFileAppender createAppender(
- // @formatter:off
- final String fileName,
- final String filePattern,
- final String append,
- final String name,
- final String bufferedIO,
- final String bufferSizeStr,
- final String immediateFlush,
- final TriggeringPolicy policy,
- final RolloverStrategy strategy,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final String ignore,
- final String advertise,
- final String advertiseUri,
- final Configuration config) {
- // @formatter:on
- final int bufferSize = Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE);
- // @formatter:off
- return RollingFileAppender.<B>newBuilder()
- .setAdvertise(Boolean.parseBoolean(advertise))
- .setAdvertiseUri(advertiseUri)
- .setAppend(Booleans.parseBoolean(append, true))
- .setBufferedIo(Booleans.parseBoolean(bufferedIO, true))
- .setBufferSize(bufferSize)
- .setConfiguration(config)
- .setFileName(fileName)
- .setFilePattern(filePattern).setFilter(filter)
- .setIgnoreExceptions(Booleans.parseBoolean(ignore, true))
- .setImmediateFlush(Booleans.parseBoolean(immediateFlush, true))
- .setLayout(layout)
- .setCreateOnDemand(false)
- .setLocking(false)
- .setName(name)
- .setPolicy(policy)
- .setStrategy(strategy)
- .build();
- // @formatter:on
- }
-
- /**
* Creates a new Builder.
*
* @return a new Builder.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 c534fc0..0707dab 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
@@ -276,74 +276,6 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
return getManager().getBufferSize();
}
- /**
- * Create a RollingRandomAccessFileAppender.
- *
- * @param fileName The name of the file that is actively written to.
- * (required).
- * @param filePattern The pattern of the file name to use on rollover.
- * (required).
- * @param append If true, events are appended to the file. If false, the
- * file is overwritten when opened. Defaults to "true"
- * @param name The name of the Appender (required).
- * @param immediateFlush When true, events are immediately flushed. Defaults
- * to "true".
- * @param bufferSizeStr The buffer size, defaults to {@value RollingRandomAccessFileManager#DEFAULT_BUFFER_SIZE}.
- * @param policy The triggering policy. (required).
- * @param strategy The rollover strategy. Defaults to
- * DefaultRolloverStrategy.
- * @param layout The layout to use (defaults to the default PatternLayout).
- * @param filter The Filter or null.
- * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
- * they are propagated to the caller.
- * @param advertise "true" if the appender configuration should be
- * advertised, "false" otherwise.
- * @param advertiseURI The advertised URI which can be used to retrieve the
- * file contents.
- * @param configuration The Configuration.
- * @return A RollingRandomAccessFileAppender.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static <B extends Builder<B>> RollingRandomAccessFileAppender createAppender(
- final String fileName,
- final String filePattern,
- final String append,
- final String name,
- final String immediateFlush,
- final String bufferSizeStr,
- final TriggeringPolicy policy,
- final RolloverStrategy strategy,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final String ignoreExceptions,
- final String advertise,
- final String advertiseURI,
- final Configuration configuration) {
-
- final boolean isAppend = Booleans.parseBoolean(append, true);
- final boolean isIgnoreExceptions = Booleans.parseBoolean(ignoreExceptions, true);
- final boolean isImmediateFlush = Booleans.parseBoolean(immediateFlush, true);
- final boolean isAdvertise = Boolean.parseBoolean(advertise);
- final int bufferSize = Integers.parseInt(bufferSizeStr, RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE);
-
- return RollingRandomAccessFileAppender.<B>newBuilder()
- .setAdvertise(isAdvertise)
- .setAdvertiseURI(advertiseURI)
- .setAppend(isAppend)
- .setBufferSize(bufferSize)
- .setConfiguration(configuration)
- .setFileName(fileName)
- .setFilePattern(filePattern).setFilter(filter)
- .setIgnoreExceptions(isIgnoreExceptions)
- .setImmediateFlush(isImmediateFlush)
- .setLayout(layout)
- .setName(name)
- .setPolicy(policy)
- .setStrategy(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/0c1ad7cc/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 0bbec9f..9db5da4 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
@@ -261,158 +261,6 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
}
/**
- * Creates a socket appender.
- *
- * @param host
- * The name of the host to connect to.
- * @param port
- * The port to connect to on the target host.
- * @param protocol
- * The Protocol to use.
- * @param sslConfig
- * The SSL configuration file for TCP/SSL, ignored for UPD.
- * @param connectTimeoutMillis
- * the connect timeout in milliseconds.
- * @param reconnectDelayMillis
- * The interval in which failed writes should be retried.
- * @param immediateFail
- * True if the write should fail if no socket is immediately available.
- * @param name
- * The name of the Appender.
- * @param immediateFlush
- * "true" if data should be flushed on each write.
- * @param ignoreExceptions
- * If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @param layout
- * The layout to use. Required, there is no default.
- * @param filter
- * The Filter or null.
- * @param advertise
- * "true" if the appender configuration should be advertised, "false" otherwise.
- * @param configuration
- * The Configuration
- * @return A SocketAppender.
- * @deprecated Deprecated in 2.7; use {@link #newBuilder()}
- */
- @Deprecated
- @PluginFactory
- public static SocketAppender createAppender(
- // @formatter:off
- final String host,
- final int port,
- final Protocol protocol,
- final SslConfiguration sslConfig,
- final int connectTimeoutMillis,
- final int reconnectDelayMillis,
- final boolean immediateFail,
- final String name,
- final boolean immediateFlush,
- final boolean ignoreExceptions,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final boolean advertise,
- final Configuration configuration) {
- // @formatter:on
-
- // @formatter:off
- return newBuilder()
- .setAdvertise(advertise)
- .setConfiguration(configuration)
- .setConnectTimeoutMillis(connectTimeoutMillis).setFilter(filter)
- .setHost(host)
- .setIgnoreExceptions(ignoreExceptions)
- .setImmediateFail(immediateFail)
- .setLayout(layout)
- .setName(name)
- .setPort(port)
- .setProtocol(protocol)
- .setReconnectDelayMillis(reconnectDelayMillis)
- .setSslConfiguration(sslConfig)
- .build();
- // @formatter:on
- }
-
- /**
- * Creates a socket appender.
- *
- * @param host
- * The name of the host to connect to.
- * @param portNum
- * The port to connect to on the target host.
- * @param protocolIn
- * The Protocol to use.
- * @param sslConfig
- * The SSL configuration file for TCP/SSL, ignored for UPD.
- * @param connectTimeoutMillis
- * the connect timeout in milliseconds.
- * @param delayMillis
- * The interval in which failed writes should be retried.
- * @param immediateFail
- * True if the write should fail if no socket is immediately available.
- * @param name
- * The name of the Appender.
- * @param immediateFlush
- * "true" if data should be flushed on each write.
- * @param ignore
- * If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @param layout
- * The layout to use. Required, there is no default.
- * @param filter
- * The Filter or null.
- * @param advertise
- * "true" if the appender configuration should be advertised, "false" otherwise.
- * @param config
- * The Configuration
- * @return A SocketAppender.
- * @deprecated Deprecated in 2.5; use {@link #newBuilder()}
- */
- @Deprecated
- public static SocketAppender createAppender(
- // @formatter:off
- final String host,
- final String portNum,
- final String protocolIn,
- final SslConfiguration sslConfig,
- final int connectTimeoutMillis,
- // deprecated
- final String delayMillis,
- final String immediateFail,
- final String name,
- final String immediateFlush,
- final String ignore,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final String advertise,
- final Configuration config) {
- // @formatter:on
- final boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
- final boolean isAdvertise = Boolean.parseBoolean(advertise);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final boolean fail = Booleans.parseBoolean(immediateFail, true);
- final int reconnectDelayMillis = AbstractAppender.parseInt(delayMillis, 0);
- final int port = AbstractAppender.parseInt(portNum, 0);
- final Protocol p = protocolIn == null ? Protocol.UDP : Protocol.valueOf(protocolIn);
- return createAppender(host, port, p, sslConfig, connectTimeoutMillis, reconnectDelayMillis, fail, name, isFlush,
- ignoreExceptions, layout, filter, isAdvertise, config);
- }
-
- /**
- * Creates an AbstractSocketManager for TCP, UDP, and SSL.
- *
- * @throws IllegalArgumentException
- * if the protocol cannot be handled.
- * @deprecated Use {@link #createSocketManager(String, Protocol, String, int, int, SslConfiguration, int, boolean, Layout, int, SocketOptions)}.
- */
- @Deprecated
- protected static AbstractSocketManager createSocketManager(final String name, final Protocol protocol, final String host,
- final int port, final int connectTimeoutMillis, final SslConfiguration sslConfig, final int reconnectDelayMillis,
- final boolean immediateFail, final Layout<? extends Serializable> layout, final int bufferSize) {
- return createSocketManager(name, protocol, host, port, connectTimeoutMillis, sslConfig, reconnectDelayMillis, immediateFail, layout, bufferSize, null);
- }
-
- /**
* Creates an AbstractSocketManager for TCP, UDP, and SSL.
*
* @throws IllegalArgumentException
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 4510038..ee57b6a 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
@@ -310,116 +310,6 @@ public class SyslogAppender extends SocketAppender {
}
- /**
- * Creates a SyslogAppender.
- * @param host The name of the host to connect to.
- * @param port The port to connect to on the target host.
- * @param protocolStr The Protocol to use.
- * @param sslConfiguration TODO
- * @param connectTimeoutMillis the connect timeout in milliseconds.
- * @param reconnectDelayMillis The interval in which failed writes should be retried.
- * @param immediateFail True if the write should fail if no socket is immediately available.
- * @param name The name of the Appender.
- * @param immediateFlush "true" if data should be flushed on each write.
- * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged;
- * otherwise they are propagated to the caller.
- * @param facility The Facility is used to try to classify the message.
- * @param id The default structured data id to use when formatting according to RFC 5424.
- * @param enterpriseNumber The IANA enterprise number.
- * @param includeMdc Indicates whether data from the ThreadContextMap will be included in the RFC 5424 Syslog
- * record. Defaults to "true:.
- * @param mdcId The id to use for the MDC Structured Data Element.
- * @param mdcPrefix The prefix to add to MDC key names.
- * @param eventPrefix The prefix to add to event key names.
- * @param newLine If true, a newline will be appended to the end of the syslog record. The default is false.
- * @param escapeNL String that should be used to replace newlines within the message text.
- * @param appName The value to use as the APP-NAME in the RFC 5424 syslog record.
- * @param msgId The default value to be used in the MSGID field of RFC 5424 syslog records.
- * @param excludes A comma separated list of mdc keys that should be excluded from the LogEvent.
- * @param includes A comma separated list of mdc keys that should be included in the FlumeEvent.
- * @param required A comma separated list of mdc keys that must be present in the MDC.
- * @param format If set to "RFC5424" the data will be formatted in accordance with RFC 5424. Otherwise,
- * it will be formatted as a BSD Syslog record.
- * @param filter A Filter to determine if the event should be handled by this Appender.
- * @param configuration The Configuration.
- * @param charset The character set to use when converting the syslog String to a byte array.
- * @param exceptionPattern The converter pattern to use for formatting exceptions.
- * @param loggerFields The logger fields
- * @param advertise Whether to advertise
- * @return A SyslogAppender.
- * @deprecated Use {@link #newSyslogAppenderBuilder()}.
- */
- @Deprecated
- public static <B extends Builder<B>> SyslogAppender createAppender(
- // @formatter:off
- final String host,
- final int port,
- final String protocolStr,
- final SslConfiguration sslConfiguration,
- final int connectTimeoutMillis,
- final int reconnectDelayMillis,
- final boolean immediateFail,
- final String name,
- final boolean immediateFlush,
- final boolean ignoreExceptions,
- final Facility facility,
- final String id,
- final int enterpriseNumber,
- final boolean includeMdc,
- final String mdcId,
- final String mdcPrefix,
- final String eventPrefix,
- final boolean newLine,
- final String escapeNL,
- final String appName,
- final String msgId,
- final String excludes,
- final String includes,
- final String required,
- final String format,
- final Filter filter,
- final Configuration configuration,
- final Charset charset,
- final String exceptionPattern,
- final LoggerFields[] loggerFields,
- final boolean advertise) {
- // @formatter:on
-
- // @formatter:off
- return SyslogAppender.<B>newSyslogAppenderBuilder()
- .setHost(host)
- .setPort(port)
- .setProtocol(EnglishEnums.valueOf(Protocol.class, protocolStr))
- .setSslConfiguration(sslConfiguration)
- .setConnectTimeoutMillis(connectTimeoutMillis)
- .setReconnectDelayMillis(reconnectDelayMillis)
- .setImmediateFail(immediateFail)
- .setName(appName)
- .setImmediateFlush(immediateFlush)
- .setIgnoreExceptions(ignoreExceptions).setFilter(filter)
- .setConfiguration(configuration)
- .setAdvertise(advertise)
- .setFacility(facility)
- .setId(id)
- .setEnterpriseNumber(enterpriseNumber)
- .setIncludeMdc(includeMdc)
- .setMdcId(mdcId)
- .setMdcPrefix(mdcPrefix)
- .setEventPrefix(eventPrefix)
- .setNewLine(newLine)
- .setAppName(appName)
- .setMsgId(msgId)
- .setExcludes(excludes)
- .setIncludeMdc(includeMdc)
- .setRequired(required)
- .setFormat(format)
- .setCharsetName(charset)
- .setExceptionPattern(exceptionPattern)
- .setLoggerFields(loggerFields)
- .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/0c1ad7cc/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 0350543..1b51fd7 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
@@ -139,16 +139,6 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
* from {@link #write(LogEvent, Serializable)} if buffering is off, or from {@link #flush()} if the buffer has reached its limit.
*
* @param event The event to write to the database.
- * @deprecated Use {@link #writeInternal(LogEvent, Serializable)}.
- */
- @Deprecated
- protected abstract void writeInternal(LogEvent event);
-
- /**
- * Performs the actual writing of the event in an implementation-specific way. This method is called immediately
- * from {@link #write(LogEvent, Serializable)} if buffering is off, or from {@link #flush()} if the buffer has reached its limit.
- *
- * @param event The event to write to the database.
*/
protected abstract void writeInternal(LogEvent event, Serializable serializable);
@@ -185,17 +175,6 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
* This method manages buffering and writing of events.
*
* @param event The event to write to the database.
- * @deprecated since 2.11.0 Use {@link #write(LogEvent, Serializable)}.
- */
- @Deprecated
- public final synchronized void write(final LogEvent event) {
- write(event, null);
- }
-
- /**
- * This method manages buffering and writing of events.
- *
- * @param event The event to write to the database.
* @param serializable Serializable event
*/
public final synchronized void write(final LogEvent event, final Serializable serializable) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/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 0d23a2a..53fb6ac 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
@@ -107,54 +107,6 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
}
}
- /**
- * Factory method for creating a NoSQL appender within the plugin manager.
- *
- * @param name
- * The name of the appender.
- * @param ignore
- * If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @param filter
- * The filter, if any, to use.
- * @param bufferSize
- * If an integer greater than 0, this causes the appender to buffer log events and flush whenever the
- * buffer reaches this size.
- * @param provider
- * The NoSQL provider that provides connections to the chosen NoSQL database.
- * @return a new NoSQL appender.
- * @deprecated since 2.11.0; use {@link Builder}.
- */
- @SuppressWarnings("resource")
- @Deprecated
- public static NoSqlAppender createAppender(
- // @formatter:off
- final String name,
- final String ignore,
- final Filter filter,
- final String bufferSize,
- final NoSqlProvider<?> provider) {
- // @formatter:on
- if (provider == null) {
- LOGGER.error("NoSQL provider not specified for appender [{}].", name);
- return null;
- }
-
- final int bufferSizeInt = AbstractAppender.parseInt(bufferSize, 0);
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
-
- final String managerName = "noSqlManager{ description=" + name + ", bufferSize=" + bufferSizeInt + ", provider="
- + provider + " }";
-
- final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager(managerName, bufferSizeInt,
- provider);
- if (manager == null) {
- return null;
- }
-
- return new NoSqlAppender(name, filter, null, ignoreExceptions, manager);
- }
-
@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/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 7e2cad8..14322e3 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
@@ -67,12 +67,6 @@ public final class NoSqlDatabaseManager<W> 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.connection == null || this.connection.isClosed()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index 1172af1..e4b66f3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -36,12 +36,10 @@ import org.apache.logging.log4j.core.appender.rolling.action.PathCondition;
import org.apache.logging.log4j.core.appender.rolling.action.PosixViewAttributeAction;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
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.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import org.apache.logging.log4j.core.util.Integers;
@@ -276,44 +274,6 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
}
/**
- * Creates the DefaultRolloverStrategy.
- *
- * @param max The maximum number of files to keep.
- * @param min The minimum number of files to keep.
- * @param fileIndex If set to "max" (the default), files with a higher index will be newer than files with a smaller
- * index. If set to "min", file renaming and the counter will follow the Fixed Window strategy.
- * @param compressionLevelStr The compression level, 0 (less) through 9 (more); applies only to ZIP files.
- * @param customActions custom actions to perform asynchronously after rollover
- * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
- * @param config The Configuration.
- * @return A DefaultRolloverStrategy.
- * @deprecated Since 2.9 Usage of Builder API is preferable
- */
- @PluginFactory
- @Deprecated
- public static DefaultRolloverStrategy createStrategy(
- // @formatter:off
- @PluginAttribute("max") final String max,
- @PluginAttribute("min") final String min,
- @PluginAttribute("fileIndex") final String fileIndex,
- @PluginAttribute("compressionLevel") final String compressionLevelStr,
- @PluginElement("Actions") final Action[] customActions,
- @PluginAttribute(value = "stopCustomActionsOnError", defaultBoolean = true)
- final boolean stopCustomActionsOnError,
- @PluginConfiguration final Configuration config) {
- return DefaultRolloverStrategy.newBuilder()
- .setMin(min)
- .setMax(max)
- .setFileIndex(fileIndex)
- .setCompressionLevelStr(compressionLevelStr)
- .setCustomActions(customActions)
- .setStopCustomActionsOnError(stopCustomActionsOnError)
- .setConfig(config)
- .build();
- // @formatter:on
- }
-
- /**
* Index for oldest retained log file.
*/
private final int maxIndex;
@@ -335,23 +295,6 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
* @param maxIndex The maximum index.
* @param customActions custom actions to perform asynchronously after rollover
* @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
- * @deprecated Since 2.9 Added tempCompressedFilePatternString parameter
- */
- @Deprecated
- protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, final boolean useMax,
- final int compressionLevel, final StrSubstitutor strSubstitutor, final Action[] customActions,
- final boolean stopCustomActionsOnError) {
- this(minIndex, maxIndex, useMax, compressionLevel,
- strSubstitutor, customActions, stopCustomActionsOnError, null);
- }
-
- /**
- * Constructs a new instance.
- *
- * @param minIndex The minimum index.
- * @param maxIndex The maximum index.
- * @param customActions custom actions to perform asynchronously after rollover
- * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
* @param tempCompressedFilePatternString File pattern of the working file
* used during compression, if null no temporary file are used
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
index 83e5a9d..bb56d87 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
@@ -35,12 +35,10 @@ import org.apache.logging.log4j.core.appender.rolling.action.PathCondition;
import org.apache.logging.log4j.core.appender.rolling.action.PosixViewAttributeAction;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
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.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import org.apache.logging.log4j.core.util.Integers;
@@ -197,36 +195,6 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem
}
/**
- * Creates the DirectWriteRolloverStrategy.
- *
- * @param maxFiles The maximum number of files that match the date portion of the pattern to keep.
- * @param compressionLevelStr The compression level, 0 (less) through 9 (more); applies only to ZIP files.
- * @param customActions custom actions to perform asynchronously after rollover
- * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
- * @param config The Configuration.
- * @return A DirectWriteRolloverStrategy.
- * @deprecated Since 2.9 Usage of Builder API is preferable
- */
- @Deprecated
- @PluginFactory
- public static DirectWriteRolloverStrategy createStrategy(
- // @formatter:off
- @PluginAttribute("maxFiles") final String maxFiles,
- @PluginAttribute("compressionLevel") final String compressionLevelStr,
- @PluginElement("Actions") final Action[] customActions,
- @PluginAttribute(value = "stopCustomActionsOnError", defaultBoolean = true)
- final boolean stopCustomActionsOnError,
- @PluginConfiguration final Configuration config) {
- return newBuilder().setMaxFiles(maxFiles)
- .setCompressionLevelStr(compressionLevelStr)
- .setCustomActions(customActions)
- .setStopCustomActionsOnError(stopCustomActionsOnError)
- .setConfig(config)
- .build();
- // @formatter:on
- }
-
- /**
* Index for most recent log file.
*/
private final int maxFiles;
@@ -243,21 +211,6 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem
* @param maxFiles The maximum number of files that match the date portion of the pattern to keep.
* @param customActions custom actions to perform asynchronously after rollover
* @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
- * @deprecated Since 2.9 Added tempCompressedFilePatternString parameter
- */
- @Deprecated
- protected DirectWriteRolloverStrategy(final int maxFiles, final int compressionLevel,
- final StrSubstitutor strSubstitutor, final Action[] customActions,
- final boolean stopCustomActionsOnError) {
- this(maxFiles, compressionLevel, strSubstitutor, customActions, stopCustomActionsOnError, null);
- }
-
- /**
- * Constructs a new instance.
- *
- * @param maxFiles The maximum number of files that match the date portion of the pattern to keep.
- * @param customActions custom actions to perform asynchronously after rollover
- * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs
* @param tempCompressedFilePatternString File pattern of the working file
* used during compression, if null no temporary file are used
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 87d2cb5..b0e5105 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -80,47 +80,6 @@ public class RollingFileManager extends FileManager {
private static final AtomicReferenceFieldUpdater<RollingFileManager, PatternProcessor> patternProcessorUpdater =
AtomicReferenceFieldUpdater.newUpdater(RollingFileManager.class, PatternProcessor.class, "patternProcessor");
- @Deprecated
- protected RollingFileManager(final String fileName, final String pattern, final OutputStream os,
- final boolean append, final long size, final long time, final TriggeringPolicy triggeringPolicy,
- final RolloverStrategy rolloverStrategy, final String advertiseURI,
- final Layout<? extends Serializable> layout, final int bufferSize, final boolean writeHeader) {
- this(fileName, pattern, os, append, size, time, triggeringPolicy, rolloverStrategy, advertiseURI, layout,
- writeHeader, ByteBuffer.wrap(new byte[Constants.ENCODER_BYTE_BUFFER_SIZE]));
- }
-
- @Deprecated
- protected RollingFileManager(final String fileName, final String pattern, final OutputStream os,
- final boolean append, final long size, final long time, final TriggeringPolicy triggeringPolicy,
- final RolloverStrategy rolloverStrategy, final String advertiseURI,
- final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) {
- super(fileName, os, append, false, advertiseURI, layout, writeHeader, buffer);
- this.size = size;
- this.initialTime = time;
- this.triggeringPolicy = triggeringPolicy;
- this.rolloverStrategy = rolloverStrategy;
- this.patternProcessor = new PatternProcessor(pattern);
- this.patternProcessor.setPrevFileTime(time);
- this.fileName = fileName;
- this.fileExtension = FileExtension.lookupForFile(pattern);
- }
-
- @Deprecated
- protected RollingFileManager(final LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os,
- final boolean append, final boolean createOnDemand, final long size, final long time,
- final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy,
- final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) {
- super(loggerContext, fileName, os, append, false, createOnDemand, advertiseURI, layout, writeHeader, buffer);
- this.size = size;
- this.initialTime = time;
- this.triggeringPolicy = triggeringPolicy;
- this.rolloverStrategy = rolloverStrategy;
- this.patternProcessor = new PatternProcessor(pattern);
- this.patternProcessor.setPrevFileTime(time);
- this.fileName = fileName;
- this.fileExtension = FileExtension.lookupForFile(pattern);
- }
-
/**
* @since 2.9
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index 48a475a..49b4b5d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -47,16 +47,6 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
private RandomAccessFile randomAccessFile;
private final ThreadLocal<Boolean> isEndOfBatch = new ThreadLocal<>();
- @Deprecated
- public RollingRandomAccessFileManager(final LoggerContext loggerContext, final RandomAccessFile raf,
- final String fileName, final String pattern, final OutputStream os, final boolean append,
- final boolean immediateFlush, final int bufferSize, final long size, final long time,
- final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
- final Layout<? extends Serializable> layout, final boolean writeHeader) {
- this(loggerContext, raf, fileName, pattern, os, append, immediateFlush, bufferSize, size, time, policy, strategy, advertiseURI,
- layout, null, null, null, writeHeader);
- }
-
/**
* @since 2.8.3
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
index ec9a448..b6a95de 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
@@ -135,23 +135,6 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
return false;
}
- /**
- * Creates a TimeBasedTriggeringPolicy.
- * @param interval The interval between rollovers.
- * @param modulate If true the time will be rounded to occur on a boundary aligned with the increment.
- * @return a TimeBasedTriggeringPolicy.
- * @deprecated Use {@link #newBuilder()}.
- */
- @Deprecated
- public static TimeBasedTriggeringPolicy createPolicy(
- @PluginAttribute("interval") final String interval,
- @PluginAttribute("modulate") final String modulate) {
- return newBuilder()
- .setInterval(Integers.parseInt(interval, 1))
- .setModulate(Boolean.parseBoolean(modulate))
- .build();
- }
-
@PluginBuilderFactory
public static TimeBasedTriggeringPolicy.Builder newBuilder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
index 8ded254..71d089f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
@@ -119,24 +119,6 @@ public final class Routes {
private static final Logger LOGGER = StatusLogger.getLogger();
- /**
- * Creates the Routes.
- * @param pattern The pattern.
- * @param routes An array of Route elements.
- * @return The Routes container.
- * @deprecated since 2.7; use {@link #newBuilder()}.
- */
- @Deprecated
- public static Routes createRoutes(
- final String pattern,
- final Route... routes) {
- if (routes == null || routes.length == 0) {
- LOGGER.error("No routes configured");
- return null;
- }
- return new Routes(null, null, pattern, routes);
- }
-
@PluginBuilderFactory
public static Builder newBuilder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index 13bb86e..91a7bf7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -302,40 +302,6 @@ public final class RoutingAppender extends AbstractAppender {
}
}
- /**
- * Creates a RoutingAppender.
- * @param name The name of the Appender.
- * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
- * they are propagated to the caller.
- * @param routes The routing definitions.
- * @param config The Configuration (automatically added by the Configuration).
- * @param rewritePolicy A RewritePolicy, if any.
- * @param filter A Filter to restrict events processed by the Appender or null.
- * @return The RoutingAppender
- * @deprecated Since 2.7; use {@link #newBuilder()}
- */
- @Deprecated
- public static RoutingAppender createAppender(
- final String name,
- final String ignore,
- final Routes routes,
- final Configuration config,
- final RewritePolicy rewritePolicy,
- final PurgePolicy purgePolicy,
- final Filter filter) {
-
- final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- if (name == null) {
- LOGGER.error("No name provided for RoutingAppender");
- return null;
- }
- if (routes == null) {
- LOGGER.error("No routes defined for RoutingAppender");
- return null;
- }
- return new RoutingAppender(name, filter, ignoreExceptions, routes, rewritePolicy, config, purgePolicy, null);
- }
-
public Route getDefaultRoute() {
return defaultRoute;
}