ISPN-8647 Initialize all loggers statically in tests

infinispan · Jan 10, 2018 · 120c755 · 120c755
1 parent 5d33fdb
commit 120c755
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 18 deletions.
diff --git a/...ava/org/infinispan/client/hotrod/event/EmbeddedCompatClientListenerWithDslFilterTest.java b/...ava/org/infinispan/client/hotrod/event/EmbeddedCompatClientListenerWithDslFilterTest.java
@@ -10,6 +10,7 @@
 import static org.testng.AssertJUnit.assertNull;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -296,7 +297,7 @@ private void expectElementsInQueue(BlockingQueue<?> queue, int numElements) {
          useRawData = true, includeCurrentState = true)
    private static class ClientEntryListener {
 
-      private final Log log = LogFactory.getLog(getClass());
+      private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
       public final BlockingQueue<FilterResult> createEvents = new LinkedBlockingQueue<>();
 

diff --git a/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java b/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
@@ -10,6 +10,7 @@
 import static org.testng.AssertJUnit.assertNull;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -313,7 +314,7 @@ private void expectElementsInQueue(BlockingQueue<?> queue, int numElements) {
          useRawData = true, includeCurrentState = true)
    private static class ClientEntryListener {
 
-      private final Log log = LogFactory.getLog(getClass());
+      private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
       public final BlockingQueue<FilterResult> createEvents = new LinkedBlockingQueue<>();
 

diff --git a/core/src/test/java/org/infinispan/api/ClearTest.java b/core/src/test/java/org/infinispan/api/ClearTest.java
@@ -3,6 +3,8 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
+import java.lang.invoke.MethodHandles;
+
 import org.infinispan.AdvancedCache;
 import org.infinispan.configuration.cache.BiasAcquisition;
 import org.infinispan.configuration.cache.CacheMode;
@@ -27,7 +29,7 @@
 @Test(groups = "functional", testName = "api.ClearTest")
 public class ClearTest extends MultipleCacheManagersTest {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    protected AdvancedCache<Integer, String> c0;
    protected AdvancedCache<Integer, String> c1;

diff --git a/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java b/core/src/test/java/org/infinispan/api/ConditionalOperationsConcurrentTest.java
@@ -4,6 +4,7 @@
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
+import java.lang.invoke.MethodHandles;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.BrokenBarrierException;
@@ -42,7 +43,7 @@
 @Test(groups = "functional", testName = "api.ConditionalOperationsConcurrentTest")
 public class ConditionalOperationsConcurrentTest extends MultipleCacheManagersTest {
 
-   private final Log log = LogFactory.getLog(getClass());
+   private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    @Override
    public Object[] factory() {

diff --git a/core/src/test/java/org/infinispan/expiration/impl/ClusterExpirationFunctionalTest.java b/core/src/test/java/org/infinispan/expiration/impl/ClusterExpirationFunctionalTest.java
@@ -3,6 +3,7 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.TimeUnit;
 
 import org.infinispan.Cache;
@@ -29,7 +30,7 @@
 @InCacheMode({CacheMode.DIST_SYNC, CacheMode.REPL_SYNC, CacheMode.SCATTERED_SYNC})
 public class ClusterExpirationFunctionalTest extends MultipleCacheManagersTest {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    protected ControlledTimeService ts0;
    protected ControlledTimeService ts1;

diff --git a/.../org/infinispan/notifications/cachelistener/BaseCacheNotifierImplInitialTransferTest.java b/.../org/infinispan/notifications/cachelistener/BaseCacheNotifierImplInitialTransferTest.java
@@ -15,6 +15,7 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BrokenBarrierException;
@@ -512,7 +513,7 @@ private boolean isClustered(StateListener listener) {
 
    protected static abstract class StateListener<K, V> {
       final List<CacheEntryEvent<K, V>> events = new ArrayList<>();
-      private final Log log = LogFactory.getLog(getClass());
+      private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
       @CacheEntryCreated
       @CacheEntryModified

diff --git a/.../org/infinispan/notifications/cachelistener/CacheNotifierImplInitialTransferDistTest.java b/.../org/infinispan/notifications/cachelistener/CacheNotifierImplInitialTransferDistTest.java
@@ -14,6 +14,7 @@
 import static org.testng.Assert.fail;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -663,7 +664,7 @@ private boolean isClustered(StateListener listener) {
 
    protected static abstract class StateListener<K, V> {
       final List<CacheEntryEvent<K, V>> events = Collections.synchronizedList(new ArrayList<>());
-      private final Log log = LogFactory.getLog(getClass());
+      private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
       @CacheEntryCreated
       @CacheEntryModified

diff --git a/core/src/test/java/org/infinispan/partitionhandling/BasePartitionHandlingTest.java b/core/src/test/java/org/infinispan/partitionhandling/BasePartitionHandlingTest.java
@@ -4,6 +4,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -48,7 +49,7 @@
 
 @Test(groups = "functional", testName = "partitionhandling.BasePartitionHandlingTest")
 public class BasePartitionHandlingTest extends MultipleCacheManagersTest {
-   protected Log log = LogFactory.getLog(getClass());
+   protected static Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    private final AtomicInteger viewId = new AtomicInteger(5);
    protected int numMembersInCluster = 4;

diff --git a/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java b/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
@@ -3,6 +3,7 @@
 import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -56,7 +57,7 @@
 @TestSelector(interceptors = AbstractInfinispanTest.OrderByInstance.class)
 public class AbstractInfinispanTest {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    private final ThreadFactory defaultThreadFactory = getTestThreadFactory("ForkThread");
    private final ThreadPoolExecutor defaultExecutorService = new ThreadPoolExecutor(0, Integer.MAX_VALUE,

diff --git a/core/src/test/java/org/infinispan/tx/DummyTxTest.java b/core/src/test/java/org/infinispan/tx/DummyTxTest.java
@@ -3,6 +3,7 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -28,7 +29,7 @@
 @Test(groups = "functional", testName = "tx.DummyTxTest")
 public class DummyTxTest extends SingleCacheManagerTest {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    protected EmbeddedCacheManager createCacheManager() throws Exception {
       EmbeddedCacheManager cm = TestCacheManagerFactory.createCacheManager(false);  // also try this test with 'true' so you can tell the difference between DummyTransactionManager and JBoss TM

diff --git a/core/src/test/java/org/infinispan/util/AbstractControlledRpcManager.java b/core/src/test/java/org/infinispan/util/AbstractControlledRpcManager.java
@@ -1,5 +1,6 @@
 package org.infinispan.util;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -28,7 +29,7 @@
  */
 public abstract class AbstractControlledRpcManager implements RpcManager {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
    protected final RpcManager realOne;
 
    public AbstractControlledRpcManager(RpcManager realOne) {

diff --git a/...a/org/infinispan/test/hibernate/cache/commons/functional/AbstractNonInvalidationTest.java b/...a/org/infinispan/test/hibernate/cache/commons/functional/AbstractNonInvalidationTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.test.hibernate.cache.commons.functional;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -54,7 +55,7 @@ public abstract class AbstractNonInvalidationTest extends SingleNodeTest {
 
    protected long TIMEOUT;
    protected ExecutorService executor;
-   protected InfinispanMessageLogger log = InfinispanMessageLogger.Provider.getLog(getClass());
+   protected static InfinispanMessageLogger log = InfinispanMessageLogger.Provider.getLog(MethodHandles.lookup().lookupClass());
    protected AdvancedCache entityCache;
    protected long itemId;
    protected Region region;

diff --git a/...stsuite/src/test/java/org/infinispan/server/test/query/RemoteListenerWithDslFilterIT.java b/...stsuite/src/test/java/org/infinispan/server/test/query/RemoteListenerWithDslFilterIT.java
@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -154,7 +155,7 @@ private void expectElementsInQueue(BlockingQueue<?> queue, int numElements) {
          useRawData = true, includeCurrentState = true)
    public static class ClientEntryListener {
 
-      private final Log log = LogFactory.getLog(getClass());
+      private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
       public final BlockingQueue<FilterResult> createEvents = new LinkedBlockingQueue<>();
 

diff --git a/...g4-embedded/src/test/java/org/infinispan/spring/provider/sample/AbstractTestTemplate.java b/...g4-embedded/src/test/java/org/infinispan/spring/provider/sample/AbstractTestTemplate.java
@@ -1,5 +1,6 @@
 package org.infinispan.spring.provider.sample;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Random;
 
 import org.infinispan.commons.api.BasicCache;
@@ -25,7 +26,7 @@
 @Test(groups = "functional")
 public abstract class AbstractTestTemplate extends AbstractTransactionalTestNGSpringContextTests {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    @AfterMethod
    public void clearBookCache() {

diff --git a/...spring4-embedded/src/test/java/org/infinispan/spring/provider/sample/dao/JdbcBookDao.java b/...spring4-embedded/src/test/java/org/infinispan/spring/provider/sample/dao/JdbcBookDao.java
@@ -1,5 +1,6 @@
 package org.infinispan.spring.provider.sample.dao;
 
+import java.lang.invoke.MethodHandles;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
@@ -33,7 +34,7 @@
 @Repository(value = "jdbcBookDao")
 public class JdbcBookDao implements BaseBookDao {
 
-   private final Log log = LogFactory.getLog(getClass());
+   private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    private NamedParameterJdbcTemplate jdbcTemplate;
 

diff --git a/...ing4-remote/src/test/java/org/infinispan/spring/provider/sample/AbstractTestTemplate.java b/...ing4-remote/src/test/java/org/infinispan/spring/provider/sample/AbstractTestTemplate.java
@@ -1,5 +1,6 @@
 package org.infinispan.spring.provider.sample;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Random;
 
 import org.infinispan.commons.api.BasicCache;
@@ -28,7 +29,7 @@
 @Test(groups = "functional")
 public abstract class AbstractTestTemplate extends AbstractTransactionalTestNGSpringContextTests {
 
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    @BeforeTest(alwaysRun = true)
    public void beforeTest() {

diff --git a/...4/spring4-remote/src/test/java/org/infinispan/spring/provider/sample/dao/JdbcBookDao.java b/...4/spring4-remote/src/test/java/org/infinispan/spring/provider/sample/dao/JdbcBookDao.java
@@ -1,5 +1,6 @@
 package org.infinispan.spring.provider.sample.dao;
 
+import java.lang.invoke.MethodHandles;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
@@ -33,7 +34,7 @@
 @Repository(value = "jdbcBookDao")
 public class JdbcBookDao implements BaseBookDao {
 
-   private final Log log = LogFactory.getLog(getClass());
+   private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    private NamedParameterJdbcTemplate jdbcTemplate;
 

diff --git a/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java b/tree/src/test/java/org/infinispan/api/tree/BaseNodeMoveAPITest.java
@@ -5,6 +5,7 @@
 import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -42,7 +43,7 @@
  */
 @Test(groups = "functional", testName = "api.tree.BaseNodeMoveAPITest")
 public abstract class BaseNodeMoveAPITest extends SingleCacheManagerTest {
-   protected final Log log = LogFactory.getLog(getClass());
+   protected static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
 
    protected static final Fqn A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn.fromString("/d"), E = Fqn.fromString("/e");
    static final Fqn A_B = Fqn.fromRelativeFqn(A, B);