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 2015/08/26 21:13:20 UTC
logging-log4j2 git commit: Use Generics to avoid type casting.
Repository: logging-log4j2
Updated Branches:
refs/heads/master edfdd8888 -> 288f34bc1
Use Generics to avoid type casting.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/288f34bc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/288f34bc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/288f34bc
Branch: refs/heads/master
Commit: 288f34bc1a54980479926e26c1b488e949b6696c
Parents: edfdd88
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 26 12:13:17 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 26 12:13:17 2015 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/appender/RollingFileAppender.java | 2 +-
.../logging/log4j/core/appender/rolling/RollingFileManager.java | 5 +++--
.../logging/log4j/core/config/AbstractLog4j2_1100Test.java | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/288f34bc/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 38e17d8..d538a63 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
@@ -108,7 +108,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
* Returns the triggering policy
* @return The TriggeringPolicy
*/
- public TriggeringPolicy getTriggeringPolicy() {
+ public <T extends TriggeringPolicy> T getTriggeringPolicy() {
return getManager().getTriggeringPolicy();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/288f34bc/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 b66c62c..72ee965 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
@@ -139,8 +139,9 @@ public class RollingFileManager extends FileManager {
* Returns the triggering policy
* @return The TriggeringPolicy
*/
- public TriggeringPolicy getTriggeringPolicy() {
- return this.triggeringPolicy;
+ public <T extends TriggeringPolicy> T getTriggeringPolicy() {
+ // TODO We could parameterize this class with a TriggeringPolicy instead of type casting here.
+ return (T) this.triggeringPolicy;
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/288f34bc/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java
index 4bf5acf..89b0904 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AbstractLog4j2_1100Test.java
@@ -43,8 +43,7 @@ public abstract class AbstractLog4j2_1100Test {
assertNotNull(configuration);
final RollingFileAppender appender = configuration.getAppender("File");
assertNotNull(appender);
- final CompositeTriggeringPolicy compositeTriggeringPolicy = (CompositeTriggeringPolicy) appender
- .getTriggeringPolicy();
+ final CompositeTriggeringPolicy compositeTriggeringPolicy = appender.getTriggeringPolicy();
assertNotNull(compositeTriggeringPolicy);
final TriggeringPolicy[] triggeringPolicies = compositeTriggeringPolicy.getTriggeringPolicies();
SizeBasedTriggeringPolicy sizeBasedTriggeringPolicy = null;