Fix generics warnings in appender factory methods
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b0bc4c84 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b0bc4c84 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b0bc4c84 Branch: refs/heads/master Commit: b0bc4c843b1f86325d417b28c782f72569fe97e1 Parents: ab59845 Author: Matt Sicker <[email protected]> Authored: Fri Jan 6 23:20:02 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Fri Jan 6 23:20:02 2017 -0600 ---------------------------------------------------------------------- .../log4j/core/appender/FileAppender.java | 4 +- .../core/appender/MemoryMappedFileAppender.java | 4 +- .../core/appender/RandomAccessFileAppender.java | 4 +- .../core/appender/RollingFileAppender.java | 4 +- .../RollingRandomAccessFileAppender.java | 4 +- .../log4j/core/appender/SyslogAppender.java | 84 ++++++++++---------- 6 files changed, 52 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 b7c0fb0..030126b 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 @@ -174,7 +174,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager * @deprecated Use {@link #newBuilder()} */ @Deprecated - public static FileAppender createAppender( + public static <B extends Builder<B>> FileAppender createAppender( // @formatter:off final String fileName, final String append, @@ -189,7 +189,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager final String advertise, final String advertiseUri, final Configuration config) { - return newBuilder() + return FileAppender.<B>newBuilder() .withAdvertise(Boolean.parseBoolean(advertise)) .withAdvertiseUri(advertiseUri) .withAppend(Booleans.parseBoolean(append, true)) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 202bec9..17f64ee 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 @@ -210,7 +210,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender * @deprecated Use {@link #newBuilder()}. */ @Deprecated - public static MemoryMappedFileAppender createAppender( + public static <B extends Builder<B>> MemoryMappedFileAppender createAppender( // @formatter:off final String fileName, // final String append, // @@ -232,7 +232,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender final int regionLength = Integers.parseInt(regionLengthStr, MemoryMappedFileManager.DEFAULT_REGION_LENGTH); // @formatter:off - return newBuilder() + return MemoryMappedFileAppender.<B>newBuilder() .setAdvertise(isAdvertise) .setAdvertiseURI(advertiseURI) .setAppend(isAppend) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 38b6c87..dadfd1b 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 @@ -202,7 +202,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender * @deprecated Use {@link #newBuilder()}. */ @Deprecated - public static RandomAccessFileAppender createAppender( + public static <B extends Builder<B>> RandomAccessFileAppender createAppender( final String fileName, final String append, final String name, @@ -221,7 +221,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender final boolean isAdvertise = Boolean.parseBoolean(advertise); final int bufferSize = Integers.parseInt(bufferSizeStr, RandomAccessFileManager.DEFAULT_BUFFER_SIZE); - return newBuilder() + return RandomAccessFileAppender.<B>newBuilder() .setAdvertise(isAdvertise) .setAdvertiseURI(advertiseURI) .setAppend(isAppend) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 908df71..81a4551 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 @@ -317,7 +317,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll * @deprecated Use {@link #newBuilder()}. */ @Deprecated - public static RollingFileAppender createAppender( + public static <B extends Builder<B>> RollingFileAppender createAppender( // @formatter:off final String fileName, final String filePattern, @@ -337,7 +337,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll // @formatter:on final int bufferSize = Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE); // @formatter:off - return newBuilder() + return RollingFileAppender.<B>newBuilder() .withAdvertise(Boolean.parseBoolean(advertise)) .withAdvertiseUri(advertiseUri) .withAppend(Booleans.parseBoolean(append, true)) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 d2ea6bb..f0416ce 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 @@ -273,7 +273,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA * @deprecated Use {@link #newBuilder()}. */ @Deprecated - public static RollingRandomAccessFileAppender createAppender( + public static <B extends Builder<B>> RollingRandomAccessFileAppender createAppender( final String fileName, final String filePattern, final String append, @@ -295,7 +295,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA final boolean isAdvertise = Boolean.parseBoolean(advertise); final int bufferSize = Integers.parseInt(bufferSizeStr, RollingRandomAccessFileManager.DEFAULT_BUFFER_SIZE); - return newBuilder() + return RollingRandomAccessFileAppender.<B>newBuilder() .withAdvertise(isAdvertise) .withAdvertiseURI(advertiseURI) .withAppend(isAppend) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0bc4c84/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 d661145..26b435f 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 @@ -46,7 +46,7 @@ import org.apache.logging.log4j.util.EnglishEnums; @Plugin(name = "Syslog", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true) public class SyslogAppender extends SocketAppender { - public static class Builder extends AbstractBuilder<Builder> + public static class Builder<B extends Builder<B>> extends AbstractBuilder<B> implements org.apache.logging.log4j.core.util.Builder<SocketAppender> { @PluginBuilderAttribute(value = "facility") @@ -103,7 +103,7 @@ public class SyslogAppender extends SocketAppender { @PluginElement("LoggerFields") private LoggerFields[] loggerFields; - @SuppressWarnings("resource") + @SuppressWarnings({"resource", "unchecked"}) @Override public SyslogAppender build() { final Protocol protocol = getProtocol(); @@ -210,94 +210,94 @@ public class SyslogAppender extends SocketAppender { return loggerFields; } - public Builder setFacility(final Facility facility) { + public B setFacility(final Facility facility) { this.facility = facility; - return this; + return asBuilder(); } - public Builder setId(final String id) { + public B setId(final String id) { this.id = id; - return this; + return asBuilder(); } - public Builder setEnterpriseNumber(final int enterpriseNumber) { + public B setEnterpriseNumber(final int enterpriseNumber) { this.enterpriseNumber = enterpriseNumber; - return this; + return asBuilder(); } - public Builder setIncludeMdc(final boolean includeMdc) { + public B setIncludeMdc(final boolean includeMdc) { this.includeMdc = includeMdc; - return this; + return asBuilder(); } - public Builder setMdcId(final String mdcId) { + public B setMdcId(final String mdcId) { this.mdcId = mdcId; - return this; + return asBuilder(); } - public Builder setMdcPrefix(final String mdcPrefix) { + public B setMdcPrefix(final String mdcPrefix) { this.mdcPrefix = mdcPrefix; - return this; + return asBuilder(); } - public Builder setEventPrefix(final String eventPrefix) { + public B setEventPrefix(final String eventPrefix) { this.eventPrefix = eventPrefix; - return this; + return asBuilder(); } - public Builder setNewLine(final boolean newLine) { + public B setNewLine(final boolean newLine) { this.newLine = newLine; - return this; + return asBuilder(); } - public Builder setEscapeNL(final String escapeNL) { + public B setEscapeNL(final String escapeNL) { this.escapeNL = escapeNL; - return this; + return asBuilder(); } - public Builder setAppName(final String appName) { + public B setAppName(final String appName) { this.appName = appName; - return this; + return asBuilder(); } - public Builder setMsgId(final String msgId) { + public B setMsgId(final String msgId) { this.msgId = msgId; - return this; + return asBuilder(); } - public Builder setExcludes(final String excludes) { + public B setExcludes(final String excludes) { this.excludes = excludes; - return this; + return asBuilder(); } - public Builder setIncludes(final String includes) { + public B setIncludes(final String includes) { this.includes = includes; - return this; + return asBuilder(); } - public Builder setRequired(final String required) { + public B setRequired(final String required) { this.required = required; - return this; + return asBuilder(); } - public Builder setFormat(final String format) { + public B setFormat(final String format) { this.format = format; - return this; + return asBuilder(); } - public Builder setCharsetName(final Charset charset) { + public B setCharsetName(final Charset charset) { this.charsetName = charset; - return this; + return asBuilder(); } - public Builder setExceptionPattern(final String exceptionPattern) { + public B setExceptionPattern(final String exceptionPattern) { this.exceptionPattern = exceptionPattern; - return this; + return asBuilder(); } - public Builder setLoggerFields(final LoggerFields[] loggerFields) { + public B setLoggerFields(final LoggerFields[] loggerFields) { this.loggerFields = loggerFields; - return this; + return asBuilder(); } } @@ -350,7 +350,7 @@ public class SyslogAppender extends SocketAppender { * @deprecated Use {@link #newSyslogAppenderBuilder()}. */ @Deprecated - public static SyslogAppender createAppender( + public static <B extends Builder<B>> SyslogAppender createAppender( // @formatter:off final String host, final int port, @@ -386,7 +386,7 @@ public class SyslogAppender extends SocketAppender { // @formatter:on // @formatter:off - return newSyslogAppenderBuilder() + return SyslogAppender.<B>newSyslogAppenderBuilder() .withHost(host) .withPort(port) .withProtocol(EnglishEnums.valueOf(Protocol.class, protocolStr)) @@ -423,8 +423,8 @@ public class SyslogAppender extends SocketAppender { // Calling this method newBuilder() does not compile @PluginBuilderFactory - public static Builder newSyslogAppenderBuilder() { - return new Builder(); + public static <B extends Builder<B>> B newSyslogAppenderBuilder() { + return new Builder<B>().asBuilder(); } }
