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/10 05:07:26 UTC
logging-log4j2 git commit: To avoid type casting from Category to
Logger,
some package private methods now return Logger instead of Category. FYI:
Logger extends Category.
Repository: logging-log4j2
Updated Branches:
refs/heads/master cbab41909 -> a3e40e187
To avoid type casting from Category to Logger, some package private
methods now return Logger instead of Category. FYI: Logger extends
Category.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a3e40e18
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a3e40e18
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a3e40e18
Branch: refs/heads/master
Commit: a3e40e1877f225e60a318bbb7913a027f46de507
Parents: cbab419
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 9 20:07:24 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 9 20:07:24 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/log4j/Category.java | 9 ++++-----
.../src/main/java/org/apache/log4j/LogManager.java | 14 +++++++-------
.../src/main/java/org/apache/log4j/Logger.java | 8 ++++----
3 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3e40e18/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
index 289e09b..7bb4916 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
@@ -78,11 +78,11 @@ public class Category {
return getInstance(PrivateManager.getContext(), name, loggerFactory);
}
- static Category getInstance(final LoggerContext context, final String name) {
+ static Logger getInstance(final LoggerContext context, final String name) {
return getInstance(context, name, loggerFactory);
}
- static Category getInstance(final LoggerContext context, final String name, final LoggerFactory factory) {
+ static Logger getInstance(final LoggerContext context, final String name, final LoggerFactory factory) {
final ConcurrentMap<String, Logger> loggers = getLoggersMap(context);
Logger logger = loggers.get(name);
if (logger != null) {
@@ -97,7 +97,7 @@ public class Category {
return getInstance(clazz.getName());
}
- static Category getInstance(final LoggerContext context, @SuppressWarnings("rawtypes") final Class clazz) {
+ static Logger getInstance(final LoggerContext context, @SuppressWarnings("rawtypes") final Class clazz) {
return getInstance(context, clazz.getName());
}
@@ -123,8 +123,7 @@ public class Category {
return getInstance(Strings.EMPTY);
}
-
- static Category getRoot(final LoggerContext context) {
+ static Logger getRoot(final LoggerContext context) {
return getInstance(context, Strings.EMPTY);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3e40e18/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
index b36eaea..d2d9894 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
@@ -67,19 +67,19 @@ public final class LogManager {
}
public static Logger getRootLogger() {
- return (Logger) Category.getInstance(PrivateManager.getContext(), Strings.EMPTY);
+ return Category.getInstance(PrivateManager.getContext(), Strings.EMPTY);
}
public static Logger getLogger(final String name) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name);
+ return Category.getInstance(PrivateManager.getContext(), name);
}
public static Logger getLogger(@SuppressWarnings("rawtypes") final Class clazz) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), clazz.getName());
+ return Category.getInstance(PrivateManager.getContext(), clazz.getName());
}
public static Logger getLogger(final String name, final LoggerFactory factory) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name);
+ return Category.getInstance(PrivateManager.getContext(), name);
}
public static Logger exists(final String name) {
@@ -162,17 +162,17 @@ public final class LogManager {
@Override
public Logger getLogger(final String name) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name);
+ return Category.getInstance(PrivateManager.getContext(), name);
}
@Override
public Logger getLogger(final String name, final LoggerFactory factory) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name);
+ return Category.getInstance(PrivateManager.getContext(), name);
}
@Override
public Logger getRootLogger() {
- return (Logger) Category.getRoot(PrivateManager.getContext());
+ return Category.getRoot(PrivateManager.getContext());
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a3e40e18/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
index e30cc15..fb7277b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
@@ -34,19 +34,19 @@ public class Logger extends Category {
}
public static Logger getLogger(final String name) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name);
+ return Category.getInstance(PrivateManager.getContext(), name);
}
public static Logger getLogger(final Class<?> clazz) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), clazz);
+ return Category.getInstance(PrivateManager.getContext(), clazz);
}
public static Logger getRootLogger() {
- return (Logger) Category.getRoot(PrivateManager.getContext());
+ return Category.getRoot(PrivateManager.getContext());
}
public static Logger getLogger(final String name, final LoggerFactory factory) {
- return (Logger) Category.getInstance(PrivateManager.getContext(), name, factory);
+ return Category.getInstance(PrivateManager.getContext(), name, factory);
}
/**