Sitelet https://github.com/Mindgamesnl/ehcache3/commit/f38ed6c40ae1cbf3749dd34efd27e6438e7b10da
Skip to content

Commit f38ed6c

Browse files
chrisdennischrisdennis
committed
Use prefix loggers for new loggers
1 parent eea0832 commit f38ed6c

4 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎ehcache-impl/src/main/java/org/ehcache/impl/internal/store/shared/SharedStorage.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.ehcache.config.ResourcePool;
2323
import org.ehcache.config.ResourcePools;
2424
import org.ehcache.config.ResourceType;
25+
import org.ehcache.core.EhcachePrefixLoggerFactory;
2526
import org.ehcache.core.spi.service.StatisticsService;
2627
import org.ehcache.core.spi.store.Store;
2728
import org.ehcache.core.spi.store.tiering.AuthoritativeTier;
@@ -45,7 +46,6 @@
4546
import org.ehcache.spi.service.ServiceConfiguration;
4647
import org.ehcache.spi.service.ServiceProvider;
4748
import org.slf4j.Logger;
48-
import org.slf4j.LoggerFactory;
4949

5050
import java.util.Collection;
5151
import java.util.HashMap;
@@ -59,7 +59,9 @@
5959

6060
public class SharedStorage {
6161

62-
protected static final Logger LOGGER = LoggerFactory.getLogger(SharedStorage.class);
62+
63+
protected final Logger logger = EhcachePrefixLoggerFactory.getLogger(SharedStorage.class);
64+
6365
private ServiceProvider<Service> serviceProvider;
6466
private int lastUsedId = 0;
6567
private final Map<Integer, Serializer<?>> keySerializerMap = new HashMap<>();

‎ehcache-impl/src/main/java/org/ehcache/impl/internal/store/shared/caching/CachingTierPartition.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.ehcache.Cache;
2020
import org.ehcache.config.ResourceType;
2121
import org.ehcache.core.CacheConfigurationChangeListener;
22+
import org.ehcache.core.EhcachePrefixLoggerFactory;
2223
import org.ehcache.core.spi.store.Store;
2324
import org.ehcache.core.spi.store.Store.ValueHolder;
2425
import org.ehcache.core.spi.store.tiering.CachingTier;
@@ -27,7 +28,6 @@
2728
import org.ehcache.impl.store.HashUtils;
2829
import org.ehcache.spi.resilience.StoreAccessException;
2930
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
3131

3232
import java.util.HashMap;
3333
import java.util.HashSet;
@@ -38,7 +38,7 @@
3838

3939
public class CachingTierPartition<K, V> extends AbstractPartition<CachingTier<CompositeValue<K>, CompositeValue<V>>> implements CachingTier<K, V> {
4040

41-
private static final Logger LOGGER = LoggerFactory.getLogger(CachingTierPartition.class);
41+
private final Logger logger = EhcachePrefixLoggerFactory.getLogger(CachingTierPartition.class);
4242
private final Map<Integer, CachingTier.InvalidationListener<?, ?>> invalidationListenerMap;
4343

4444
public CachingTierPartition(ResourceType<?> type, int id, CachingTier<CompositeValue<K>, CompositeValue<V>> store, Map<Integer, CachingTier.InvalidationListener<?, ?>> invalidationListenerMap) {
@@ -62,7 +62,7 @@ public void clear() throws StoreAccessException {
6262
}
6363
}
6464
if (!completeRemoval) {
65-
LOGGER.error("Iteration failures may have prevented a complete removal");
65+
logger.error("Iteration failures may have prevented a complete removal");
6666
}
6767
}
6868

@@ -102,7 +102,7 @@ public void invalidateAll() throws StoreAccessException {
102102
}
103103
}
104104
if (!invalidate) {
105-
LOGGER.error("Could not invalidate one or more cache entries");
105+
logger.error("Could not invalidate one or more cache entries");
106106
}
107107
}
108108

‎ehcache-impl/src/main/java/org/ehcache/impl/internal/store/shared/caching/lower/LowerCachingTierPartition.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.ehcache.Cache;
2020
import org.ehcache.config.ResourceType;
2121
import org.ehcache.core.CacheConfigurationChangeListener;
22+
import org.ehcache.core.EhcachePrefixLoggerFactory;
2223
import org.ehcache.core.spi.store.Store;
2324
import org.ehcache.core.spi.store.Store.ValueHolder;
2425
import org.ehcache.core.spi.store.tiering.CachingTier;
@@ -28,16 +29,15 @@
2829
import org.ehcache.impl.store.HashUtils;
2930
import org.ehcache.spi.resilience.StoreAccessException;
3031
import org.slf4j.Logger;
31-
import org.slf4j.LoggerFactory;
3232

3333
import java.util.List;
3434
import java.util.Map;
3535
import java.util.function.Function;
3636

3737
public class LowerCachingTierPartition<K, V> extends AbstractPartition<LowerCachingTier<CompositeValue<K>, CompositeValue<V>>> implements LowerCachingTier<K, V> {
3838

39-
private static final Logger LOGGER = LoggerFactory.getLogger(LowerCachingTierPartition.class);
40-
private final Map<Integer, CachingTier.InvalidationListener<?, ?>> invalidationListenerMap;
39+
private final Logger logger = EhcachePrefixLoggerFactory.getLogger(LowerCachingTierPartition.class);
40+
private final Map<Integer, CachingTier.InvalidationListener<?, ?>> invalidationListenerMap;
4141

4242
public LowerCachingTierPartition(ResourceType<?> type, int id, LowerCachingTier<CompositeValue<K>, CompositeValue<V>> store, Map<Integer, CachingTier.InvalidationListener<?, ?>> invalidationListenerMap) {
4343
super(type, id, store);
@@ -102,7 +102,7 @@ public void invalidateAll() throws StoreAccessException {
102102
}
103103
}
104104
if (!invalidate) {
105-
LOGGER.error("Could not invalidate one or more cache entries");
105+
logger.error("Could not invalidate one or more cache entries");
106106
}
107107
}
108108

‎ehcache-impl/src/main/java/org/ehcache/impl/internal/store/shared/store/StorePartition.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.ehcache.config.ResourceType;
2121
import org.ehcache.core.CacheConfigurationChangeListener;
2222
import org.ehcache.core.Ehcache;
23+
import org.ehcache.core.EhcachePrefixLoggerFactory;
2324
import org.ehcache.core.spi.store.AbstractValueHolder;
2425
import org.ehcache.core.spi.store.Store;
2526
import org.ehcache.core.spi.store.events.StoreEvent;
@@ -31,7 +32,6 @@
3132
import org.ehcache.impl.internal.store.shared.composites.CompositeValue;
3233
import org.ehcache.spi.resilience.StoreAccessException;
3334
import org.slf4j.Logger;
34-
import org.slf4j.LoggerFactory;
3535

3636
import javax.annotation.Nonnull;
3737
import java.util.ArrayList;
@@ -50,7 +50,7 @@
5050

5151
public class StorePartition<K, V> extends AbstractPartition<Store<CompositeValue<K>, CompositeValue<V>>> implements Store<K, V> {
5252

53-
private static final Logger LOGGER = LoggerFactory.getLogger(StorePartition.class);
53+
private final Logger logger = EhcachePrefixLoggerFactory.getLogger(StorePartition.class);
5454

5555
private static final Supplier<Boolean> SUPPLY_TRUE = () -> Boolean.TRUE;
5656
private final Class<K> keyType;
@@ -239,7 +239,7 @@ public void clear() throws StoreAccessException {
239239
}
240240
}
241241
if (!completeRemoval) {
242-
LOGGER.error("Iteration failures may have prevented a complete removal");
242+
logger.error("Iteration failures may have prevented a complete removal");
243243
}
244244
}
245245

@@ -266,7 +266,7 @@ public int hashCode() {
266266

267267
@Override
268268
public boolean equals(Object obj) {
269-
return super.equals(this) || eventListener.equals(obj);
269+
return super.equals(obj) || eventListener.equals(obj);
270270
}
271271
});
272272
}

0 commit comments

Comments
 (0)