Repository: logging-log4j2 Updated Branches: refs/heads/master 4a610a18d -> 0c1ad7ccd
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout/XmlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout/XmlLayout.java b/log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout/XmlLayout.java index 6d723b0..5eb7df8 100644 --- a/log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout/XmlLayout.java +++ b/log4j-layout-jackson-xml/src/main/java/org/apache/logging/log4j/jackson/xml/layout/XmlLayout.java @@ -102,46 +102,11 @@ public final class XmlLayout extends AbstractJacksonLayout { return new XmlLayout(null, false, false, false, false, StandardCharsets.UTF_8, true, false, false, null); } - /** - * Creates an XML Layout. - * - * @param locationInfo - * If "true", includes the location information in the generated XML. - * @param properties - * If "true", includes the thread context map in the generated XML. - * @param complete - * If "true", includes the XML header and footer, defaults to "false". - * @param compact - * If "true", does not use end-of-lines and indentation, defaults to "false". - * @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 XML, defaults to "true". - * @return An XML Layout. - * - * @deprecated Use {@link #newBuilder()} instead - */ - @Deprecated - public static XmlLayout createLayout(final boolean locationInfo, final boolean properties, final boolean complete, - final boolean compact, final Charset charset, final boolean includeStacktrace) { - return new XmlLayout(null, locationInfo, properties, complete, compact, charset, includeStacktrace, false, - false, null); - } - @PluginBuilderFactory public static <B extends Builder<B>> B newBuilder() { return new Builder<B>().asBuilder(); } - /** - * @deprecated Use {@link #newBuilder()} instead - */ - @Deprecated - protected XmlLayout(final boolean locationInfo, final boolean properties, final boolean complete, - final boolean compact, final Charset charset, final boolean includeStacktrace) { - this(null, locationInfo, properties, complete, compact, charset, includeStacktrace, false, false, null); - } - private XmlLayout(final Configuration config, final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact, final Charset charset, final boolean includeStacktrace, final boolean stacktraceAsString, final boolean includeNullDelimiter, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java b/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java index 418ef9a..1faccdb 100644 --- a/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java +++ b/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java @@ -145,22 +145,6 @@ public final class YamlLayout extends AbstractJacksonLayout { return new Builder<B>().asBuilder(); } - /** - * @deprecated Use {@link #newBuilder()} instead - */ - @Deprecated - protected YamlLayout(final Configuration config, final boolean locationInfo, final boolean properties, - final boolean complete, final boolean compact, final boolean eventEol, final String headerPattern, - final String footerPattern, final Charset charset, final boolean includeStacktrace) { - super(config, new YamlJacksonFactory(includeStacktrace, 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 YamlLayout(final Configuration config, final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact, final boolean eventEol, final String headerPattern, final String footerPattern, final Charset charset, final boolean includeStacktrace, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractJacksonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractJacksonLayout.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractJacksonLayout.java index 2e35b01..1428966 100644 --- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractJacksonLayout.java +++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/AbstractJacksonLayout.java @@ -258,21 +258,6 @@ public abstract class AbstractJacksonLayout extends AbstractStringLayout { protected final ResolvableKeyValuePair[] additionalFields; - @Deprecated - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, - final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, - final Serializer footerSerializer) { - this(config, objectWriter, charset, compact, complete, eventEol, headerSerializer, footerSerializer, false); - } - - @Deprecated - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, - final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, - final Serializer footerSerializer, final boolean includeNullDelimiter) { - this(config, objectWriter, charset, compact, complete, eventEol, headerSerializer, footerSerializer, - includeNullDelimiter, null); - } - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, final Serializer footerSerializer, final boolean includeNullDelimiter, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java index 175a470..7739979 100644 --- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java +++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java @@ -283,21 +283,6 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { protected final ResolvableKeyValuePair[] additionalFields; - @Deprecated - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, - final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, - final Serializer footerSerializer) { - this(config, objectWriter, charset, compact, complete, eventEol, headerSerializer, footerSerializer, false); - } - - @Deprecated - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, - final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, - final Serializer footerSerializer, final boolean includeNullDelimiter) { - this(config, objectWriter, charset, compact, complete, eventEol, headerSerializer, footerSerializer, - includeNullDelimiter, null); - } - protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset, final boolean compact, final boolean complete, final boolean eventEol, final Serializer headerSerializer, final Serializer footerSerializer, final boolean includeNullDelimiter, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-mongodb2/src/main/java/org/apache/logging/log4j/mongodb2/MongoDbProvider.java ---------------------------------------------------------------------- diff --git a/log4j-mongodb2/src/main/java/org/apache/logging/log4j/mongodb2/MongoDbProvider.java b/log4j-mongodb2/src/main/java/org/apache/logging/log4j/mongodb2/MongoDbProvider.java index d5d4aa9..37af80f 100644 --- a/log4j-mongodb2/src/main/java/org/apache/logging/log4j/mongodb2/MongoDbProvider.java +++ b/log4j-mongodb2/src/main/java/org/apache/logging/log4j/mongodb2/MongoDbProvider.java @@ -275,47 +275,6 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { private static final int DEFAULT_PORT = 27017; private static final int DEFAULT_COLLECTION_SIZE = 536870912; - /** - * Factory method for creating a MongoDB provider within the plugin manager. - * - * @param collectionName The name of the MongoDB collection to which log events should be written. - * @param writeConcernConstant The {@link WriteConcern} constant to control writing details, defaults to - * {@link WriteConcern#ACKNOWLEDGED}. - * @param writeConcernConstantClassName The name of a class containing the aforementioned static WriteConcern - * constant. Defaults to {@link WriteConcern}. - * @param databaseName The name of the MongoDB database containing the collection to which log events should be - * written. Mutually exclusive with {@code factoryClassName&factoryMethodName!=null}. - * @param server The host name of the MongoDB server, defaults to localhost and mutually exclusive with - * {@code factoryClassName&factoryMethodName!=null}. - * @param port The port the MongoDB server is listening on, defaults to the default MongoDB port and mutually - * exclusive with {@code factoryClassName&factoryMethodName!=null}. - * @param userName The username to authenticate against the MongoDB server with. - * @param password The password to authenticate against the MongoDB server with. - * @param factoryClassName A fully qualified class name containing a static factory method capable of returning a - * {@link DB} or a {@link MongoClient}. - * @param factoryMethodName The name of the public static factory method belonging to the aforementioned factory - * class. - * @return a new MongoDB provider. - * @deprecated in 2.8; use {@link #newBuilder()} instead. - */ - @Deprecated - public static MongoDbProvider createNoSqlProvider( - final String collectionName, - final String writeConcernConstant, - final String writeConcernConstantClassName, - final String databaseName, - final String server, - final String port, - final String userName, - final String password, - final String factoryClassName, - final String factoryMethodName) { - LOGGER.info("createNoSqlProvider"); - return newBuilder().setCollectionName(collectionName).setWriteConcernConstant(writeConcernConstantClassName) - .setWriteConcernConstant(writeConcernConstant).setDatabaseName(databaseName).setServer(server) - .setPort(port).setUserName(userName).setPassword(password).setFactoryClassName(factoryClassName) - .setFactoryMethodName(factoryMethodName).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-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java index 9c57d91..30c7ee4 100644 --- a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java +++ b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/MimeMessageBuilder.java @@ -78,14 +78,6 @@ public class MimeMessageBuilder implements Builder<MimeMessage> { return this; } - /** - * @deprecated Use {@link #build()}. - */ - @Deprecated - public MimeMessage getMimeMessage() { - return build(); - } - @Override public MimeMessage build() { return message; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java index 180a6bf..07f586b 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java @@ -107,26 +107,4 @@ public class ServletAppender extends AbstractAppender { } } - /** - * Creates a Servlet Appender. - * @param layout The layout to use (required). Must extend {@link AbstractStringLayout}. - * @param filter The Filter or null. - * @param name The name of the Appender (required). - * @param ignoreExceptions If {@code true} (default) exceptions encountered when appending events are logged; - * otherwise they are propagated to the caller. - * @return The ServletAppender. - * @deprecated Use {@link #newBuilder()}. - */ - @Deprecated - public static ServletAppender createAppender(final Layout<? extends Serializable> layout, final Filter filter, - final String name, final boolean ignoreExceptions) { - // @formatter:off - return newBuilder().setFilter(filter) - .setIgnoreExceptions(ignoreExceptions) - .setLayout(layout) - .setName(name) - .build(); - // @formatter:on - } - } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c1ad7cc/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 887e34b..63f5460 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -305,6 +305,9 @@ <action issue="LOG4J2-2492" dev="ggregory" type="update"> Update builder methods from the "with" prefix to the "set" prefix. </action> + <action issue="LOG4J2-2493" dev="ggregory" type="update"> + Remove deprecated code. + </action> </release> <release version="2.11.2" date="2018-MM-DD" description="GA Release 2.11.2"> <action issue="LOG4J2-2391" dev="ckozak" type="update">
