API tools faq
paste
ggregory

LoggerContext access sans type casts

ggregory
Aug 9th, 2015
238
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 74.12 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
  2. index 74f977a..99bd5a2 100644
  3. --- a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
  4. +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
  5. @@ -18,7 +18,6 @@
  6.  
  7.  import java.io.StringWriter;
  8.  
  9. -import org.apache.logging.log4j.LogManager;
  10.  import org.apache.logging.log4j.core.LoggerContext;
  11.  import org.apache.logging.log4j.core.config.Configurator;
  12.  import org.apache.logging.log4j.status.StatusLogger;
  13. @@ -38,7 +37,7 @@
  14.      
  15.      @BeforeClass
  16.      public static void setupClass() {
  17. -        context = (LoggerContext) LogManager.getContext(false);
  18. +        context = LoggerContext.getContext(false);
  19.      }
  20.  
  21.      @AfterClass
  22. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java
  23. index 07a8c74..3e46c42 100644
  24. --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java
  25. +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java
  26. @@ -18,8 +18,6 @@
  27.  
  28.  import java.util.EventListener;
  29.  
  30. -import org.apache.logging.log4j.LogManager;
  31. -
  32.  /**
  33.   * Base class for server classes that listen to {@link LogEvent}s.
  34.   * TODO (MS) How is this class any different from Appender?
  35. @@ -29,7 +27,7 @@
  36.      private final LoggerContext context;
  37.  
  38.      protected LogEventListener() {
  39. -        context = (LoggerContext) LogManager.getContext(false);
  40. +        context = LoggerContext.getContext(false);
  41.      }
  42.  
  43.      public void log(final LogEvent event) {
  44. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
  45. index c61c764..0722323 100644
  46. --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
  47. +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
  48. @@ -63,6 +63,64 @@
  49.      public static final String PROPERTY_CONFIG = "config";
  50.      private static final Configuration NULL_CONFIGURATION = new NullConfiguration();
  51.  
  52. +    /**
  53. +     * Returns the current LoggerContext.
  54. +     * <p>
  55. +     * Avoids the type cast for:
  56. +     *</p>
  57. +     *<pre>(LoggerContext) LogManager.getContext();</pre>
  58. +     *
  59. +     * <p>
  60. +     * WARNING - The LoggerContext returned by this method may not be the LoggerContext used to create a Logger
  61. +     * for the calling class.
  62. +     * </p>
  63. +     * @return  The current LoggerContext.
  64. +     * @see LogManager#getContext()
  65. +     */
  66. +    public static LoggerContext getContext() {
  67. +        return (LoggerContext) LogManager.getContext();
  68. +    }
  69. +
  70. +    /**
  71. +     * Returns a LoggerContext.
  72. +     * <p>
  73. +     * Avoids the type cast for:
  74. +     *</p>
  75. +     *<pre>(LoggerContext) LogManager.getContext(currentContext);</pre>
  76. +     *
  77. +     * @param currentContext if false the LoggerContext appropriate for the caller of this method is returned. For
  78. +     * example, in a web application if the caller is a class in WEB-INF/lib then one LoggerContext may be
  79. +     * returned and if the caller is a class in the container's classpath then a different LoggerContext may be
  80. +     * returned. If true then only a single LoggerContext will be returned.
  81. +     * @return a LoggerContext.
  82. +     * @see LogManager#getContext(boolean)
  83. +     */
  84. +    public static LoggerContext getContext(final boolean currentContext) {
  85. +        return (LoggerContext) LogManager.getContext(currentContext);
  86. +    }
  87. +
  88. +    /**
  89. +     * Returns a LoggerContext.
  90. +     * <p>
  91. +     * Avoids the type cast for:
  92. +     *</p>
  93. +     *<pre>(LoggerContext) LogManager.getContext(loader, currentContext, configLocation);</pre>
  94. +     *
  95. +     * @param loader The ClassLoader for the context. If null the context will attempt to determine the appropriate
  96. +     * ClassLoader.
  97. +     * @param currentContext if false the LoggerContext appropriate for the caller of this method is returned. For
  98. +     * example, in a web application if the caller is a class in WEB-INF/lib then one LoggerContext may be
  99. +     * returned and if the caller is a class in the container's classpath then a different LoggerContext may be
  100. +     * returned. If true then only a single LoggerContext will be returned.
  101. +     * @param configLocation The URI for the configuration to use.
  102. +     * @return a LoggerContext.
  103. +     * @see LogManager#getContext(ClassLoader, boolean, URI)
  104. +     */
  105. +    public static LoggerContext getContext(final ClassLoader loader, final boolean currentContext,
  106. +            final URI configLocation) {
  107. +        return (LoggerContext) LogManager.getContext(loader, currentContext, configLocation);
  108. +    }
  109. +
  110.      private final ConcurrentMap<String, Logger> loggers = new ConcurrentHashMap<>();
  111.      private final CopyOnWriteArrayList<PropertyChangeListener> propertyChangeListeners = new CopyOnWriteArrayList<>();
  112.  
  113. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
  114. index 33ea726..132d047 100644
  115. --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
  116. +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
  117. @@ -167,7 +167,7 @@
  118.       * @param level the new level
  119.       */
  120.      public static void setLevel(final String loggerName, final Level level) {
  121. -        final LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
  122. +        final LoggerContext loggerContext = LoggerContext.getContext(false);
  123.          final LoggerConfig loggerConfig = loggerContext.getConfiguration().getLoggerConfig(loggerName);
  124.          setLevel(loggerContext, loggerConfig, level);
  125.      }
  126. @@ -177,7 +177,7 @@
  127.       * @param level the new level
  128.       */
  129.      public static void setRootLevel(final Level level) {
  130. -        final LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
  131. +        final LoggerContext loggerContext = LoggerContext.getContext(false);
  132.          final LoggerConfig loggerConfig = loggerContext.getConfiguration().getRootLogger();
  133.          setLevel(loggerContext, loggerConfig, level);
  134.      }
  135. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
  136. index 016ba9a..03d1575 100644
  137. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
  138. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
  139. @@ -21,7 +21,6 @@
  140.  
  141.  import java.io.File;
  142.  
  143. -import org.apache.logging.log4j.LogManager;
  144.  import org.apache.logging.log4j.core.config.Configuration;
  145.  import org.apache.logging.log4j.core.config.Configurator;
  146.  import org.apache.logging.log4j.core.config.DefaultConfiguration;
  147. @@ -41,7 +40,7 @@
  148.  
  149.      @BeforeClass
  150.      public static void setupClass() {
  151. -        context = (LoggerContext) LogManager.getContext(false);
  152. +        context = LoggerContext.getContext(false);
  153.      }
  154.  
  155.      @AfterClass
  156. @@ -56,12 +55,12 @@
  157.          assertNotNull("No configuration", cfg);
  158.          assertTrue("Not set to default configuration", cfg instanceof DefaultConfiguration);
  159.          final File file = new File(CONFIG);
  160. -        final LoggerContext loggerContext = (LoggerContext) LogManager.getContext(null, false, file.toURI());
  161. +        final LoggerContext loggerContext = LoggerContext.getContext(null, false, file.toURI());
  162.          assertNotNull("No Logger Context", loggerContext);
  163.          final Configuration newConfig = loggerContext.getConfiguration();
  164.          assertTrue("Configuration not reset", cfg != newConfig);
  165.          assertTrue("Reconfiguration failed", newConfig instanceof XmlConfiguration);
  166. -        context = (LoggerContext) LogManager.getContext(false);
  167. +        context = LoggerContext.getContext(false);
  168.          final Configuration sameConfig = context.getConfiguration();
  169.          assertTrue("Configuration should not have been reset", newConfig == sameConfig);
  170.      }
  171. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
  172. index 5d9772c..e6ff19c 100644
  173. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
  174. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
  175. @@ -52,7 +52,7 @@
  176.          List<LogEvent> events = app.getEvents();
  177.          assertEquals("Incorrect number of events. Expected 1, actual " + events.size(), 1, events.size());
  178.          app.clear();
  179. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  180. +        final LoggerContext ctx = LoggerContext.getContext(false);
  181.          final Configuration config = ctx.getConfiguration();
  182.          final LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
  183.          /* You could also specify the actual logger name as below and it will return the LoggerConfig used by the Logger.
  184. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
  185. index d4872eb..895e649 100644
  186. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
  187. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
  188. @@ -44,7 +44,7 @@
  189.      @BeforeClass
  190.      public static void setupClass() {
  191.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  192. -        ctx = (LoggerContext) LogManager.getContext(false);
  193. +        ctx = LoggerContext.getContext(false);
  194.          config = ctx.getConfiguration();
  195.          listAppender = (ListAppender) config.getAppender("List");
  196.      }
  197. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
  198. index 3b34cd5..cad76bc 100644
  199. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
  200. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderLocationTest.java
  201. @@ -69,7 +69,7 @@
  202.              log.warn("Test log2");
  203.              assertEquals("not grown", expectedFileLength, f.length());
  204.          } finally {
  205. -            ((LoggerContext) LogManager.getContext(false)).stop();
  206. +            (LoggerContext.getContext(false)).stop();
  207.          }
  208.          final int LINESEP = System.getProperty("line.separator").length();
  209.          assertEquals("Shrunk to actual used size", 474 + 2 * LINESEP, f.length());
  210. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
  211. index 58a2db6..3257fc6 100644
  212. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
  213. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
  214. @@ -69,7 +69,7 @@
  215.              log.warn(new String(text));
  216.              assertEquals("grown again", 256 * 3, f.length());
  217.          } finally {
  218. -            ((LoggerContext) LogManager.getContext(false)).stop();
  219. +            (LoggerContext.getContext(false)).stop();
  220.          }
  221.          final int LINESEP = System.getProperty("line.separator").length();
  222.          assertEquals("Shrunk to actual used size", 658 + 3 * LINESEP, f.length());
  223. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
  224. index 2c06ab5..b444203 100644
  225. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
  226. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
  227. @@ -64,7 +64,7 @@
  228.              log.warn("Test log2");
  229.              assertEquals("not grown", MemoryMappedFileManager.DEFAULT_REGION_LENGTH, f.length());
  230.          } finally {
  231. -            ((LoggerContext) LogManager.getContext(false)).stop();
  232. +            (LoggerContext.getContext(false)).stop();
  233.          }
  234.          final int LINESEP = System.getProperty("line.separator").length();
  235.          assertEquals("Shrunk to actual used size", 186 + 2 * LINESEP, f.length());
  236. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
  237. index 722b3ba..f433a40 100644
  238. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
  239. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
  240. @@ -26,7 +26,6 @@
  241.  import org.apache.logging.dumbster.smtp.SimpleSmtpServer;
  242.  import org.apache.logging.dumbster.smtp.SmtpMessage;
  243.  import org.apache.logging.log4j.Level;
  244. -import org.apache.logging.log4j.LogManager;
  245.  import org.apache.logging.log4j.core.Logger;
  246.  import org.apache.logging.log4j.core.LoggerContext;
  247.  import org.apache.logging.log4j.core.net.MimeMessageBuilder;
  248. @@ -137,7 +136,7 @@
  249.                  HOST, PORT, null, null, "false", "3", null, null, "true");
  250.          appender.start();
  251.  
  252. -        final LoggerContext context = (LoggerContext) LogManager.getContext();
  253. +        final LoggerContext context = LoggerContext.getContext();
  254.          final Logger root = context.getLogger("SMTPAppenderTest");
  255.          root.addAppender(appender);
  256.          root.setAdditive(false);
  257. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
  258. index eeb9b75..472fb18 100644
  259. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
  260. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
  261. @@ -36,7 +36,6 @@
  262.  import java.util.concurrent.TimeUnit;
  263.  
  264.  import org.apache.logging.log4j.Level;
  265. -import org.apache.logging.log4j.LogManager;
  266.  import org.apache.logging.log4j.LoggingException;
  267.  import org.apache.logging.log4j.ThreadContext;
  268.  import org.apache.logging.log4j.core.Appender;
  269. @@ -66,7 +65,7 @@
  270.      private static TCPSocketServer tcpServer;
  271.      private static UDPSocketServer udpServer;
  272.  
  273. -    LoggerContext context = (LoggerContext) LogManager.getContext();
  274. +    LoggerContext context = LoggerContext.getContext();
  275.      Logger root = context.getLogger("SocketAppenderTest");
  276.  
  277.      private static int tcpCount = 0;
  278. @@ -78,7 +77,7 @@
  279.          tcpServer.start();
  280.          udpServer = new UDPSocketServer();
  281.          udpServer.start();
  282. -        ((LoggerContext) LogManager.getContext()).reconfigure();
  283. +        (LoggerContext.getContext()).reconfigure();
  284.      }
  285.  
  286.      @AfterClass
  287. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
  288. index c62b135..c1e1023 100644
  289. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
  290. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
  291. @@ -22,7 +22,6 @@
  292.  import java.util.Map;
  293.  
  294.  import org.apache.logging.log4j.Level;
  295. -import org.apache.logging.log4j.LogManager;
  296.  import org.apache.logging.log4j.MarkerManager;
  297.  import org.apache.logging.log4j.ThreadContext;
  298.  import org.apache.logging.log4j.core.Appender;
  299. @@ -39,7 +38,7 @@
  300.      protected static final String line1 =
  301.              "TestApp - Audit [Transfer@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"]" +
  302.                      "[RequestContext@18060 ipAddress=\"192.168.0.120\" loginId=\"JohnDoe\"] Transfer Complete";
  303. -    protected LoggerContext ctx = (LoggerContext) LogManager.getContext();
  304. +    protected LoggerContext ctx = LoggerContext.getContext();
  305.      protected static final int DEFAULT_TIMEOUT_IN_MS = 100;
  306.      protected static final int PORTNUM = 8199;
  307.      protected MockSyslogServer syslogServer;
  308. @@ -50,7 +49,7 @@
  309.  
  310.      @BeforeClass
  311.      public static void setupClass() throws Exception {
  312. -        ((LoggerContext) LogManager.getContext()).reconfigure();
  313. +        (LoggerContext.getContext()).reconfigure();
  314.      }
  315.  
  316.      protected void sendAndCheckLegacyBSDMessages(final List<String> messagesToSend) throws InterruptedException {
  317. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
  318. index 17dac28..b66fba8 100644
  319. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
  320. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
  321. @@ -66,7 +66,7 @@
  322.          }
  323.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
  324.                  "org/apache/logging/log4j/core/appender/db/jdbc/" + configFileName);
  325. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  326. +        final LoggerContext context = LoggerContext.getContext(false);
  327.          if (context.getConfiguration() instanceof DefaultConfiguration) {
  328.              context.reconfigure();
  329.          }
  330. @@ -75,7 +75,7 @@
  331.  
  332.      @After
  333.      public void tearDown() throws SQLException {
  334. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  335. +        final LoggerContext context = LoggerContext.getContext(false);
  336.          try {
  337.              final Appender appender = context.getConfiguration().getAppender("databaseAppender");
  338.              assertNotNull("The appender should not be null.", appender);
  339. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
  340. index 9c0cf92..7da9cb5 100644
  341. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
  342. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
  343. @@ -26,7 +26,6 @@
  344.  import javax.sql.DataSource;
  345.  
  346.  import org.apache.logging.log4j.Level;
  347. -import org.apache.logging.log4j.LogManager;
  348.  import org.apache.logging.log4j.core.LoggerContext;
  349.  import org.apache.logging.log4j.core.config.ConfigurationFactory;
  350.  import org.apache.logging.log4j.status.StatusLogger;
  351. @@ -67,7 +66,7 @@
  352.      @BeforeClass
  353.      public static void beforeClass() {
  354.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  355. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  356. +        final LoggerContext ctx = LoggerContext.getContext();
  357.          ctx.reconfigure();
  358.          final StatusLogger logger = StatusLogger.getLogger();
  359.          logger.setLevel(Level.FATAL);
  360. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
  361. index f4c96ea..cb02543 100644
  362. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
  363. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
  364. @@ -22,7 +22,6 @@
  365.  import javax.sql.DataSource;
  366.  
  367.  import org.apache.logging.log4j.Level;
  368. -import org.apache.logging.log4j.LogManager;
  369.  import org.apache.logging.log4j.core.LoggerContext;
  370.  import org.apache.logging.log4j.core.config.ConfigurationFactory;
  371.  import org.apache.logging.log4j.status.StatusLogger;
  372. @@ -43,7 +42,7 @@
  373.      @BeforeClass
  374.      public static void beforeClass() {
  375.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  376. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  377. +        final LoggerContext ctx = LoggerContext.getContext();
  378.          ctx.reconfigure();
  379.          final StatusLogger logger = StatusLogger.getLogger();
  380.          logger.setLevel(Level.FATAL);
  381. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
  382. index 640a32d..8fb2aaa 100644
  383. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
  384. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
  385. @@ -49,7 +49,7 @@
  386.  
  387.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
  388.                  "org/apache/logging/log4j/core/appender/db/jpa/" + configFileName);
  389. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  390. +        final LoggerContext context = LoggerContext.getContext(false);
  391.          if (context.getConfiguration() instanceof DefaultConfiguration) {
  392.              context.reconfigure();
  393.          }
  394. @@ -57,7 +57,7 @@
  395.      }
  396.  
  397.      public void tearDown() throws SQLException {
  398. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  399. +        final LoggerContext context = LoggerContext.getContext(false);
  400.          try {
  401.              final Appender appender = context.getConfiguration().getAppender("databaseAppender");
  402.              assertNotNull("The appender should not be null.", appender);
  403. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
  404. index 9394434..2d6bf8f 100644
  405. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
  406. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
  407. @@ -43,7 +43,7 @@
  408.      public static void setupClass() {
  409.          deleteDir();
  410.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  411. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  412. +        final LoggerContext ctx = LoggerContext.getContext();
  413.          final Configuration config = ctx.getConfiguration();
  414.      }
  415.  
  416. @@ -51,7 +51,7 @@
  417.      public static void cleanupClass() {
  418.          //deleteDir();
  419.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  420. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  421. +        final LoggerContext ctx = LoggerContext.getContext();
  422.          ctx.reconfigure();
  423.          StatusLogger.getLogger().reset();
  424.      }
  425. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
  426. index 9a3af8f..41d995b 100644
  427. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
  428. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java
  429. @@ -19,7 +19,6 @@
  430.  import java.io.File;
  431.  import java.io.IOException;
  432.  
  433. -import org.apache.logging.log4j.LogManager;
  434.  import org.apache.logging.log4j.core.LoggerContext;
  435.  import org.apache.logging.log4j.core.appender.RollingFileAppender;
  436.  import org.apache.logging.log4j.core.config.Configuration;
  437. @@ -34,7 +33,7 @@
  438.       */
  439.      @Test
  440.      public void testAccessManager() throws IOException {
  441. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  442. +        final LoggerContext ctx = LoggerContext.getContext(false);
  443.          final Configuration config = ctx.getConfiguration();
  444.          final File file = File.createTempFile("RollingFileAppenderAccessTest", ".tmp");
  445.          file.deleteOnExit();
  446. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
  447. index 92c9a27..03895ec 100644
  448. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
  449. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
  450. @@ -19,7 +19,6 @@
  451.  import java.io.File;
  452.  import java.util.List;
  453.  import org.apache.logging.log4j.EventLogger;
  454. -import org.apache.logging.log4j.LogManager;
  455.  import org.apache.logging.log4j.core.LogEvent;
  456.  import org.apache.logging.log4j.core.LoggerContext;
  457.  import org.apache.logging.log4j.core.config.Configuration;
  458. @@ -45,7 +44,7 @@
  459.      @BeforeClass
  460.      public static void setupClass() {
  461.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  462. -        ctx = (LoggerContext) LogManager.getContext(false);
  463. +        ctx = LoggerContext.getContext(false);
  464.          config = ctx.getConfiguration();
  465.          listAppender = (ListAppender) config.getAppender("List");
  466.          final File file = new File("target/rolling1/rollingtest-Unknown.log");
  467. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
  468. index 4c37980..ccb29f6 100644
  469. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
  470. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java
  471. @@ -19,7 +19,6 @@
  472.  import java.io.File;
  473.  import java.util.List;
  474.  import org.apache.logging.log4j.EventLogger;
  475. -import org.apache.logging.log4j.LogManager;
  476.  import org.apache.logging.log4j.core.LogEvent;
  477.  import org.apache.logging.log4j.core.LoggerContext;
  478.  import org.apache.logging.log4j.core.config.Configuration;
  479. @@ -45,7 +44,7 @@
  480.      @BeforeClass
  481.      public static void setupClass() {
  482.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  483. -        ctx = (LoggerContext) LogManager.getContext(false);
  484. +        ctx = LoggerContext.getContext(false);
  485.          config = ctx.getConfiguration();
  486.          listAppender = (ListAppender) config.getAppender("List");
  487.          final File file = new File("target/rolling1/rollingtest-Unknown.log");
  488. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
  489. index 30577d5..9ca57e8 100644
  490. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
  491. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
  492. @@ -47,7 +47,7 @@
  493.          final String msg = "Message before reconfig";
  494.          log.info(msg);
  495.  
  496. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  497. +        final LoggerContext ctx = LoggerContext.getContext(false);
  498.          ctx.reconfigure();
  499.          ctx.reconfigure();
  500.          
  501. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
  502. index 70557c9..0ae3895 100644
  503. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
  504. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncAppenderTest.java
  505. @@ -42,7 +42,7 @@
  506.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
  507.                  "AsyncLoggersWithAsyncAppenderTest.xml");
  508.          System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, AsyncLoggerContextSelector.class.getName());
  509. -        ctx = (LoggerContext) LogManager.getContext(false);
  510. +        ctx = LoggerContext.getContext(false);
  511.          config = ctx.getConfiguration();
  512.          listAppender = (ListAppender) config.getAppender("List");
  513.      }
  514. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
  515. index 23f5e97..816e393 100644
  516. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
  517. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggersWithAsyncLoggerConfigTest.java
  518. @@ -42,7 +42,7 @@
  519.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
  520.                  "AsyncLoggersWithAsyncLoggerConfigTest.xml");
  521.          System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, AsyncLoggerContextSelector.class.getName());
  522. -        ctx = (LoggerContext) LogManager.getContext(false);
  523. +        ctx = LoggerContext.getContext(false);
  524.          config = ctx.getConfiguration();
  525.          listAppender = (ListAppender) config.getAppender("List");
  526.      }
  527. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
  528. index fec31cf..ad2ad7c 100644
  529. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
  530. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
  531. @@ -19,7 +19,6 @@
  532.  import java.io.File;
  533.  import java.util.Map;
  534.  
  535. -import org.apache.logging.log4j.LogManager;
  536.  import org.apache.logging.log4j.core.LoggerContext;
  537.  import org.apache.logging.log4j.core.config.xml.XmlConfiguration;
  538.  import org.apache.logging.log4j.status.StatusLogger;
  539. @@ -42,7 +41,7 @@
  540.          final File file = new File(STATUS_LOG);
  541.          file.delete();
  542.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  543. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  544. +        final LoggerContext ctx = LoggerContext.getContext();
  545.          final Configuration config = ctx.getConfiguration();
  546.          if (config instanceof XmlConfiguration) {
  547.              final String name = config.getName();
  548. @@ -57,7 +56,7 @@
  549.      @AfterClass
  550.      public static void cleanupClass() {
  551.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  552. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  553. +        final LoggerContext ctx = LoggerContext.getContext();
  554.          ctx.reconfigure();
  555.          StatusLogger.getLogger().reset();
  556.          final File file = new File(STATUS_LOG);
  557. @@ -101,7 +100,7 @@
  558.      public void testAdvertisementsRemovedOnConfigStop() {
  559.          verifyExpectedEntriesAdvertised(InMemoryAdvertiser.getAdvertisedEntries());
  560.  
  561. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  562. +        final LoggerContext ctx = LoggerContext.getContext();
  563.          ctx.stop();
  564.  
  565.          final Map<Object, Map<String, String>> entries = InMemoryAdvertiser.getAdvertisedEntries();
  566. @@ -115,7 +114,7 @@
  567.      public void testAdvertisementsAddedOnReconfigAfterStop() {
  568.          verifyExpectedEntriesAdvertised(InMemoryAdvertiser.getAdvertisedEntries());
  569.  
  570. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  571. +        final LoggerContext ctx = LoggerContext.getContext();
  572.          ctx.stop();
  573.  
  574.          final Map<Object, Map<String, String>> entries = InMemoryAdvertiser.getAdvertisedEntries();
  575. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java
  576. index 0b3183d..37781a9 100644
  577. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java
  578. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java
  579. @@ -16,7 +16,6 @@
  580.   */
  581.  package org.apache.logging.log4j.core.config.xml;
  582.  
  583. -import org.apache.logging.log4j.LogManager;
  584.  import org.apache.logging.log4j.core.LoggerContext;
  585.  import org.apache.logging.log4j.core.config.Configuration;
  586.  import org.apache.logging.log4j.core.config.ConfigurationFactory;
  587. @@ -38,7 +37,7 @@
  588.      @AfterClass
  589.      public static void cleanupClass() {
  590.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  591. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  592. +        final LoggerContext ctx = LoggerContext.getContext();
  593.          ctx.reconfigure();
  594.          StatusLogger.getLogger().reset();
  595.      }
  596. @@ -46,7 +45,7 @@
  597.      @Test
  598.      public void testNoProps() {
  599.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  600. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  601. +        final LoggerContext ctx = LoggerContext.getContext();
  602.          ctx.reconfigure();
  603.          final Configuration config = ctx.getConfiguration();
  604.          assertTrue("Configuration is not an XmlConfiguration", config instanceof XmlConfiguration);
  605. @@ -58,7 +57,7 @@
  606.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG1);
  607.          System.setProperty(Constants.LOG4J_DEFAULT_STATUS_LEVEL, "WARN");
  608.          try {
  609. -            final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  610. +            final LoggerContext ctx = LoggerContext.getContext();
  611.              ctx.reconfigure();
  612.              final Configuration config = ctx.getConfiguration();
  613.              assertTrue("Configuration is not an XmlConfiguration", config instanceof XmlConfiguration);
  614. @@ -72,7 +71,7 @@
  615.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  616.          System.setProperty("log4j.level", "warn");
  617.          try {
  618. -            final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  619. +            final LoggerContext ctx = LoggerContext.getContext();
  620.              ctx.reconfigure();
  621.              final Configuration config = ctx.getConfiguration();
  622.              assertTrue("Configuration is not an XmlConfiguration", config instanceof XmlConfiguration);
  623. @@ -88,7 +87,7 @@
  624.          System.setProperty("log4j.level", "warn");
  625.          System.setProperty("log.level", "warn");
  626.          try {
  627. -            final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  628. +            final LoggerContext ctx = LoggerContext.getContext();
  629.              ctx.reconfigure();
  630.              final Configuration config = ctx.getConfiguration();
  631.              assertTrue("Configuration is not an XmlConfiguration", config instanceof XmlConfiguration);
  632. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
  633. index 9f0859a..61a9a46 100644
  634. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
  635. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
  636. @@ -24,7 +24,6 @@
  637.  import java.util.Map;
  638.  
  639.  import org.apache.logging.log4j.Level;
  640. -import org.apache.logging.log4j.LogManager;
  641.  import org.apache.logging.log4j.ThreadContext;
  642.  import org.apache.logging.log4j.core.Filter;
  643.  import org.apache.logging.log4j.core.LogEvent;
  644. @@ -45,7 +44,7 @@
  645.  
  646.      @After
  647.      public void cleanup() {
  648. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  649. +        final LoggerContext ctx = LoggerContext.getContext(false);
  650.          ctx.reconfigure();
  651.          StatusLogger.getLogger().reset();
  652.      }
  653. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java
  654. index fa8ec07..56ddbc0 100644
  655. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java
  656. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java
  657. @@ -44,7 +44,7 @@
  658.  
  659.      @After
  660.      public void cleanup() {
  661. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  662. +        final LoggerContext ctx = LoggerContext.getContext(false);
  663.          ctx.reconfigure();
  664.          StatusLogger.getLogger().reset();
  665.      }
  666. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java
  667. index 19a35dc..2aa7eda 100644
  668. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java
  669. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java
  670. @@ -27,7 +27,6 @@
  671.  
  672.  import org.apache.commons.io.IOUtils;
  673.  import org.apache.logging.log4j.Level;
  674. -import org.apache.logging.log4j.LogManager;
  675.  import org.apache.logging.log4j.ThreadContext;
  676.  import org.apache.logging.log4j.core.Appender;
  677.  import org.apache.logging.log4j.core.BasicConfigurationFactory;
  678. @@ -70,11 +69,11 @@
  679.      public static void setupClass() {
  680.          ThreadContext.clearAll();
  681.          ConfigurationFactory.setConfigurationFactory(configFactory);
  682. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  683. +        final LoggerContext ctx = LoggerContext.getContext();
  684.          ctx.reconfigure();
  685.      }
  686.  
  687. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  688. +    LoggerContext ctx = LoggerContext.getContext();
  689.  
  690.      Logger root = ctx.getLogger("");
  691.  
  692. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
  693. index 7e02455..7253b56 100644
  694. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
  695. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
  696. @@ -21,7 +21,6 @@
  697.  import java.util.Map;
  698.  
  699.  import org.apache.logging.log4j.Level;
  700. -import org.apache.logging.log4j.LogManager;
  701.  import org.apache.logging.log4j.ThreadContext;
  702.  import org.apache.logging.log4j.core.Appender;
  703.  import org.apache.logging.log4j.core.BasicConfigurationFactory;
  704. @@ -39,7 +38,7 @@
  705.   *
  706.   */
  707.  public class HtmlLayoutTest {
  708. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  709. +    LoggerContext ctx = LoggerContext.getContext();
  710.      Logger root = ctx.getLogger("");
  711.  
  712.      static ConfigurationFactory cf = new BasicConfigurationFactory();
  713. @@ -48,7 +47,7 @@
  714.      public static void setupClass() {
  715.          ThreadContext.clearAll();
  716.          ConfigurationFactory.setConfigurationFactory(cf);
  717. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  718. +        final LoggerContext ctx = LoggerContext.getContext();
  719.          ctx.reconfigure();
  720.      }
  721.  
  722. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
  723. index 170d0e3..87b075c 100644
  724. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
  725. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
  726. @@ -25,7 +25,6 @@
  727.  import java.util.Map;
  728.  
  729.  import org.apache.logging.log4j.Level;
  730. -import org.apache.logging.log4j.LogManager;
  731.  import org.apache.logging.log4j.ThreadContext;
  732.  import org.apache.logging.log4j.core.Appender;
  733.  import org.apache.logging.log4j.core.BasicConfigurationFactory;
  734. @@ -61,11 +60,11 @@
  735.      public static void setupClass() {
  736.          ThreadContext.clearAll();
  737.          ConfigurationFactory.setConfigurationFactory(cf);
  738. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  739. +        final LoggerContext ctx = LoggerContext.getContext();
  740.          ctx.reconfigure();
  741.      }
  742.  
  743. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  744. +    LoggerContext ctx = LoggerContext.getContext();
  745.  
  746.      Logger rootLogger = this.ctx.getLogger("");
  747.  
  748. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
  749. index 6707ee8..3de533c 100644
  750. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
  751. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
  752. @@ -24,7 +24,6 @@
  753.  import java.nio.charset.StandardCharsets;
  754.  
  755.  import org.apache.logging.log4j.Level;
  756. -import org.apache.logging.log4j.LogManager;
  757.  import org.apache.logging.log4j.ThreadContext;
  758.  import org.apache.logging.log4j.core.BasicConfigurationFactory;
  759.  import org.apache.logging.log4j.core.LogEvent;
  760. @@ -55,11 +54,11 @@
  761.      @BeforeClass
  762.      public static void setupClass() {
  763.          ConfigurationFactory.setConfigurationFactory(cf);
  764. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  765. +        final LoggerContext ctx = LoggerContext.getContext();
  766.          ctx.reconfigure();
  767.      }
  768.  
  769. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  770. +    LoggerContext ctx = LoggerContext.getContext();
  771.  
  772.      Logger root = ctx.getLogger("");
  773.  
  774. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
  775. index f2deedb..f310846 100644
  776. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
  777. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
  778. @@ -21,7 +21,6 @@
  779.  import java.util.Locale;
  780.  
  781.  import org.apache.logging.log4j.Level;
  782. -import org.apache.logging.log4j.LogManager;
  783.  import org.apache.logging.log4j.MarkerManager;
  784.  import org.apache.logging.log4j.ThreadContext;
  785.  import org.apache.logging.log4j.core.Appender;
  786. @@ -43,7 +42,7 @@
  787.  import static org.junit.Assert.*;
  788.  
  789.  public class Rfc5424LayoutTest {
  790. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  791. +    LoggerContext ctx = LoggerContext.getContext();
  792.      Logger root = ctx.getLogger("");
  793.  
  794.  
  795. @@ -65,7 +64,7 @@
  796.          ThreadContext.clearAll();
  797.          StatusLogger.getLogger().setLevel(Level.OFF);
  798.          ConfigurationFactory.setConfigurationFactory(cf);
  799. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  800. +        final LoggerContext ctx = LoggerContext.getContext();
  801.          ctx.reconfigure();
  802.      }
  803.  
  804. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
  805. index b7a2591..2ea4685 100644
  806. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
  807. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
  808. @@ -26,7 +26,6 @@
  809.  import java.util.Map;
  810.  
  811.  import org.apache.logging.log4j.Level;
  812. -import org.apache.logging.log4j.LogManager;
  813.  import org.apache.logging.log4j.LoggingException;
  814.  import org.apache.logging.log4j.ThreadContext;
  815.  import org.apache.logging.log4j.core.Appender;
  816. @@ -49,7 +48,7 @@
  817.   */
  818.  public class SerializedLayoutTest {
  819.      private static final String DAT_PATH = "target/test-classes/serializedEvent.dat";
  820. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  821. +    LoggerContext ctx = LoggerContext.getContext();
  822.      Logger root = ctx.getLogger("");
  823.  
  824.      static ConfigurationFactory cf = new BasicConfigurationFactory();
  825. @@ -58,7 +57,7 @@
  826.      public static void setupClass() {
  827.          ThreadContext.clearAll();
  828.          ConfigurationFactory.setConfigurationFactory(cf);
  829. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  830. +        final LoggerContext ctx = LoggerContext.getContext();
  831.          ctx.reconfigure();
  832.      }
  833.  
  834. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
  835. index 6a76121..d7a87fc 100644
  836. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
  837. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
  838. @@ -20,7 +20,6 @@
  839.  import java.util.Locale;
  840.  
  841.  import org.apache.logging.log4j.Level;
  842. -import org.apache.logging.log4j.LogManager;
  843.  import org.apache.logging.log4j.MarkerManager;
  844.  import org.apache.logging.log4j.ThreadContext;
  845.  import org.apache.logging.log4j.core.Appender;
  846. @@ -41,7 +40,7 @@
  847.   *
  848.   */
  849.  public class SyslogLayoutTest {
  850. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  851. +    LoggerContext ctx = LoggerContext.getContext();
  852.      Logger root = ctx.getLogger("");
  853.  
  854.  
  855. @@ -57,7 +56,7 @@
  856.      public static void setupClass() {
  857.          ThreadContext.clearAll();
  858.          ConfigurationFactory.setConfigurationFactory(cf);
  859. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  860. +        final LoggerContext ctx = LoggerContext.getContext();
  861.          ctx.reconfigure();
  862.      }
  863.  
  864. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
  865. index d5c83ca..4ea4ca5 100644
  866. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
  867. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
  868. @@ -22,7 +22,6 @@
  869.  import java.util.Map;
  870.  
  871.  import org.apache.logging.log4j.Level;
  872. -import org.apache.logging.log4j.LogManager;
  873.  import org.apache.logging.log4j.Marker;
  874.  import org.apache.logging.log4j.MarkerManager;
  875.  import org.apache.logging.log4j.ThreadContext;
  876. @@ -64,11 +63,11 @@
  877.      public static void setupClass() {
  878.          ThreadContext.clearAll();
  879.          ConfigurationFactory.setConfigurationFactory(cf);
  880. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  881. +        final LoggerContext ctx = LoggerContext.getContext();
  882.          ctx.reconfigure();
  883.      }
  884.  
  885. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  886. +    LoggerContext ctx = LoggerContext.getContext();
  887.  
  888.      Logger rootLogger = this.ctx.getLogger("");
  889.  
  890. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
  891. index 2bcdd43..695e7e8 100644
  892. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
  893. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
  894. @@ -23,7 +23,6 @@
  895.  import java.util.Map;
  896.  
  897.  import org.apache.logging.log4j.Level;
  898. -import org.apache.logging.log4j.LogManager;
  899.  import org.apache.logging.log4j.core.Appender;
  900.  import org.apache.logging.log4j.core.Filter;
  901.  import org.apache.logging.log4j.core.Layout;
  902. @@ -76,7 +75,7 @@
  903.  
  904.      static final String PORT = String.valueOf(PORT_NUM);
  905.  
  906. -    private final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  907. +    private final LoggerContext ctx = LoggerContext.getContext(false);
  908.  
  909.      private final boolean expectLengthException;
  910.  
  911. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/SslXmlSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/SslXmlSocketServerTest.java
  912. index df54271..853e5df 100644
  913. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/SslXmlSocketServerTest.java
  914. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/SslXmlSocketServerTest.java
  915. @@ -21,7 +21,6 @@
  916.  import java.io.Serializable;
  917.  import java.nio.charset.Charset;
  918.  
  919. -import org.apache.logging.log4j.LogManager;
  920.  import org.apache.logging.log4j.core.Filter;
  921.  import org.apache.logging.log4j.core.Layout;
  922.  import org.apache.logging.log4j.core.LoggerContext;
  923. @@ -57,7 +56,7 @@
  924.  
  925.      @BeforeClass
  926.      public static void setupClass() throws Exception {
  927. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  928. +        (LoggerContext.getContext(false)).reconfigure();
  929.          initServerSocketFactory();
  930.          // Use a large buffer just to test the code, the UDP test uses a tiny buffer
  931.          server = new SecureTcpSocketServer<>(PORT_NUM, new XmlInputStreamLogEventBridge(1024 * 100,
  932. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
  933. index c18cb19..3f579c0 100644
  934. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
  935. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
  936. @@ -19,7 +19,6 @@
  937.  import java.io.IOException;
  938.  import java.io.InputStream;
  939.  
  940. -import org.apache.logging.log4j.LogManager;
  941.  import org.apache.logging.log4j.core.Layout;
  942.  import org.apache.logging.log4j.core.LoggerContext;
  943.  import org.junit.AfterClass;
  944. @@ -31,7 +30,7 @@
  945.  
  946.      @BeforeClass
  947.      public static void setupClass() throws Exception {
  948. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  949. +        (LoggerContext.getContext(false)).reconfigure();
  950.          server = TcpSocketServer.createJsonSocketServer(PORT_NUM);
  951.          thread = server.startNewThread();
  952.      }
  953. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
  954. index e0eaa05..460703c 100644
  955. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
  956. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
  957. @@ -20,7 +20,6 @@
  958.  import java.io.ObjectInputStream;
  959.  import java.io.Serializable;
  960.  
  961. -import org.apache.logging.log4j.LogManager;
  962.  import org.apache.logging.log4j.core.Layout;
  963.  import org.apache.logging.log4j.core.LoggerContext;
  964.  import org.junit.AfterClass;
  965. @@ -32,7 +31,7 @@
  966.  
  967.      @BeforeClass
  968.      public static void setupClass() throws Exception {
  969. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  970. +        (LoggerContext.getContext(false)).reconfigure();
  971.          server = TcpSocketServer.createSerializedSocketServer(PORT_NUM);
  972.          thread = server.startNewThread();
  973.      }
  974. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
  975. index a7eb49a..677121e 100644
  976. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
  977. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
  978. @@ -20,7 +20,6 @@
  979.  import java.io.InputStream;
  980.  import java.nio.charset.Charset;
  981.  
  982. -import org.apache.logging.log4j.LogManager;
  983.  import org.apache.logging.log4j.core.Layout;
  984.  import org.apache.logging.log4j.core.LoggerContext;
  985.  import org.junit.AfterClass;
  986. @@ -32,7 +31,7 @@
  987.  
  988.      @BeforeClass
  989.      public static void setupClass() throws Exception {
  990. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  991. +        (LoggerContext.getContext(false)).reconfigure();
  992.          // Use a large buffer just to test the code, the UDP test uses a tiny buffer
  993.          server = new TcpSocketServer<>(PORT_NUM, new XmlInputStreamLogEventBridge(1024 * 100,
  994.                  Charset.defaultCharset()));
  995. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
  996. index 99c266c..c9ff94b 100644
  997. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
  998. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
  999. @@ -19,7 +19,6 @@
  1000.  import java.io.InputStream;
  1001.  import java.io.Serializable;
  1002.  
  1003. -import org.apache.logging.log4j.LogManager;
  1004.  import org.apache.logging.log4j.core.Layout;
  1005.  import org.apache.logging.log4j.core.LoggerContext;
  1006.  import org.junit.AfterClass;
  1007. @@ -31,7 +30,7 @@
  1008.  
  1009.      @BeforeClass
  1010.      public static void setupClass() throws Exception {
  1011. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  1012. +        (LoggerContext.getContext(false)).reconfigure();
  1013.          server = UdpSocketServer.createJsonSocketServer(PORT_NUM);
  1014.          thread = server.startNewThread();
  1015.      }
  1016. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
  1017. index 49b8f9a..ad49838 100644
  1018. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
  1019. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
  1020. @@ -19,7 +19,6 @@
  1021.  import java.io.ObjectInputStream;
  1022.  import java.io.Serializable;
  1023.  
  1024. -import org.apache.logging.log4j.LogManager;
  1025.  import org.apache.logging.log4j.core.Layout;
  1026.  import org.apache.logging.log4j.core.LoggerContext;
  1027.  import org.junit.AfterClass;
  1028. @@ -31,7 +30,7 @@
  1029.  
  1030.      @BeforeClass
  1031.      public static void setupClass() throws Exception {
  1032. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  1033. +        (LoggerContext.getContext(false)).reconfigure();
  1034.          server = UdpSocketServer.createSerializedSocketServer(PORT_NUM);
  1035.          thread = server.startNewThread();
  1036.      }
  1037. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
  1038. index dfe7475..526567a 100644
  1039. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
  1040. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
  1041. @@ -20,7 +20,6 @@
  1042.  import java.io.Serializable;
  1043.  import java.nio.charset.Charset;
  1044.  
  1045. -import org.apache.logging.log4j.LogManager;
  1046.  import org.apache.logging.log4j.core.Layout;
  1047.  import org.apache.logging.log4j.core.LoggerContext;
  1048.  import org.junit.AfterClass;
  1049. @@ -32,7 +31,7 @@
  1050.  
  1051.      @BeforeClass
  1052.      public static void setupClass() throws Exception {
  1053. -        ((LoggerContext) LogManager.getContext(false)).reconfigure();
  1054. +        (LoggerContext.getContext(false)).reconfigure();
  1055.          // Use a tiny buffer just to test the code, the TCP test uses a large buffer
  1056.          server = new UdpSocketServer<>(PORT_NUM, new XmlInputStreamLogEventBridge(100,
  1057.                  Charset.defaultCharset()));
  1058. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverterTest.java
  1059. index 86c9b84..33a9569 100644
  1060. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverterTest.java
  1061. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverterTest.java
  1062. @@ -17,7 +17,6 @@
  1063.  package org.apache.logging.log4j.core.pattern;
  1064.  
  1065.  import org.apache.logging.log4j.Level;
  1066. -import org.apache.logging.log4j.LogManager;
  1067.  import org.apache.logging.log4j.core.LogEvent;
  1068.  import org.apache.logging.log4j.core.LoggerContext;
  1069.  import org.apache.logging.log4j.core.impl.Log4jLogEvent;
  1070. @@ -39,7 +38,7 @@
  1071.                  .setMessage(new SimpleMessage("Test \r\n<div class=\"test\">this</div> & <div class='test'>that</div>"))
  1072.                  .build();
  1073.          final StringBuilder sb = new StringBuilder();
  1074. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  1075. +        final LoggerContext ctx = LoggerContext.getContext();
  1076.          final String[] options = new String[]{"%msg"};
  1077.          final EncodingPatternConverter converter = EncodingPatternConverter
  1078.              .newInstance(ctx.getConfiguration(), options);
  1079. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
  1080. index c9a927e..ec39c0c 100644
  1081. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
  1082. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
  1083. @@ -22,7 +22,6 @@
  1084.  import java.util.Map;
  1085.  
  1086.  import org.apache.logging.log4j.Level;
  1087. -import org.apache.logging.log4j.LogManager;
  1088.  import org.apache.logging.log4j.MarkerManager;
  1089.  import org.apache.logging.log4j.core.LogEvent;
  1090.  import org.apache.logging.log4j.core.Logger;
  1091. @@ -43,7 +42,7 @@
  1092.  
  1093.      static String OUTPUT_FILE   = "output/PatternParser";
  1094.      static String WITNESS_FILE  = "witness/PatternParser";
  1095. -    LoggerContext ctx = (LoggerContext) LogManager.getContext();
  1096. +    LoggerContext ctx = LoggerContext.getContext();
  1097.      Logger root = ctx.getLogger("");
  1098.  
  1099.      private static String msgPattern = "%m%n";
  1100. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
  1101. index 768b71d..aa7fe1a 100644
  1102. --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
  1103. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java
  1104. @@ -17,7 +17,6 @@
  1105.  package org.apache.logging.log4j.core.pattern;
  1106.  
  1107.  import org.apache.logging.log4j.Level;
  1108. -import org.apache.logging.log4j.LogManager;
  1109.  import org.apache.logging.log4j.ThreadContext;
  1110.  import org.apache.logging.log4j.core.LogEvent;
  1111.  import org.apache.logging.log4j.core.LoggerContext;
  1112. @@ -42,7 +41,7 @@
  1113.                  .setMessage(new SimpleMessage("This is a test")) //
  1114.                  .build();
  1115.          final StringBuilder sb = new StringBuilder();
  1116. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext();
  1117. +        final LoggerContext ctx = LoggerContext.getContext();
  1118.          final String[] options = new String[] {
  1119.              "%logger %msg%n", "\\.", "/"
  1120.          };
  1121. diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
  1122. index 90dab57..df2d148 100644
  1123. --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
  1124. +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
  1125. @@ -21,7 +21,6 @@
  1126.  import java.util.Collections;
  1127.  import java.util.List;
  1128.  
  1129. -import org.apache.logging.log4j.LogManager;
  1130.  import org.apache.logging.log4j.core.Filter;
  1131.  import org.apache.logging.log4j.core.Layout;
  1132.  import org.apache.logging.log4j.core.LogEvent;
  1133. @@ -182,6 +181,6 @@
  1134.       * @see org.apache.logging.log4j.junit.InitialLoggerContext#getListAppender(String)
  1135.       */
  1136.      public static ListAppender getListAppender(final String name) {
  1137. -        return ((ListAppender) ((LoggerContext) LogManager.getContext(false)).getConfiguration().getAppender(name));
  1138. +        return ((ListAppender) (LoggerContext.getContext(false)).getConfiguration().getAppender(name));
  1139.      }
  1140.  }
  1141. diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
  1142. index 331de21..313a8ab 100644
  1143. --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
  1144. +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
  1145. @@ -102,7 +102,7 @@
  1146.          primary = new EventCollector(primaryPort);
  1147.          alternate = new EventCollector(altPort);
  1148.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1149. -        ctx = (LoggerContext) LogManager.getContext(false);
  1150. +        ctx = LoggerContext.getContext(false);
  1151.          ctx.reconfigure();
  1152.      }
  1153.  
  1154. diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
  1155. index 7352ce3..3f6627b 100644
  1156. --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
  1157. +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
  1158. @@ -102,7 +102,7 @@
  1159.          primary = new EventCollector(primaryPort);
  1160.          alternate = new EventCollector(altPort);
  1161.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1162. -        ctx = (LoggerContext) LogManager.getContext(false);
  1163. +        ctx = LoggerContext.getContext(false);
  1164.          ctx.reconfigure();
  1165.      }
  1166.  
  1167. diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
  1168. index 4e66856..e6b80ee 100644
  1169. --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
  1170. +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
  1171. @@ -104,7 +104,7 @@
  1172.          primary = new EventCollector(primaryPort);
  1173.          alternate = new EventCollector(altPort);
  1174.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1175. -        ctx = (LoggerContext) LogManager.getContext(false);
  1176. +        ctx = LoggerContext.getContext(false);
  1177.          ctx.reconfigure();
  1178.      }
  1179.  
  1180. diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
  1181. index 8e7c4ec..fe248d2 100644
  1182. --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
  1183. +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
  1184. @@ -44,7 +44,6 @@
  1185.  import org.apache.flume.source.avro.AvroSourceProtocol;
  1186.  import org.apache.flume.source.avro.Status;
  1187.  import org.apache.logging.log4j.EventLogger;
  1188. -import org.apache.logging.log4j.LogManager;
  1189.  import org.apache.logging.log4j.core.LoggerContext;
  1190.  import org.apache.logging.log4j.core.config.ConfigurationFactory;
  1191.  import org.apache.logging.log4j.message.StructuredDataMessage;
  1192. @@ -100,7 +99,7 @@
  1193.          primary = new EventCollector(primaryPort);
  1194.          alternate = new EventCollector(altPort);
  1195.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1196. -        ctx = (LoggerContext) LogManager.getContext(false);
  1197. +        ctx = LoggerContext.getContext(false);
  1198.          ctx.reconfigure();
  1199.      }
  1200.  
  1201. diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
  1202. index 3b3fe90..148ad2d 100644
  1203. --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
  1204. +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java
  1205. @@ -67,7 +67,7 @@
  1206.          createTable(connectionH2, toCreateTableSqlStringH2("fmLogEntry"));
  1207.  
  1208.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "log4j2-jdbc-appender.xml");
  1209. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1210. +        final LoggerContext context = LoggerContext.getContext(false);
  1211.          if (context.getConfiguration() instanceof DefaultConfiguration) {
  1212.              context.reconfigure();
  1213.          }
  1214. @@ -134,7 +134,7 @@
  1215.  
  1216.      @TearDown
  1217.      public void tearDown() throws SQLException {
  1218. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1219. +        final LoggerContext context = LoggerContext.getContext(false);
  1220.          try {
  1221.              ((JdbcAppender) context.getConfiguration().getAppender("H2Appender")).getManager().release();
  1222.              ((JdbcAppender) context.getConfiguration().getAppender("HSQLDBAppender")).getManager().release();
  1223. diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java
  1224. index fe45b77..6267232 100644
  1225. --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java
  1226. +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java
  1227. @@ -65,7 +65,7 @@
  1228.          connectionH2 = getConnectionH2();
  1229.  
  1230.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "log4j2-jpa-appender.xml");
  1231. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1232. +        final LoggerContext context = LoggerContext.getContext(false);
  1233.          if (context.getConfiguration() instanceof DefaultConfiguration) {
  1234.              context.reconfigure();
  1235.          }
  1236. @@ -132,7 +132,7 @@
  1237.  
  1238.      @TearDown
  1239.      public void tearDown() throws SQLException {
  1240. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1241. +        final LoggerContext context = LoggerContext.getContext(false);
  1242.          try {
  1243.              ((JpaAppender) context.getConfiguration().getAppender("H2Appender")).getManager().release();
  1244.              ((JpaAppender) context.getConfiguration().getAppender("HSQLDBAppender")).getManager().release();
  1245. diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
  1246. index 1a082a7..543fe8d 100644
  1247. --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
  1248. +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
  1249. @@ -51,10 +51,10 @@
  1250.  
  1251.      @Setup
  1252.      public void setup() {
  1253. -        final Configuration config = ((LoggerContext) LogManager.getContext()).getConfiguration();
  1254. +        final Configuration config = (LoggerContext.getContext()).getConfiguration();
  1255.          if (!DefaultConfiguration.DEFAULT_NAME.equals(config.getName())) {
  1256.              System.out.println("Configuration was " + config.getName());
  1257. -            ((LoggerContext) LogManager.getContext()).start(new DefaultConfiguration());
  1258. +            (LoggerContext.getContext()).start(new DefaultConfiguration());
  1259.          }
  1260.          logger = LogManager.getLogger(SimpleBenchmark.class.getName());
  1261.      }
  1262. diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
  1263. index 17448b9..006252d 100644
  1264. --- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
  1265. +++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
  1266. @@ -47,14 +47,14 @@
  1267.      @BeforeClass
  1268.      public static void setUpClass() {
  1269.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1270. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1271. +        final LoggerContext context = LoggerContext.getContext(false);
  1272.          context.getConfiguration();
  1273.      }
  1274.  
  1275.      @AfterClass
  1276.      public static void cleanUpClass() {
  1277.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  1278. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1279. +        final LoggerContext context = LoggerContext.getContext(false);
  1280.          context.reconfigure();
  1281.          StatusLogger.getLogger().reset();
  1282.      }
  1283. @@ -96,7 +96,7 @@
  1284.      }
  1285.  
  1286.      private void verify(final String expected) {
  1287. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  1288. +        final LoggerContext ctx = LoggerContext.getContext(false);
  1289.          final Appender listApp = ctx.getConfiguration().getAppender("List");
  1290.          assertNotNull("Missing Appender", listApp);
  1291.          assertTrue("Not a ListAppender", listApp instanceof ListAppender);
  1292. diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
  1293. index 8094bde..0344a6f 100644
  1294. --- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
  1295. +++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
  1296. @@ -43,14 +43,14 @@
  1297.      @BeforeClass
  1298.      public static void setUpClass() {
  1299.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1300. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1301. +        final LoggerContext context = LoggerContext.getContext(false);
  1302.          context.getConfiguration();
  1303.      }
  1304.  
  1305.      @AfterClass
  1306.      public static void cleanUpClass() {
  1307.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  1308. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1309. +        final LoggerContext context = LoggerContext.getContext(false);
  1310.          context.reconfigure();
  1311.          StatusLogger.getLogger().reset();
  1312.      }
  1313. @@ -81,7 +81,7 @@
  1314.      }
  1315.  
  1316.      private void verify(final String expected) {
  1317. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  1318. +        final LoggerContext ctx = LoggerContext.getContext(false);
  1319.          final Appender listApp = ctx.getConfiguration().getAppender("List");
  1320.          assertNotNull("Missing Appender", listApp);
  1321.          assertTrue("Not a ListAppender", listApp instanceof ListAppender);
  1322. diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
  1323. index 5b7c34d..8fe5e39 100644
  1324. --- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
  1325. +++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
  1326. @@ -43,14 +43,14 @@
  1327.      @BeforeClass
  1328.      public static void setUpClass() {
  1329.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1330. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1331. +        final LoggerContext context = LoggerContext.getContext(false);
  1332.          context.getConfiguration();
  1333.      }
  1334.  
  1335.      @AfterClass
  1336.      public static void cleanUpClass() {
  1337.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  1338. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1339. +        final LoggerContext context = LoggerContext.getContext(false);
  1340.          context.reconfigure();
  1341.          StatusLogger.getLogger().reset();
  1342.      }
  1343. @@ -88,7 +88,7 @@
  1344.      }
  1345.  
  1346.      private void verify(final String expected) {
  1347. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  1348. +        final LoggerContext ctx = LoggerContext.getContext(false);
  1349.          final Appender listApp = ctx.getConfiguration().getAppender("List");
  1350.          assertNotNull("Missing Appender", listApp);
  1351.          assertTrue("Not a ListAppender", listApp instanceof ListAppender);
  1352. diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
  1353. index 10c3bb5..0d9c085 100644
  1354. --- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
  1355. +++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
  1356. @@ -42,14 +42,14 @@
  1357.      @BeforeClass
  1358.      public static void setUpClass() {
  1359.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1360. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1361. +        final LoggerContext context = LoggerContext.getContext(false);
  1362.          context.getConfiguration();
  1363.      }
  1364.  
  1365.      @AfterClass
  1366.      public static void cleanUpClass() {
  1367.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  1368. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1369. +        final LoggerContext context = LoggerContext.getContext(false);
  1370.          context.reconfigure();
  1371.          StatusLogger.getLogger().reset();
  1372.      }
  1373. diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
  1374. index 62f46b8..342b2da 100644
  1375. --- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
  1376. +++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
  1377. @@ -49,14 +49,14 @@
  1378.      @BeforeClass
  1379.      public static void setUpClass() {
  1380.          System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
  1381. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1382. +        final LoggerContext context = LoggerContext.getContext(false);
  1383.          context.getConfiguration();
  1384.      }
  1385.  
  1386.      @AfterClass
  1387.      public static void cleanUpClass() {
  1388.          System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
  1389. -        final LoggerContext context = (LoggerContext) LogManager.getContext(false);
  1390. +        final LoggerContext context = LoggerContext.getContext(false);
  1391.          context.reconfigure();
  1392.          StatusLogger.getLogger().reset();
  1393.      }
  1394. @@ -296,7 +296,7 @@
  1395.  
  1396.      @SuppressWarnings("unchecked")
  1397.      private void verify(final String expected) {
  1398. -        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
  1399. +        final LoggerContext ctx = LoggerContext.getContext(false);
  1400.          final Appender listApp = ctx.getConfiguration().getAppender("List");
  1401.          assertNotNull("Missing Appender", listApp);
  1402.          assertTrue("Not a ListAppender", listApp instanceof ListAppender);
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!