You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@geode.apache.org by "ASF GitHub Bot (JIRA)" <ji...@apache.org> on 2017/12/20 19:04:02 UTC
[jira] [Commented] (GEODE-258) Remove deprecated
Cache.getLoggerI18n and getSecurityLoggerI18n methods
[ https://issues.apache.org/jira/browse/GEODE-258?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16298929#comment-16298929 ]
ASF GitHub Bot commented on GEODE-258:
--------------------------------------
galen-pivotal closed pull request #467: GEODE-258: Remove deprecated Cache.getLoggerI18n and getSecurityLoggerI18n methods
URL: https://github.com/apache/geode/pull/467
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
index 19f89b251f..91204f42e1 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
@@ -54,7 +54,7 @@ public RegionSubRegionSnapshot(Region reg) {
} else {
this.entryCount = reg.entrySet().size();
}
- final LogWriterI18n logger = reg.getCache().getLoggerI18n();
+ final LogWriterI18n logger = reg.getCache().getLogger().convertToLogWriterI18n();
if ((logger != null) && logger.fineEnabled()) {
logger.fine("RegionSubRegionSnapshot Region entry count =" + this.entryCount + " for region ="
+ this.name);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Cache.java b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
index bc4aa19eb9..52482de60d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Cache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
@@ -148,28 +148,6 @@
*/
public <K, V> RegionFactory<K, V> createRegionFactory(RegionAttributes<K, V> regionAttributes);
- /**
- * Internal GemStone method for accessing the internationalized logging object for GemFire, use
- * {@link #getLogger()} instead. This method does not throw <code>CacheClosedException</code> if
- * the cache is closed.
- *
- * @return the logging object
- * @deprecated as of 6.5 use getLogger().convertToLogWriterI18n() instead
- */
- @Deprecated
- public LogWriterI18n getLoggerI18n();
-
- /**
- * Internal GemStone method for accessing the internationalized logging object for GemFire, use
- * {@link #getSecurityLogger()} instead. This method does not throw
- * <code>CacheClosedException</code> if the cache is closed.
- *
- * @return the security logging object
- * @deprecated as of 6.5 use getSecurityLogger().convertToLogWriterI18n() instead
- */
- @Deprecated
- public LogWriterI18n getSecurityLoggerI18n();
-
/**
* Gets the number of seconds a cache operation will wait to obtain a distributed lock lease. This
* method does not throw <code>CacheClosedException</code> if the cache is closed.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index 57a1a465c1..af461bb7b8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -301,12 +301,14 @@ protected void _internalInit(GemFireCacheImpl theCache) throws CacheException {
if (isClient) {
dynamicRegionList.registerInterest("ALL_KEYS");
}
- if (theCache.getLoggerI18n().fineEnabled()) {
- theCache.getLoggerI18n().fine("Created dynamic region: " + dynamicRegionList);
+ if (theCache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ theCache.getLogger().convertToLogWriterI18n()
+ .fine("Created dynamic region: " + dynamicRegionList);
}
} else {
- if (theCache.getLoggerI18n().fineEnabled()) {
- theCache.getLoggerI18n().fine("Retrieved dynamic region: " + dynamicRegionList);
+ if (theCache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ theCache.getLogger().convertToLogWriterI18n()
+ .fine("Retrieved dynamic region: " + dynamicRegionList);
}
}
@@ -314,7 +316,7 @@ protected void _internalInit(GemFireCacheImpl theCache) throws CacheException {
} catch (CacheException e) {
//
- theCache.getLoggerI18n().warning(
+ theCache.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_ERROR_INITIALIZING_DYNAMICREGIONFACTORY, e);
throw e;
}
@@ -410,7 +412,7 @@ private void doBeforeRegionCreated(String parentRegion, String regionName,
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(
+ this.c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONCREATED,
listener, t);
}
@@ -437,7 +439,7 @@ private void doAfterRegionCreated(Region region, boolean distributed, boolean is
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(
+ this.c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONCREATED,
listener, t);
}
@@ -469,7 +471,7 @@ private void doBeforeRegionDestroyed(Region region, boolean distributed, boolean
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(
+ this.c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONDESTROYED,
listener, t);
}
@@ -501,7 +503,7 @@ private void doAfterRegionDestroyed(Region region, boolean distributed, boolean
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(
+ this.c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONDESTROYED,
listener, t);
}
@@ -583,7 +585,7 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_
.toLocalizedString(parentRegionName);
RegionDestroyedException e = new RegionDestroyedException(errMsg, parentRegionName);
- c.getLoggerI18n().warning(
+ c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_,
parentRegionName, e);
throw e;
@@ -613,14 +615,15 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
try {
newRegion = parentRegion.createSubregion(newRegionName, newRegionAttributes);
- c.getLoggerI18n().fine("Created dynamic region " + newRegion);
+ c.getLogger().convertToLogWriterI18n().fine("Created dynamic region " + newRegion);
} catch (RegionExistsException ex) {
// a race condition exists that can cause this so just fine log it
- c.getLoggerI18n().fine(
+ c.getLogger().convertToLogWriterI18n().fine(
"DynamicRegion " + newRegionName + " in parent " + parentRegionName + " already existed");
newRegion = ex.getRegion();
// } catch ( CacheException e ) {
- // c.getLoggerI18n().warning ( "Error creating new Dynamic Region '" + newRegionName, e );
+ // c.getLogger().convertToLogWriterI18n().warning ( "Error creating new Dynamic Region '" +
+ // newRegionName, e );
// throw e;
}
@@ -628,8 +631,8 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
DynamicRegionAttributes dra = new DynamicRegionAttributes();
dra.name = newRegionName;
dra.rootRegionName = parentRegion.getFullPath();
- if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n()
+ if (c.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ c.getLogger().convertToLogWriterI18n()
.fine("Putting entry into dynamic region list at key: " + newRegion.getFullPath());
}
dynamicRegionList.put(newRegion.getFullPath(), dra);
@@ -643,7 +646,7 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
newRegion.registerInterest("ALL_KEYS");
} catch (GemFireSecurityException ex) {
// Ignore security exceptions here
- c.getSecurityLoggerI18n().warning(
+ c.getSecurityLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_EXCEPTION_WHEN_REGISTERING_INTEREST_FOR_ALL_KEYS_IN_DYNAMIC_REGION_0_1,
new Object[] {newRegion.getFullPath(), ex});
}
@@ -659,8 +662,9 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
}
}
- if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine("Created Dynamic Region " + newRegion.getFullPath());
+ if (c.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ c.getLogger().convertToLogWriterI18n()
+ .fine("Created Dynamic Region " + newRegion.getFullPath());
}
return newRegion;
}
@@ -668,20 +672,20 @@ private Region createDynamicRegionImpl(String parentRegionName, String newRegion
private void destroyDynamicRegionImpl(String fullRegionName) throws CacheException {
// Destroy the entry in the dynamicRegionList
try {
- if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n()
+ if (c.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ c.getLogger().convertToLogWriterI18n()
.fine("Destroying entry from dynamic region list at key: " + fullRegionName);
}
dynamicRegionList.destroy(fullRegionName);
} catch (CacheException e) {
- c.getLoggerI18n().warning(
+ c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_ERROR_DESTROYING_DYNAMIC_REGION__0, fullRegionName,
e);
throw e;
}
- if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine("Destroyed Dynamic Region " + fullRegionName);
+ if (c.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ c.getLogger().convertToLogWriterI18n().fine("Destroyed Dynamic Region " + fullRegionName);
}
}
@@ -838,7 +842,7 @@ protected void buildDynamicRegion(EntryEvent event) {
Region region = createDynamicRegionImpl(parentRegionName, newRegionName, false);
doAfterRegionCreated(region, true, true, event.getDistributedMember());
} catch (Exception e) {
- c.getLoggerI18n().warning(
+ c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_CREATE_DYNAMIC_REGION__0,
newRegionName, e);
}
@@ -866,7 +870,7 @@ protected void razeDynamicRegion(EntryEvent event) {
doAfterRegionDestroyed(drRegion, true, event.getOperation().isDistributed(),
event.getOperation().isExpiration(), event.getDistributedMember());
} catch (Exception e) {
- c.getLoggerI18n().warning(
+ c.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_DESTROY_DYNAMIC_REGION__0,
fullRegionName, e);
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
index e3b2449d12..10ef0aebd3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQueryService.java
@@ -190,11 +190,11 @@ public Index createIndex(String indexName, IndexType indexType, String indexedEx
parIndex = (PartitionedIndex) ((PartitionedRegion) region).createIndex(false, indexType,
indexName, indexedExpression, fromClause, imports, loadEntries);
} catch (ForceReattemptException ex) {
- region.getCache().getLoggerI18n().info(
+ region.getCache().getLogger().convertToLogWriterI18n().info(
LocalizedStrings.DefaultQueryService_EXCEPTION_WHILE_CREATING_INDEX_ON_PR_DEFAULT_QUERY_PROCESSOR,
ex);
} catch (IndexCreationException exx) {
- region.getCache().getLoggerI18n().info(
+ region.getCache().getLogger().convertToLogWriterI18n().info(
LocalizedStrings.DefaultQueryService_EXCEPTION_WHILE_CREATING_INDEX_ON_PR_DEFAULT_QUERY_PROCESSOR,
exx);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
index d292ca9c5d..229b8169cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
@@ -378,8 +378,9 @@ private static void register(String instantiatorClassName, InstantiatorAttribute
InternalDataSerializer.getCachedClass(holder.getInstantiatedClassName());
} catch (ClassNotFoundException cnfe) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache != null && cache.getLoggerI18n() != null && cache.getLoggerI18n().infoEnabled()) {
- cache.getLoggerI18n().info(
+ if (cache != null && cache.getLogger().convertToLogWriterI18n() != null
+ && cache.getLogger().convertToLogWriterI18n().infoEnabled()) {
+ cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.InternalInstantiator_COULD_NOT_LOAD_INSTANTIATOR_CLASS_0,
new Object[] {cnfe.getMessage()});
}
@@ -555,9 +556,9 @@ public static Instantiator getInstantiator(int classId) {
}
} catch (ClassNotFoundException cnfe) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache != null && cache.getLoggerI18n() != null
- && cache.getLoggerI18n().infoEnabled()) {
- cache.getLoggerI18n().info(
+ if (cache != null && cache.getLogger().convertToLogWriterI18n() != null
+ && cache.getLogger().convertToLogWriterI18n().infoEnabled()) {
+ cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.InternalInstantiator_COULD_NOT_LOAD_INSTANTIATOR_CLASS_0,
new Object[] {cnfe.getMessage()});
}
@@ -681,9 +682,9 @@ protected static Instantiator newInstance(Class instantiatorClass, Class instant
}
} catch (ClassNotFoundException cnfe) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache != null && cache.getLoggerI18n() != null
- && cache.getLoggerI18n().infoEnabled()) {
- cache.getLoggerI18n().info(
+ if (cache != null && cache.getLogger().convertToLogWriterI18n() != null
+ && cache.getLogger().convertToLogWriterI18n().infoEnabled()) {
+ cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.InternalInstantiator_COULD_NOT_LOAD_INSTANTIATOR_CLASS_0,
new Object[] {cnfe.getMessage()});
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
index ad33588b5c..51716a35de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientHealthMonitoringRegion.java
@@ -85,7 +85,7 @@ private static void initialize(GemFireCacheImpl cache) {
currentInstance = cache.createVMRegion(ADMIN_REGION_NAME, regionAttrs, internalArgs);
} catch (Exception ex) {
- cache.getLoggerI18n().error(
+ cache.getLogger().convertToLogWriterI18n().error(
LocalizedStrings.ClientHealthMonitoringRegion_ERROR_WHILE_CREATING_AN_ADMIN_REGION, ex);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
index de6a43a88b..525fea7e19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/ClientStatsManager.java
@@ -70,7 +70,7 @@ public static synchronized void publishClientStats(PoolImpl pool) {
if (!initializeStatistics(currentCache)) {
return; // handles null case too
}
- LogWriterI18n logger = currentCache.getLoggerI18n();
+ LogWriterI18n logger = currentCache.getLogger().convertToLogWriterI18n();
if (logger.fineEnabled())
logger.fine("Entering ClientStatsManager#publishClientStats...");
@@ -126,7 +126,7 @@ private static boolean initializeStatistics(GemFireCacheImpl currentCache) {
if (currentCache == null) {
return false;
}
- LogWriterI18n logger = currentCache.getLoggerI18n();
+ LogWriterI18n logger = currentCache.getLogger().convertToLogWriterI18n();
InternalDistributedSystem ds = (InternalDistributedSystem) currentCache.getDistributedSystem();
if (currentCache.isClosed()) {
return false;
@@ -192,7 +192,7 @@ private static ClientHealthStats getClientHealthStats(GemFireCacheImpl currentCa
return null;
}
ClientHealthStats stats = new ClientHealthStats();
- LogWriterI18n logger = currentCache.getLoggerI18n();
+ LogWriterI18n logger = currentCache.getLogger().convertToLogWriterI18n();
{
int gets = -1;
int puts = -1;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index 136d7b9722..1dce7be795 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -2423,8 +2423,8 @@ public boolean areSecondariesPingable() {
this.partitionedRegion.getRegionAdvisor().getBucketOwners(this.getId());
hostingservers.remove(cache.getDistributedSystem().getDistributedMember());
- if (cache.getLoggerI18n().fineEnabled())
- cache.getLoggerI18n()
+ if (cache.getLogger().convertToLogWriterI18n().fineEnabled())
+ cache.getLogger().convertToLogWriterI18n()
.fine("Pinging secondaries of bucket " + this.getId() + " on servers " + hostingservers);
if (hostingservers.size() == 0)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index a3c4a931b9..4d474d94c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -330,7 +330,7 @@ public synchronized void start() throws IOException {
if (cache instanceof GemFireCacheImpl) {
ClientHealthMonitoringRegion.getInstance((GemFireCacheImpl) cache);
}
- this.cache.getLoggerI18n()
+ this.cache.getLogger().convertToLogWriterI18n()
.config(LocalizedStrings.CacheServerImpl_CACHESERVER_CONFIGURATION___0, getConfig());
/*
@@ -406,7 +406,7 @@ public synchronized void stop() {
this.loadMonitor.stop();
}
} catch (RuntimeException e) {
- cache.getLoggerI18n()
+ cache.getLogger().convertToLogWriterI18n()
.warning(LocalizedStrings.CacheServerImpl_CACHESERVER_ERROR_CLOSING_LOAD_MONITOR, e);
firstException = e;
}
@@ -416,7 +416,7 @@ public synchronized void stop() {
this.advisor.close();
}
} catch (RuntimeException e) {
- cache.getLoggerI18n()
+ cache.getLogger().convertToLogWriterI18n()
.warning(LocalizedStrings.CacheServerImpl_CACHESERVER_ERROR_CLOSING_ADVISOR, e);
firstException = e;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 68fdbebac6..36f86a1b57 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -3368,7 +3368,8 @@ public long postRemoveAllSend(DistributedRemoveAllOperation op,
if (op.removeAllDataSize > 0) {
token = op.startOperation();
} else {
- getCache().getLoggerI18n().fine("DR.postRemoveAll: no data to distribute");
+ getCache().getLogger().convertToLogWriterI18n()
+ .fine("DR.postRemoveAll: no data to distribute");
}
return token;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 869181432a..81859098c5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -1333,11 +1333,11 @@ private void startRedisServer() {
String bindAddress = system.getConfig().getRedisBindAddress();
assert bindAddress != null;
if (bindAddress.equals(DistributionConfig.DEFAULT_REDIS_BIND_ADDRESS)) {
- getLoggerI18n().info(
+ getLogger().convertToLogWriterI18n().info(
LocalizedStrings.GemFireCacheImpl_STARTING_GEMFIRE_REDIS_SERVER_ON_PORT_0,
new Object[] {port});
} else {
- getLoggerI18n().info(
+ getLogger().convertToLogWriterI18n().info(
LocalizedStrings.GemFireCacheImpl_STARTING_GEMFIRE_REDIS_SERVER_ON_BIND_ADDRESS_0_PORT_1,
new Object[] {bindAddress, port});
}
@@ -2926,16 +2926,6 @@ public LogWriter getSecurityLogger() {
return this.system.getSecurityLogWriter();
}
- @Override
- public LogWriterI18n getLoggerI18n() {
- return this.system.getInternalLogWriter();
- }
-
- @Override
- public LogWriterI18n getSecurityLoggerI18n() {
- return this.system.getSecurityInternalLogWriter();
- }
-
public InternalLogWriter getInternalLogWriter() {
return this.system.getInternalLogWriter();
}
@@ -3554,7 +3544,7 @@ public final Region getPartitionedRegion(String path, boolean returnDestroyedReg
String[] pathParts = parsePath(path);
LocalRegion root;
- LogWriterI18n logger = getLoggerI18n();
+ LogWriterI18n logger = getLogger().convertToLogWriterI18n();
synchronized (this.rootRegions) {
root = (LocalRegion) this.rootRegions.get(pathParts[0]);
if (root == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
index 9946f268c3..c37adc7b42 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
@@ -173,7 +173,7 @@ public void close() {
}
public void handleDiskAccessException(DiskAccessException dae) {
- getDiskStore().getCache().getLoggerI18n().error(
+ getDiskStore().getCache().getLogger().convertToLogWriterI18n().error(
LocalizedStrings.PlaceHolderDiskRegion_A_DISKACCESSEXCEPTION_HAS_OCCURED_WHILE_RECOVERING_FROM_DISK,
getName(), dae);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
index 0e46891261..d4d51e28b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
@@ -77,8 +77,9 @@ public static boolean send(GemFireCacheImpl cache, Set<InternalDistributedMember
spm.setRecipients(filteredRecipients);
Set failedServers = null;
try {
- if (cache.getLoggerI18n().fineEnabled())
- cache.getLoggerI18n().fine("Pinging following servers " + filteredRecipients);
+ if (cache.getLogger().convertToLogWriterI18n().fineEnabled())
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("Pinging following servers " + filteredRecipients);
failedServers = dm.putOutgoing(spm);
// wait for the replies for timeout msecs
@@ -88,18 +89,21 @@ public static boolean send(GemFireCacheImpl cache, Set<InternalDistributedMember
// If the reply is not received in the stipulated time, throw an exception
if (!receivedReplies) {
- cache.getLoggerI18n().error(LocalizedStrings.Server_Ping_Failure, filteredRecipients);
+ cache.getLogger().convertToLogWriterI18n().error(LocalizedStrings.Server_Ping_Failure,
+ filteredRecipients);
return false;
}
} catch (Throwable e) {
- cache.getLoggerI18n().error(LocalizedStrings.Server_Ping_Failure, filteredRecipients, e);
+ cache.getLogger().convertToLogWriterI18n().error(LocalizedStrings.Server_Ping_Failure,
+ filteredRecipients, e);
return false;
}
if (failedServers == null || failedServers.size() == 0)
return true;
- cache.getLoggerI18n().info(LocalizedStrings.Server_Ping_Failure, failedServers);
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.Server_Ping_Failure,
+ failedServers);
return false;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 0de41bf7da..17e2ccb093 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -272,9 +272,10 @@ public void stopMonitoring() {
NotificationEmitter emitter = (NotificationEmitter) ManagementFactory.getMemoryMXBean();
try {
emitter.removeNotificationListener(this, null, null);
- this.cache.getLoggerI18n().fine("Removed Memory MXBean notification listener" + this);
+ this.cache.getLogger().convertToLogWriterI18n()
+ .fine("Removed Memory MXBean notification listener" + this);
} catch (ListenerNotFoundException e) {
- this.cache.getLoggerI18n().fine(
+ this.cache.getLogger().convertToLogWriterI18n().fine(
"This instance '" + toString() + "' was not registered as a Memory MXBean listener");
}
@@ -309,8 +310,9 @@ private boolean startCacheStatListener() {
if (si.getTextId().contains(tenuredPoolName)
&& si.getType().getName().contains("PoolStats")) {
sampler.addLocalStatListener(this.statListener, si, "currentUsedMemory");
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine("Registered stat listener for " + si.getTextId());
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
+ .fine("Registered stat listener for " + si.getTextId());
}
return true;
@@ -347,8 +349,8 @@ public Thread newThread(Runnable r) {
this.pollerExecutor.scheduleAtFixedRate(new HeapPoller(), POLLER_INTERVAL, POLLER_INTERVAL,
TimeUnit.MILLISECONDS);
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine(
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n().fine(
"Started GemfireHeapPoller to poll the heap every " + POLLER_INTERVAL + " milliseconds");
}
}
@@ -572,7 +574,7 @@ void startJVMThresholdListener() {
}
final long usageThreshold = memoryPoolMXBean.getUsageThreshold();
- this.cache.getLoggerI18n().info(
+ this.cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.HeapMemoryMonitor_OVERRIDDING_MEMORYPOOLMXBEAN_HEAP_0_NAME_1,
new Object[] {Long.valueOf(usageThreshold), memoryPoolMXBean.getName()});
@@ -596,8 +598,8 @@ private boolean skipEventDueToToleranceLimits(MemoryState oldState, MemoryState
this.evictionToleranceCounter++;
this.criticalToleranceCounter = 0;
if (this.evictionToleranceCounter <= memoryStateChangeTolerance) {
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n()
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
.fine("State " + newState + " ignored. toleranceCounter:"
+ this.evictionToleranceCounter + " MEMORY_EVENT_TOLERANCE:"
+ memoryStateChangeTolerance);
@@ -608,8 +610,8 @@ private boolean skipEventDueToToleranceLimits(MemoryState oldState, MemoryState
this.criticalToleranceCounter++;
this.evictionToleranceCounter = 0;
if (this.criticalToleranceCounter <= memoryStateChangeTolerance) {
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n()
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
.fine("State " + newState + " ignored. toleranceCounter:"
+ this.criticalToleranceCounter + " MEMORY_EVENT_TOLERANCE:"
+ memoryStateChangeTolerance);
@@ -619,8 +621,8 @@ private boolean skipEventDueToToleranceLimits(MemoryState oldState, MemoryState
} else {
this.criticalToleranceCounter = 0;
this.evictionToleranceCounter = 0;
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine("TOLERANCE counters reset");
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n().fine("TOLERANCE counters reset");
}
}
return false;
@@ -650,12 +652,12 @@ public static long getTenuredPoolMaxMemory() {
synchronized void processLocalEvent(MemoryEvent event) {
assert event.isLocal();
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine("Handling new local event " + event);
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n().fine("Handling new local event " + event);
}
if (event.getState().isCritical() && !event.getPreviousState().isCritical()) {
- this.cache.getLoggerI18n().error(
+ this.cache.getLogger().convertToLogWriterI18n().error(
LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD,
new Object[] {event.getMember(), "heap"});
if (!this.cache.isQueryMonitorDisabledForLowMemory()) {
@@ -664,7 +666,7 @@ synchronized void processLocalEvent(MemoryEvent event) {
}
} else if (!event.getState().isCritical() && event.getPreviousState().isCritical()) {
- this.cache.getLoggerI18n().error(
+ this.cache.getLogger().convertToLogWriterI18n().error(
LocalizedStrings.MemoryMonitor_MEMBER_BELOW_CRITICAL_THRESHOLD,
new Object[] {event.getMember(), "heap"});
if (!this.cache.isQueryMonitorDisabledForLowMemory()) {
@@ -673,15 +675,18 @@ synchronized void processLocalEvent(MemoryEvent event) {
}
if (event.getState().isEviction() && !event.getPreviousState().isEviction()) {
- this.cache.getLoggerI18n().info(LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_HIGH_THRESHOLD,
+ this.cache.getLogger().convertToLogWriterI18n().info(
+ LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_HIGH_THRESHOLD,
new Object[] {event.getMember(), "heap"});
} else if (!event.getState().isEviction() && event.getPreviousState().isEviction()) {
- this.cache.getLoggerI18n().info(LocalizedStrings.MemoryMonitor_MEMBER_BELOW_HIGH_THRESHOLD,
+ this.cache.getLogger().convertToLogWriterI18n().info(
+ LocalizedStrings.MemoryMonitor_MEMBER_BELOW_HIGH_THRESHOLD,
new Object[] {event.getMember(), "heap"});
}
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine("Informing remote members of event " + event);
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
+ .fine("Informing remote members of event " + event);
}
this.resourceAdvisor.updateRemoteProfile();
@@ -709,7 +714,7 @@ public void notifyListeners(final Set<ResourceListener> listeners, final Resourc
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.cache.getLoggerI18n()
+ this.cache.getLogger().convertToLogWriterI18n()
.error(LocalizedStrings.MemoryMonitor_EXCEPTION_OCCURED_WHEN_NOTIFYING_LISTENERS, t);
}
}
@@ -779,13 +784,13 @@ public void run() {
}
}
});
- if (HeapMemoryMonitor.this.cache.getLoggerI18n().fineEnabled()) {
- HeapMemoryMonitor.this.cache.getLoggerI18n().fine(
+ if (HeapMemoryMonitor.this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ HeapMemoryMonitor.this.cache.getLogger().convertToLogWriterI18n().fine(
"StatSampler scheduled a " + "handleNotification call with " + usedBytes + " bytes");
}
} catch (RejectedExecutionException e) {
if (!HeapMemoryMonitor.this.resourceManager.isClosed()) {
- HeapMemoryMonitor.this.cache.getLoggerI18n()
+ HeapMemoryMonitor.this.cache.getLogger().convertToLogWriterI18n()
.warning(LocalizedStrings.ResourceManager_REJECTED_EXECUTION_CAUSE_NOHEAP_EVENTS);
}
} catch (CacheClosedException e) {
@@ -815,7 +820,8 @@ public void run() {
try {
updateStateAndSendEvent(getBytesUsed());
} catch (Exception e) {
- HeapMemoryMonitor.this.cache.getLoggerI18n().fine("Poller Thread caught exception:", e);
+ HeapMemoryMonitor.this.cache.getLogger().convertToLogWriterI18n()
+ .fine("Poller Thread caught exception:", e);
}
// TODO: do we need to handle errors too?
}
@@ -842,7 +848,7 @@ public void setTestMaxMemoryBytes(final long testMaxMemoryBytes) {
builder.append(" maxMemoryBytes:" + newThresholds.getMaxMemoryBytes());
builder.append(" criticalThresholdBytes:" + newThresholds.getCriticalThresholdBytes());
builder.append(" evictionThresholdBytes:" + newThresholds.getEvictionThresholdBytes());
- this.cache.getLoggerI18n().fine(builder.toString());
+ this.cache.getLogger().convertToLogWriterI18n().fine(builder.toString());
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
index e98b6db448..51b3bc53d1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java
@@ -228,13 +228,13 @@ public void removeResourceListener(final ResourceType resourceType,
public void deliverEventFromRemote(final ResourceEvent event) {
assert !event.isLocal();
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n()
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
.fine("New remote event to deliver for member " + event.getMember() + ": event=" + event);
}
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n()
+ if (this.cache.getLogger().convertToLogWriterI18n().fineEnabled()) {
+ this.cache.getLogger().convertToLogWriterI18n()
.fine("Remote event to deliver for member " + event.getMember() + ":" + event);
}
@@ -283,7 +283,7 @@ void runWithNotifyExecutor(Runnable runnable) {
this.notifyExecutor.execute(runnable);
} catch (RejectedExecutionException e) {
if (!isClosed()) {
- this.cache.getLoggerI18n()
+ this.cache.getLogger().convertToLogWriterI18n()
.warning(LocalizedStrings.ResourceManager_REJECTED_EXECUTION_CAUSE_NOHEAP_EVENTS);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 3b0c2ff578..53b69705ef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -852,9 +852,9 @@ protected boolean close(boolean checkQueue, boolean stoppedNormally) {
}
}
} catch (Exception ex) {
- if (this._cache.getSecurityLoggerI18n().warningEnabled()) {
- this._cache.getSecurityLoggerI18n().warning(LocalizedStrings.TWO_ARG_COLON,
- new Object[] {this, ex});
+ if (this._cache.getSecurityLogger().convertToLogWriterI18n().warningEnabled()) {
+ this._cache.getSecurityLogger().convertToLogWriterI18n()
+ .warning(LocalizedStrings.TWO_ARG_COLON, new Object[] {this, ex});
}
}
// Notify the caller whether to keep this proxy. If the proxy is durable
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index ecd9c7a729..23517287a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -268,8 +268,16 @@ public ServerConnection(Socket s, Cache c, CachedRegionHelper helper, CacheServe
this.stats = stats;
this.acceptor = (AcceptorImpl) acceptor;
this.crHelper = helper;
- this.logWriter = (InternalLogWriter) c.getLoggerI18n();
- this.securityLogWriter = (InternalLogWriter) c.getSecurityLoggerI18n();
+ if (c.getLogger() != null) {
+ this.logWriter = (InternalLogWriter) c.getLogger().convertToLogWriterI18n();
+ } else {
+ this.logWriter = null;
+ }
+ if (c.getSecurityLogger() != null) {
+ this.securityLogWriter = (InternalLogWriter) c.getSecurityLogger().convertToLogWriterI18n();
+ } else {
+ this.securityLogWriter = null;
+ }
this.communicationModeStr = communicationModeStr;
this.communicationMode = communicationMode;
this.principal = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index f67dd81a05..26f23b4523 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -341,9 +341,10 @@ public void run() {
if (txState != null) {
cache = GemFireCacheImpl.getExisting("executing function");
cache.getTxManager().masqueradeAs(txState);
- if (cache.getLoggerI18n().warningEnabled() && !ASYNC_TX_WARNING_ISSUED) {
+ if (cache.getLogger().convertToLogWriterI18n().warningEnabled()
+ && !ASYNC_TX_WARNING_ISSUED) {
ASYNC_TX_WARNING_ISSUED = true;
- cache.getLoggerI18n().warning(
+ cache.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.ExecuteFunction66_TRANSACTIONAL_FUNCTION_WITHOUT_RESULT);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
index 10ae7a533f..85597eb3cd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
@@ -195,8 +195,8 @@ public Entry getEntry(KeyInfo keyInfo, boolean allowTombstones) {
private void trackBucketForTx(KeyInfo keyInfo) {
- if (region.getCache().getLoggerI18n().fineEnabled()) {
- region.getCache().getLoggerI18n()
+ if (region.getCache().getLogger().convertToLogWriterI18n().fineEnabled()) {
+ region.getCache().getLogger().convertToLogWriterI18n()
.fine("adding bucket:" + keyInfo.getBucketId() + " for tx:" + state.getTransactionId());
}
if (keyInfo.getBucketId() >= 0) {
@@ -441,7 +441,8 @@ public void postPutAll(DistributedPutAllOperation putallO, VersionedObjectList s
pr.prStats.endPutAll(startTime);
if (partialKeys.hasFailure()) {
- pr.getCache().getLoggerI18n().info(LocalizedStrings.Region_PutAll_Applied_PartialKeys_0_1,
+ pr.getCache().getLogger().convertToLogWriterI18n().info(
+ LocalizedStrings.Region_PutAll_Applied_PartialKeys_0_1,
new Object[] {pr.getFullPath(), partialKeys});
if (putallO.isBridgeOperation()) {
if (partialKeys.getFailure() instanceof CancelException) {
@@ -501,7 +502,8 @@ public void postRemoveAll(DistributedRemoveAllOperation op, VersionedObjectList
pr.prStats.endRemoveAll(startTime);
if (partialKeys.hasFailure()) {
- pr.getCache().getLoggerI18n().info(LocalizedStrings.Region_RemoveAll_Applied_PartialKeys_0_1,
+ pr.getCache().getLogger().convertToLogWriterI18n().info(
+ LocalizedStrings.Region_RemoveAll_Applied_PartialKeys_0_1,
new Object[] {pr.getFullPath(), partialKeys});
if (op.isBridgeOperation()) {
if (partialKeys.getFailure() instanceof CancelException) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index b0b7d1b1b8..259b727f3b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -479,7 +479,7 @@ void create(GemFireCacheImpl cache)
factory.create(senderCreation.getId(), senderCreation.getRemoteDSId());
// Start the sender if it is not set to manually start
if (gatewaySender.isManualStart()) {
- cache.getLoggerI18n().info(
+ cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.CacheCreation_0_IS_NOT_BEING_STARTED_SINCE_IT_IS_CONFIGURED_FOR_MANUAL_START,
gatewaySender);
}
@@ -545,7 +545,7 @@ void create(GemFireCacheImpl cache)
factory.setHostnameForSenders(receiverCreation.getHost());
GatewayReceiver receiver = factory.create();
if (receiver.isManualStart()) {
- cache.getLoggerI18n().info(
+ cache.getLogger().convertToLogWriterI18n().info(
LocalizedStrings.CacheCreation_0_IS_NOT_BEING_STARTED_SINCE_IT_IS_CONFIGURED_FOR_MANUAL_START,
receiver);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
index 712bbfbdc0..a776e5ea44 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
@@ -259,7 +259,7 @@ void createRoot(Cache cache)
setMutableAttributes(root);
} catch (RegionDestroyedException ex) {
// Region was concurrently destroyed.
- cache.getLoggerI18n().warning(
+ cache.getLogger().convertToLogWriterI18n().warning(
LocalizedStrings.RegionCreation_REGION_DESTROYED_DURING_INITIALIZATION, this.name);
// do nothing
}
@@ -387,7 +387,8 @@ public void setAttributes(RegionAttributes attrs, boolean setRefid) {
&& attrs.getEvictionAttributes().getAlgorithm().isLRUMemory()
&& attrs.getPartitionAttributes().getLocalMaxMemory() != 0 && attrs.getEvictionAttributes()
.getMaximum() != attrs.getPartitionAttributes().getLocalMaxMemory()) {
- getCache().getLoggerI18n().warning(LocalizedStrings.Mem_LRU_Eviction_Attribute_Reset,
+ getCache().getLogger().convertToLogWriterI18n().warning(
+ LocalizedStrings.Mem_LRU_Eviction_Attribute_Reset,
new Object[] {this.getName(), attrs.getEvictionAttributes().getMaximum(),
attrs.getPartitionAttributes().getLocalMaxMemory()});
this.attrs.setEvictionAttributes(attrs.getEvictionAttributes().createLRUMemoryAttributes(
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
index b42930b8a6..83c7d48b96 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
@@ -70,7 +70,7 @@ public AuthorizeRequest(String authzFactoryName, DistributedMember dm, Principal
this.isPrincipalSerializable = false;
}
- this.logger = cache.getSecurityLoggerI18n();
+ this.logger = cache.getSecurityLogger().convertToLogWriterI18n();
Method authzMethod = ClassLoadUtil.methodFromName(authzFactoryName);
this.authzCallback = (AccessControl) authzMethod.invoke(null, (Object[]) null);
this.authzCallback.init(principal, dm, cache);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
index 18280f71e7..13f361e132 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
@@ -63,7 +63,7 @@ public AuthorizeRequestPP(String postAuthzFactoryName, ClientProxyMembershipID i
} else {
this.isPrincipalSerializable = false;
}
- this.logger = cache.getSecurityLoggerI18n();
+ this.logger = cache.getSecurityLogger().convertToLogWriterI18n();
Method postAuthzMethod = ClassLoadUtil.methodFromName(postAuthzFactoryName);
this.postAuthzCallback = (AccessControl) postAuthzMethod.invoke(null, (Object[]) null);
this.postAuthzCallback.init(principal, id.getDistributedMember(), cache);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
index a05170c4cc..f46c527f3e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPostAuthorization.java
@@ -78,7 +78,7 @@ public void init(Principal principal, DistributedMember remoteMember, Cache cach
throws NotAuthorizedException {
this.principalName = (principal == null ? "" : principal.getName());
- this.logger = cache.getSecurityLoggerI18n();
+ this.logger = cache.getSecurityLogger().convertToLogWriterI18n();
}
private byte[] checkObjectAuth(byte[] serializedObj, boolean isObject) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
index 92350625a5..b6c3b50eb6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/FilterPreAuthorization.java
@@ -71,7 +71,7 @@ public static AccessControl create() {
public void init(Principal principal, DistributedMember remoteMember, Cache cache)
throws NotAuthorizedException {
- this.logger = cache.getSecurityLoggerI18n();
+ this.logger = cache.getLogger().convertToLogWriterI18n();
}
public boolean authorizeOperation(String regionName, OperationContext context) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 118fb4b925..b9479f95fd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -184,10 +184,10 @@ public Object call() throws Exception {
InternalResourceManager irm = (InternalResourceManager) getCache().getResourceManager();
irm.setCriticalHeapPercentage(90f);
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
HeapMemoryMonitor.setTestBytesUsedForThresholdSet(950);
irm.getHeapMonitor().updateStateAndSendEvent();
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
return null;
}
});
@@ -441,9 +441,9 @@ public void testEventDelivery() throws Exception {
server2.invoke(new SerializableCallable("NORMAL->CRITICAL") {
public Object call() throws Exception {
GemFireCacheImpl gfCache = (GemFireCacheImpl) getCache();
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
gfCache.getInternalResourceManager().getHeapMonitor().updateStateAndSendEvent(950);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
return null;
}
});
@@ -460,9 +460,9 @@ public Object call() throws Exception {
server2.invoke(new SerializableCallable("CRITICAL->EVICTION") {
public Object call() throws Exception {
GemFireCacheImpl gfCache = (GemFireCacheImpl) getCache();
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
gfCache.getInternalResourceManager().getHeapMonitor().updateStateAndSendEvent(850);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
return null;
}
});
@@ -928,9 +928,9 @@ public Object call() throws Exception {
server1.invoke(new SerializableCallable() {
public Object call() throws Exception {
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
fail("expected low memory exception was not thrown");
} catch (LowMemoryException e) {
// expected
@@ -943,9 +943,9 @@ public Object call() throws Exception {
server1.invoke(new SerializableCallable() {
public Object call() throws Exception {
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
FunctionService.onMembers(getSystem()).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
fail("expected low memory exception was not thrown");
} catch (LowMemoryException e) {
// expected
@@ -957,9 +957,9 @@ public Object call() throws Exception {
client.invoke(new SerializableCallable() {
public Object call() throws Exception {
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
fail("expected low memory exception was not thrown");
} catch (FunctionException e) {
if (!(e.getCause().getCause() instanceof LowMemoryException)) {
@@ -1051,9 +1051,9 @@ public Object call() throws Exception {
accessor.invoke(new SerializableCallable() {
public Object call() throws Exception {
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
FunctionService.onRegion(getRootRegion().getSubregion(regionName)).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
fail("expected low memory exception was not thrown");
} catch (LowMemoryException e) {
// expected
@@ -1066,9 +1066,9 @@ public Object call() throws Exception {
accessor.invoke(new SerializableCallable() {
public Object call() throws Exception {
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
FunctionService.onMembers(getSystem()).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
fail("expected low memory exception was not thrown");
} catch (LowMemoryException e) {
// expected
@@ -1125,9 +1125,10 @@ public Object call() throws Exception {
s.add(sickKey1);
Execution e = FunctionService.onRegion(pr);
try {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
e.withFilter(s).withArgs((Serializable) s).execute(function);
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n()
+ .fine(removeExpectedFunctionExString);
fail("expected LowMemoryExcception was not thrown");
} catch (LowMemoryException ex) {
// expected
@@ -1410,11 +1411,11 @@ public Object call() throws Exception {
private void setUsageAboveCriticalThreshold(VM vm) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
.updateStateAndSendEvent(950);
HeapMemoryMonitor.setTestBytesUsedForThresholdSet(950);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
return null;
}
});
@@ -1423,11 +1424,11 @@ public Object call() throws Exception {
private void setUsageAboveEvictionThreshold(VM vm) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
HeapMemoryMonitor.setTestBytesUsedForThresholdSet(850);
((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
.updateStateAndSendEvent(850);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
return null;
}
});
@@ -1436,10 +1437,10 @@ public Object call() throws Exception {
private void setUsageBelowEviction(VM vm) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
((GemFireCacheImpl) getCache()).getInternalResourceManager().getHeapMonitor()
.updateStateAndSendEvent(750);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
return null;
}
});
@@ -1827,14 +1828,14 @@ public void close() {}
r.getAll(createRanges(10, 12));
assertEquals(expectedInvocations++, numLoaderInvocations.get());
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
fakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh + 0.1f)); // usage above
// critical by
// 10%
assertTrue(fakeHeapUsage > 0);
assertTrue(fakeHeapUsage <= fakeHeapMaxSize);
hmm.updateStateAndSendEvent(fakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
assertTrue(hmm.getState().isCritical());
{
@@ -1850,9 +1851,9 @@ public void close() {}
fakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh - 0.3f)); // below critical
// by 30%
assertTrue(fakeHeapMaxSize > 0);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(fakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
{
Integer k = new Integer(3);
@@ -2009,9 +2010,9 @@ public void close() {}
// critical
// by 30%
assertTrue(fakeHeapMaxSize > 0);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(newfakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
{
Integer k = new Integer(3);
@@ -2075,9 +2076,9 @@ public Object call() throws Exception {
// critical by
// 30%
assertTrue(fakeHeapMaxSize > 0);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(newfakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
{
Integer k = new Integer(6);
@@ -2243,9 +2244,9 @@ public Object call() throws Exception {
// by
// 30%
assertTrue(fakeHeapMaxSize > 0);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(newfakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
Integer k = new Integer(3); // same key as previously used, this time is should stick
Integer expectedInvocations8 = new Integer(expectedInvocations.incrementAndGet());
@@ -2271,7 +2272,7 @@ public Object call() throws Exception {
assertEquals(k.toString(), r.get(k, expectedInvocations9)); // no load
// Go critical in accessor
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
long newfakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh + 0.1f)); // usage
// above
// critical
@@ -2279,7 +2280,7 @@ public Object call() throws Exception {
assertTrue(newfakeHeapUsage > 0);
assertTrue(newfakeHeapUsage <= fakeHeapMaxSize);
hmm.updateStateAndSendEvent(newfakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
assertTrue(hmm.getState().isCritical());
k = new Integer(5);
Integer expectedInvocations10 = new Integer(expectedInvocations.incrementAndGet());
@@ -2292,9 +2293,9 @@ public Object call() throws Exception {
// critical by
// 30%
assertTrue(fakeHeapMaxSize > 0);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(newfakeHeapUsage);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
return expectedInvocations10;
}
@@ -2353,28 +2354,28 @@ public void close() {}
private SerializableRunnable addExpectedException = new SerializableRunnable("addExpectedEx") {
public void run() {
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
};
};
private SerializableRunnable removeExpectedException =
new SerializableRunnable("removeExpectedException") {
public void run() {
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
};
};
private SerializableRunnable addExpectedFunctionException =
new SerializableRunnable("addExpectedFunctionException") {
public void run() {
- getCache().getLoggerI18n().fine(addExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedFunctionExString);
};
};
private SerializableRunnable removeExpectedFunctionException =
new SerializableRunnable("removeExpectedFunctionException") {
public void run() {
- getCache().getLoggerI18n().fine(removeExpectedFunctionExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedFunctionExString);
};
};
@@ -2396,13 +2397,13 @@ public Object call() throws Exception {
hmm.updateStateAndSendEvent(96);
assertFalse(hmm.getState().isCritical());
}
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
hmm.updateStateAndSendEvent(96);
assertTrue(hmm.getState().isCritical());
- getCache().getLoggerI18n().fine(removeExpectedExString);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
hmm.updateStateAndSendEvent(92);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
assertFalse(hmm.getState().isCritical());
HeapMemoryMonitor.setTestDisableMemoryUpdates(true);
return null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index b5dc9a90dd..3ec2e76586 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -291,14 +291,14 @@ public Object call() throws Exception {
private void setUsageAboveCriticalThreshold(final VM vm, final String regionName) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
Region region = getRootRegion().getSubregion(regionName);
if (!region.containsKey("oh1")) {
region.put("oh5", new byte[954204]);
} else {
region.put("oh5", new byte[122880]);
}
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
return null;
}
});
@@ -307,13 +307,13 @@ public Object call() throws Exception {
private void setUsageAboveEvictionThreshold(final VM vm, final String regionName) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
Region region = getRootRegion().getSubregion(regionName);
region.put("oh1", new byte[245760]);
region.put("oh2", new byte[184320]);
region.put("oh3", new byte[33488]);
region.put("oh4", new byte[378160]);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
return null;
}
});
@@ -322,14 +322,14 @@ public Object call() throws Exception {
private void setUsageBelowEviction(final VM vm, final String regionName) {
vm.invoke(new SerializableCallable() {
public Object call() throws Exception {
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
Region region = getRootRegion().getSubregion(regionName);
region.remove("oh1");
region.remove("oh2");
region.remove("oh3");
region.remove("oh4");
region.remove("oh5");
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
return null;
}
});
@@ -727,16 +727,16 @@ public void run2() throws CacheException {
private SerializableRunnable addExpectedException = new SerializableRunnable("addExpectedEx") {
public void run() {
- getCache().getLoggerI18n().fine(addExpectedExString);
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
};
};
private SerializableRunnable removeExpectedException =
new SerializableRunnable("removeExpectedException") {
public void run() {
- getCache().getLoggerI18n().fine(removeExpectedExString);
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
};
};
@@ -1235,10 +1235,10 @@ public void close() {}
r.getAll(createRanges(10, 12));
assertEquals(expectedInvocations++, numLoaderInvocations.get());
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
r.put("oh1", new byte[838860]);
r.put("oh3", new byte[157287]);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
WaitCriterion wc = new WaitCriterion() {
public String description() {
return "expected region " + r + " to set memoryThresholdReached";
@@ -1259,9 +1259,9 @@ public boolean done() {
r.getAll(createRanges(13, 15));
assertEquals(expectedInvocations++, numLoaderInvocations.get());
- getCache().getLoggerI18n().fine(addExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedBelow);
r.destroy("oh3");
- getCache().getLoggerI18n().fine(removeExpectedBelow);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedBelow);
wc = new WaitCriterion() {
public String description() {
return "expected region " + r + " to unset memoryThresholdReached";
@@ -1453,7 +1453,7 @@ public Object call() throws Exception {
InternalResourceManager irm = ((GemFireCacheImpl) getCache()).getInternalResourceManager();
final OffHeapMemoryMonitor ohm = irm.getOffHeapMonitor();
assertTrue(ohm.getState().isNormal());
- getCache().getLoggerI18n().fine(addExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(addExpectedExString);
final LocalRegion r = (LocalRegion) getRootRegion().getSubregion(regionName);
final long bytesUsedAfterSmallKey;
{
@@ -1528,7 +1528,7 @@ public boolean done() {
};
}
Wait.waitForCriterion(wc, 30000, 9, true);
- getCache().getLoggerI18n().fine(removeExpectedExString);
+ getCache().getLogger().convertToLogWriterI18n().fine(removeExpectedExString);
return bytesUsedAfterSmallKey;
}
});
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
index 2636d84bd4..ff42d76786 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
@@ -172,7 +172,7 @@ public void run2() throws CacheException {
public void printResults(SelectResults results, String message) {
Object r;
Struct s;
- LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+ LogWriterI18n logger = GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n();
logger.fine(message);
int row = 0;
for (Iterator iter = results.iterator(); iter.hasNext();) {
@@ -326,7 +326,7 @@ public void fromData(PdxReader in) {
@Override
public boolean equals(Object o) {
- GemFireCacheImpl.getInstance().getLoggerI18n()
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
.fine("In TestObject2.equals() this: " + this + " other :" + o);
TestObject2 other = (TestObject2) o;
if (_id == other._id) {
@@ -338,7 +338,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
- GemFireCacheImpl.getInstance().getLoggerI18n()
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
.fine("In TestObject2.hashCode() : " + this._id);
return this._id;
}
@@ -443,7 +443,8 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
- GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
+ .fine("In TestObject.hashCode() : " + this.id);
return this.id;
}
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
index 54715659a3..3bb51a5bd4 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
@@ -453,7 +453,7 @@ public void testTransactionalPutOnPartitionedRegion() throws Exception {
public Object call() throws Exception {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
- LogWriterI18n logger = getGemfireCache().getLoggerI18n();
+ LogWriterI18n logger = getGemfireCache().getLogger().convertToLogWriterI18n();
mgr.begin();
logger.fine("TEST:Commit-1");
@@ -772,7 +772,7 @@ public Object call() throws Exception {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
// mgr.begin();
- LogWriterI18n logger = getGemfireCache().getLoggerI18n();
+ LogWriterI18n logger = getGemfireCache().getLogger().convertToLogWriterI18n();
Region<CustId, Customer> custPR = getCache().getRegion(CUSTOMER_PR);
for (int i = 1; i <= 2; i++) {
@@ -1318,10 +1318,11 @@ public Object call() throws Exception {
BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
String primaryMember = br.getBucketAdvisor().getPrimary().toString();
- getGemfireCache().getLoggerI18n().fine("TEST:PRIMARY:" + primaryMember);
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:PRIMARY:" + primaryMember);
String memberId = getGemfireCache().getDistributedSystem().getMemberId();
- getGemfireCache().getLoggerI18n().fine("TEST:MEMBERID:" + memberId);
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:MEMBERID:" + memberId);
return null;
}
@@ -1337,10 +1338,11 @@ public Object call() throws Exception {
BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
String primaryMember = br.getBucketAdvisor().getPrimary().toString();
- getGemfireCache().getLoggerI18n().fine("TEST:PRIMARY:" + primaryMember);
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:PRIMARY:" + primaryMember);
String memberId = getGemfireCache().getDistributedSystem().getMemberId();
- getGemfireCache().getLoggerI18n().fine("TEST:MEMBERID:" + memberId);
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:MEMBERID:" + memberId);
return memberId.equals(primaryMember);
}
@@ -1365,15 +1367,18 @@ public WaitRelease(CountDownLatch cdl, String member) {
@Override
public void run() {
try {
- GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX WAITING - " + op);
+ GemFireCacheImpl.getExisting().getLogger().convertToLogWriterI18n()
+ .fine("TEST:TX WAITING - " + op);
cdl.await();
- GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX END WAITING");
+ GemFireCacheImpl.getExisting().getLogger().convertToLogWriterI18n()
+ .fine("TEST:TX END WAITING");
} catch (InterruptedException e) {
}
}
public void release() {
- GemFireCacheImpl.getExisting().getLoggerI18n().fine("TEST:TX COUNTDOWN - " + op);
+ GemFireCacheImpl.getExisting().getLogger().convertToLogWriterI18n()
+ .fine("TEST:TX COUNTDOWN - " + op);
cdl.countDown();
}
}
@@ -1416,15 +1421,16 @@ public Object call() throws Exception {
public void run() {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
- getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:DISTTX=" + mgr.isDistributed());
mgr.begin();
Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
CustId custIdOne = new CustId(1);
Customer customerOne = new Customer("name1_tx", "addr1");
- getGemfireCache().getLoggerI18n().fine("TEST:TX UPDATE");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX UPDATE");
prRegion.put(custIdOne, customerOne);
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT");
mgr.commit();
}
}.start();
@@ -1443,7 +1449,7 @@ public Object call() throws Exception {
CustId custIdOne = new CustId(1);
Customer customerOne = new Customer("name1_nontx", "addr1");
- getGemfireCache().getLoggerI18n().fine("TEST:TX NONTXUPDATE");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX NONTXUPDATE");
prRegion.put(custIdOne, customerOne);
return null;
}
@@ -1489,11 +1495,12 @@ public Object call() throws Exception {
BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custId);
RegionEntry re = br.getRegionEntry(custId);
- getGemfireCache().getLoggerI18n().fine("TEST:TX PRIMARY CUSTOMER=" + customer);
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:TX PRIMARY CUSTOMER=" + customer);
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("TEST:TX PRIMARY REGION VERSION=" + re.getVersionStamp().getRegionVersion());
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("TEST:TX PRIMARY ENTRY VERSION=" + re.getVersionStamp().getEntryVersion());
return null;
}
@@ -1510,11 +1517,12 @@ public Object call() throws Exception {
BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custId);
RegionEntry re = br.getRegionEntry(custId);
- getGemfireCache().getLoggerI18n().fine("TEST:TX SECONDARY CUSTOMER=" + customer);
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:TX SECONDARY CUSTOMER=" + customer);
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("TEST:TX SECONDARY REGION VERSION=" + re.getVersionStamp().getRegionVersion());
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("TEST:TX SECONDARY ENTRY VERSION=" + re.getVersionStamp().getEntryVersion());
return null;
}
@@ -1536,22 +1544,23 @@ public Object call() throws Exception {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
- getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
- getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:DISTTX=" + mgr.isDistributed());
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX BEGIN");
mgr.begin();
Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
CustId custIdOne = new CustId(1);
Customer customerOne = new Customer("name1", "addr1");
- getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX PUT 1");
prRegion.put(custIdOne, customerOne);
CustId custIdTwo = new CustId(2);
Customer customerTwo = new Customer("name2", "addr2");
- getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 2");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX PUT 2");
prRegion.put(custIdTwo, customerTwo);
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT");
mgr.commit();
return null;
}
@@ -1571,28 +1580,30 @@ public void testRegionAndEntryVersionsPR() throws Exception {
public Object call() throws Exception {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
- getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
- getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:DISTTX=" + mgr.isDistributed());
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX BEGIN");
mgr.begin();
Region<CustId, Customer> prRegion = getCache().getRegion(PERSISTENT_CUSTOMER_PR);
CustId custIdOne = new CustId(1);
Customer customerOne = new Customer("name1", "addr1");
- getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX PUT 1");
prRegion.put(custIdOne, customerOne);
BucketRegion br = ((PartitionedRegion) prRegion).getBucketRegion(custIdOne);
assertEquals(0L, br.getVersionVector().getCurrentVersion());
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 1");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT 1");
mgr.commit();
// Verify region version on the region
assertEquals(1L, br.getVersionVector().getCurrentVersion());
RegionEntry re = br.getRegionEntry(custIdOne);
- getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
// Verify region version on the region entry
assertEquals(1L, re.getVersionStamp().getRegionVersion());
@@ -1603,7 +1614,7 @@ public Object call() throws Exception {
mgr.begin();
prRegion.put(custIdOne, new Customer("name1_1", "addr1"));
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 2");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT 2");
assertEquals(1L, br.getVersionVector().getCurrentVersion());
mgr.commit();
@@ -1612,7 +1623,8 @@ public Object call() throws Exception {
assertEquals(2L, br.getVersionVector().getCurrentVersion());
re = br.getRegionEntry(custIdOne);
- getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
// Verify region version on the region entry
assertEquals(2L, re.getVersionStamp().getRegionVersion());
@@ -1660,28 +1672,30 @@ public void testRegionAndEntryVersionsRR() throws Exception {
public Object call() throws Exception {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
- getGemfireCache().getLoggerI18n().fine("TEST:DISTTX=" + mgr.isDistributed());
- getGemfireCache().getLoggerI18n().fine("TEST:TX BEGIN");
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:DISTTX=" + mgr.isDistributed());
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX BEGIN");
mgr.begin();
Region<CustId, Customer> region = getCache().getRegion(CUSTOMER_RR);
CustId custIdOne = new CustId(1);
Customer customerOne = new Customer("name1", "addr1");
- getGemfireCache().getLoggerI18n().fine("TEST:TX PUT 1");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX PUT 1");
region.put(custIdOne, customerOne);
LocalRegion lr = (LocalRegion) region;
assertEquals(0L, lr.getVersionVector().getCurrentVersion());
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 1");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT 1");
mgr.commit();
// Verify region version on the region
assertEquals(1L, lr.getVersionVector().getCurrentVersion());
RegionEntry re = lr.getRegionEntry(custIdOne);
- getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
// Verify region version on the region entry
assertEquals(1L, re.getVersionStamp().getRegionVersion());
@@ -1692,7 +1706,7 @@ public Object call() throws Exception {
mgr.begin();
region.put(custIdOne, new Customer("name1_1", "addr1"));
- getGemfireCache().getLoggerI18n().fine("TEST:TX COMMIT 2");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("TEST:TX COMMIT 2");
assertEquals(1L, lr.getVersionVector().getCurrentVersion());
mgr.commit();
@@ -1701,7 +1715,8 @@ public Object call() throws Exception {
assertEquals(2L, lr.getVersionVector().getCurrentVersion());
re = lr.getRegionEntry(custIdOne);
- getGemfireCache().getLoggerI18n().fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("TEST:VERSION-STAMP:" + re.getVersionStamp());
// Verify region version on the region entry
assertEquals(2L, re.getVersionStamp().getRegionVersion());
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
index 70da102271..add94d9563 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -423,7 +423,7 @@ public boolean done() {
assertNull(r.putIfAbsent("clientNullKey", null));
assertNull(pr.putIfAbsent("clientNullKey", null));
} catch (AssertionError ex) {
- r.getCache().getLoggerI18n().fine("SWAP:caught ", ex);
+ r.getCache().getLogger().convertToLogWriterI18n().fine("SWAP:caught ", ex);
e = ex;
return false;
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
index c83b3c5306..82d4ccd79b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -428,7 +428,8 @@ public static void putErrorDeltaForSender(Integer keys, Long updates, Long error
} catch (InvalidDeltaException ide) {
assertTrue("InvalidDeltaException not expected.",
delta.getIntVar() == DeltaTestImpl.ERRONEOUS_INT_FOR_TO_DELTA);
- cache.getLoggerI18n().fine("Recieved InvalidDeltaException as expected.");
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("Recieved InvalidDeltaException as expected.");
}
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
index 65833c402d..88a998a4b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
@@ -103,7 +103,7 @@ public void testRecoverRVV() throws UnknownHostException {
context.checking(new Expectations() {
{
ignoring(logger);
- allowing(cache).getLoggerI18n();
+ allowing(cache).getLogger().convertToLogWriterI18n();
will(returnValue(logger));
allowing(cache).cacheTimeMillis();
will(returnValue(System.currentTimeMillis()));
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
index ad9a18e832..c7550002fe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -437,20 +437,23 @@ public static void createServerCache(Boolean flag, DataPolicy policy, Scope scop
@SuppressWarnings("synthetic-access")
public void afterUpdate(EntryEvent event) {
numOfUpdates++;
- cache.getLoggerI18n().fine("afterUpdate(): numOfUpdates = " + numOfUpdates);
- cache.getLoggerI18n().fine("(key, val): " + event.getKey() + ", " + event.getNewValue());
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("afterUpdate(): numOfUpdates = " + numOfUpdates);
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("(key, val): " + event.getKey() + ", " + event.getNewValue());
if (event.getOldValue() != null) {
if (event.getOldValue() == event.getNewValue()) {
check = Boolean.TRUE;
}
}
if (((EntryEventImpl) event).getDeltaBytes() != null) {
- cache.getLoggerI18n().fine("delta bytes received. " + hasDeltaBytes);
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("delta bytes received. " + hasDeltaBytes);
assertTrue("No full value received for event " + event,
((EntryEventImpl) event).getNewValue() != null);
hasDeltaBytes++;
} else {
- cache.getLoggerI18n().fine("delta bytes not received.");
+ cache.getLogger().convertToLogWriterI18n().fine("delta bytes not received.");
}
}
});
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
index bc8bfb6ef0..2dc23997f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
@@ -271,7 +271,7 @@ public Object call() throws Exception {
Map orders = new HashMap();
orders.put(orderId2, expectedOrder2);
orders.put(orderId3, expectedOrder3);
- getGemfireCache().getLoggerI18n().fine("SWAP:doingPutAll");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:doingPutAll");
// orderRegion.putAll(orders);
refRegion.put(custId, expectedCust);
Set<OrderId> ordersSet = new HashSet<OrderId>();
@@ -329,7 +329,7 @@ void validateContains(CustId custId, Set<OrderId> ordersSet, boolean containsKey
boolean rContainsKC = custRegion.containsKey(custId);
boolean rContainsKO = containsKey;
for (OrderId o : ordersSet) {
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("SWAP:rContainsKO:" + rContainsKO + " containsKey:" + orderRegion.containsKey(o));
rContainsKO = rContainsKO && orderRegion.containsKey(o);
}
@@ -914,7 +914,7 @@ public Object call() throws Exception {
Region<CustId, Customer> cust = getGemfireCache().getRegion(CUSTOMER);
Region<CustId, Customer> rr = getGemfireCache().getRegion(D_REFERENCE);
Customer expectedCust = new Customer("customer" + 1, "address" + 1);
- getGemfireCache().getLoggerI18n().fine("SWAP:doingPutIfAbsent");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:doingPutIfAbsent");
CustId oldCustId = new CustId(1);
Customer old = cust.putIfAbsent(oldCustId, updateCust);
assertTrue("expected:" + expectedCust + " but was " + old, expectedCust.equals(old));
@@ -1056,7 +1056,7 @@ public Object call() throws Exception {
mgr.begin();
CustId conflictCust = new CustId(2);
Customer customer = new Customer("customer2", "address2");
- getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:removeConflict");
assertTrue(cust.remove(conflictCust, customer));
TXStateProxy tx = mgr.internalSuspend();
cust.put(conflictCust, new Customer("foo", "bar"));
@@ -1134,7 +1134,7 @@ public Object call() throws Exception {
mgr.begin();
CustId custId3 = new CustId(3);
CustId custId4 = new CustId(4);
- getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:removeConflict");
cust.removeAll(Arrays.asList(custId3, custId20, custId4));
TXStateProxy tx = mgr.internalSuspend();
// cust.put(custId3, new Customer("foo", "bar"));
@@ -1154,7 +1154,7 @@ public Object call() throws Exception {
// Test a removeall an already missing key.
// custId2 has already been removed
mgr.begin();
- getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:removeConflict");
cust.removeAll(Arrays.asList(custId2, custId3));
tx = mgr.internalSuspend();
cust.put(custId2, new Customer("foo", "bar"));
@@ -1322,7 +1322,7 @@ public Object call() throws Exception {
mgr.begin();
CustId conflictCust = new CustId(2);
Customer customer = new Customer("customer2", "address2");
- getGemfireCache().getLoggerI18n().fine("SWAP:removeConflict");
+ getGemfireCache().getLogger().convertToLogWriterI18n().fine("SWAP:removeConflict");
assertTrue(cust.replace(conflictCust, customer, new Customer("conflict", "conflict")));
TXStateProxy tx = mgr.internalSuspend();
cust.put(conflictCust, new Customer("foo", "bar"));
@@ -3061,7 +3061,8 @@ public void beforeCreate(EntryEvent event) throws CacheWriterException {
}
public void beforeDestroy(EntryEvent event) throws CacheWriterException {
- getGemfireCache().getLoggerI18n().fine("SWAP:writer:createEvent:" + event);
+ getGemfireCache().getLogger().convertToLogWriterI18n()
+ .fine("SWAP:writer:createEvent:" + event);
if (!event.isOriginRemote()) {
throw new CacheWriterException("SUP?? This DESTROY is supposed to be isOriginRemote");
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
index af8a934fc1..f8d4c59a20 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
@@ -1055,16 +1055,18 @@ public String toString() {
@Override
public void afterCreate(EntryEvent event) {
// Make sure we deserialize the new value
- event.getRegion().getCache().getLoggerI18n().fine("invoked afterCreate with " + event);
- event.getRegion().getCache().getLoggerI18n().info(LocalizedStrings.DEBUG,
+ event.getRegion().getCache().getLogger().convertToLogWriterI18n()
+ .fine("invoked afterCreate with " + event);
+ event.getRegion().getCache().getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"value is " + event.getNewValue());
}
@Override
public void afterUpdate(EntryEvent event) {
// Make sure we deserialize the new value
- event.getRegion().getCache().getLoggerI18n().fine("invoked afterUpdate with ");
- event.getRegion().getCache().getLoggerI18n().info(LocalizedStrings.DEBUG,
+ event.getRegion().getCache().getLogger().convertToLogWriterI18n()
+ .fine("invoked afterUpdate with ");
+ event.getRegion().getCache().getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"value is " + event.getNewValue());
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
index c7769844cc..0c572f0a22 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
@@ -204,7 +204,7 @@ public static void createClientCache(Host host, Integer port) throws Exception {
crf.addCacheListener(new CacheListenerAdapter<String, String>() {
public void afterInvalidate(EntryEvent<String, String> event) {
- cache.getLoggerI18n()
+ cache.getLogger().convertToLogWriterI18n()
.fine("Invalidate Event: " + event.getKey() + ", " + event.getNewValue());
numOfInvalidates++;
}
@@ -213,12 +213,14 @@ public void afterCreate(EntryEvent<String, String> event) {
if (((String) event.getKey()).equals("last_key")) {
lastKeyReceived = true;
}
- cache.getLoggerI18n().fine("Create Event: " + event.getKey() + ", " + event.getNewValue());
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("Create Event: " + event.getKey() + ", " + event.getNewValue());
numOfCreates++;
}
public void afterUpdate(EntryEvent<String, String> event) {
- cache.getLoggerI18n().fine("Update Event: " + event.getKey() + ", " + event.getNewValue());
+ cache.getLogger().convertToLogWriterI18n()
+ .fine("Update Event: " + event.getKey() + ", " + event.getNewValue());
numOfUpdates++;
}
});
@@ -287,16 +289,17 @@ public String description() {
public static void verifyStats() throws Exception {
CacheClientNotifier ccn = CacheClientNotifier.getInstance();
CacheClientProxy ccp = ccn.getClientProxies().iterator().next();
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG, "getQueueSize() " + ccp.getQueueSize());
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG,
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
+ "getQueueSize() " + ccp.getQueueSize());
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"getQueueSizeStat() " + ccp.getQueueSizeStat());
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG,
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"getEventsEnqued() " + ccp.getHARegionQueue().getStatistics().getEventsEnqued());
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG,
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"getEventsDispatched() " + ccp.getHARegionQueue().getStatistics().getEventsDispatched());
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG,
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"getEventsRemoved() " + ccp.getHARegionQueue().getStatistics().getEventsRemoved());
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG,
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG,
"getNumVoidRemovals() " + ccp.getHARegionQueue().getStatistics().getNumVoidRemovals());
assertEquals(ccp.getQueueSize(), ccp.getQueueSizeStat());
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug43684DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug43684DUnitTest.java
index 38250c52a1..42e31d1768 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -353,7 +353,7 @@ public static void getLocally() throws Exception {
LocalRegion r = (LocalRegion) cache.getRegion(REGION_NAME);
for (int i = 0; i < numBuckets; i++) {
RegionEntry e = r.getRegionEntry("KEY_" + i);
- cache.getLoggerI18n().info(LocalizedStrings.DEBUG, e._getValue());
+ cache.getLogger().convertToLogWriterI18n().info(LocalizedStrings.DEBUG, e._getValue());
}
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index 5e8f777ee9..acb5fc8c2e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
@@ -131,7 +131,7 @@ public CountingResolver(String resolverID) {
@Override
public Serializable getRoutingObject(EntryOperation opDetails) {
count.incrementAndGet();
- opDetails.getRegion().getCache().getLoggerI18n().fine(
+ opDetails.getRegion().getCache().getLogger().convertToLogWriterI18n().fine(
"Resolver called key:" + opDetails.getKey() + " Region " + opDetails.getRegion().getName()
+ " id:" + ((GemFireCacheImpl) opDetails.getRegion().getCache()).getMyId(),
new Throwable());
@@ -166,7 +166,7 @@ public Object call() throws Exception {
verifyResolverCountInVM(accessor, 0);
verifyResolverCountInVM(datastore1, getNumberOfKeysOwnedByVM(datastore1));
verifyResolverCountInVM(datastore2, 10);
- getCache().getLoggerI18n().fine("Reset resolver count");
+ getCache().getLogger().convertToLogWriterI18n().fine("Reset resolver count");
}
private int getNumberOfKeysOwnedByVM(VM datastore12) {
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
index 22b4137c0d..13a22c9b49 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqQueryImpl.java
@@ -92,7 +92,8 @@ public CqQueryImpl(CqServiceImpl cqService, String cqName, String queryString,
boolean isDurable) {
this.cqName = cqName;
this.queryString = queryString;
- this.securityLogWriter = (InternalLogWriter) cqService.getCache().getSecurityLoggerI18n();
+ this.securityLogWriter =
+ (InternalLogWriter) cqService.getCache().getSecurityLogger().convertToLogWriterI18n();
this.cqService = cqService;
this.isDurable = isDurable;
}
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
index 30c23ed761..1aca4955a3 100755
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
@@ -185,7 +185,7 @@ public void run2() throws CacheException {
public void printResults(SelectResults results, String message) {
Object r;
Struct s;
- LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+ LogWriterI18n logger = GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n();
logger.fine(message);
int row = 0;
for (Iterator iter = results.iterator(); iter.hasNext();) {
@@ -337,7 +337,7 @@ public void fromData(PdxReader in) {
public boolean equals(Object o) {
org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
.info("In TestObject2.equals() this: " + this + " other :" + o);
- GemFireCacheImpl.getInstance().getLoggerI18n()
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
.fine("In TestObject2.equals() this: " + this + " other :" + o);
TestObject2 other = (TestObject2) o;
if (_id == other._id) {
@@ -350,7 +350,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
- GemFireCacheImpl.getInstance().getLoggerI18n()
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
.fine("In TestObject2.hashCode() : " + this._id);
return this._id;
}
@@ -463,7 +463,8 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
- GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
+ .fine("In TestObject.hashCode() : " + this.id);
return this.id;
}
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
index 38fd2459f8..c12ef68a0c 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -225,7 +225,7 @@ void validateContains(CustId custId, Set<OrderId> ordersSet, boolean containsKey
boolean rContainsKC = custRegion.containsKey(custId);
boolean rContainsKO = containsKey;
for (OrderId o : ordersSet) {
- getGemfireCache().getLoggerI18n()
+ getGemfireCache().getLogger().convertToLogWriterI18n()
.fine("SWAP:rContainsKO:" + rContainsKO + " containsKey:" + orderRegion.containsKey(o));
rContainsKO = rContainsKO && orderRegion.containsKey(o);
}
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 20d057a169..356a1038f5 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -659,7 +659,7 @@ private void createCache(Properties props) throws Exception {
DistributedSystem ds = getSystem(props);
cache = CacheFactory.create(ds);
assertNotNull(cache);
- logger = cache.getLoggerI18n();
+ logger = cache.getLogger().convertToLogWriterI18n();
}
// to validate updates in listener
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
index 55333767ad..f6997c49a3 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -1680,7 +1680,7 @@ protected static String getHARegionQueueName() {
public static void verifyReceivedMarkerAck(final CacheClientProxy proxy) {
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
- GemFireCacheImpl.getInstance().getLoggerI18n()
+ GemFireCacheImpl.getInstance().getLogger().convertToLogWriterI18n()
.fine("DurableClientDUnitTest->WaitCriterion :: done called");
return checkForAck(proxy);
}
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index eba9addba9..9bea479ccb 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -342,11 +342,11 @@ public Properties getCredentials(Properties props, DistributedMember server, boo
Properties p = super.getCredentials(props, server, isPeer);
if (val) {
isDifferentServerInGetCredentialCall = true;
- CacheFactory.getAnyInstance().getLoggerI18n().convertToLogWriter()
+ CacheFactory.getAnyInstance().getLogger().convertToLogWriterI18n().convertToLogWriter()
.config("setting isDifferentServerInGetCredentialCall "
+ isDifferentServerInGetCredentialCall);
} else {
- CacheFactory.getAnyInstance().getLoggerI18n().convertToLogWriter()
+ CacheFactory.getAnyInstance().getLogger().convertToLogWriterI18n().convertToLogWriter()
.config("setting22 isDifferentServerInGetCredentialCall "
+ isDifferentServerInGetCredentialCall);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
> Remove deprecated Cache.getLoggerI18n and getSecurityLoggerI18n methods
> -----------------------------------------------------------------------
>
> Key: GEODE-258
> URL: https://issues.apache.org/jira/browse/GEODE-258
> Project: Geode
> Issue Type: Sub-task
> Reporter: Darrel Schneider
> Assignee: Avinash Dongre
> Original Estimate: 2h
> Remaining Estimate: 2h
>
> Remove the deprecated Cache.getLoggerI18n and getSecurityLoggerI18n methods. All calls can be replaced with getLogger().convertToLogWriterI18n() so this should be a quick task.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)