This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 24e3fae GEODE-5686: Remove LocalizedStrings
24e3fae is described below
commit 24e3fae126dcee25731d4d559fbe4392c281aca6
Author: Bruce Schuchardt <bschucha...@pivotal.io>
AuthorDate: Thu Nov 1 15:09:54 2018 -0700
GEODE-5686: Remove LocalizedStrings
Fixing mixed parameter markers (\{.*%s and %s.*\{)
---
.../java/org/apache/geode/cache/query/internal/CompiledOperation.java | 3 +--
.../apache/geode/internal/cache/PartitionRegionConfigValidator.java | 2 +-
.../main/java/org/apache/geode/internal/cache/PartitionedRegion.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/CacheClientProxy.java | 4 ++--
.../apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java | 2 +-
.../src/main/java/org/apache/geode/internal/tcp/Connection.java | 2 +-
.../apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
index 3d826dd..728b043 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
@@ -112,8 +112,7 @@ public class CompiledOperation extends
AbstractCompiledValue {
* eval0(rcvrItr.evaluate(context),
rcvrItr.getElementType().resolveClass(), context); }
*
* // function call: no functions implemented except keywords in the
grammar throw new
- * TypeMismatchException(String.format("Could not resolve method named '
%s '",.
- * toLocalizedString(this.methodName));
+ * TypeMismatchException("Could not resolve method named 'xyz'")
*/
} else {
// if not null, then explicit receiver
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
index 4cb3906..686a0c1 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
@@ -256,7 +256,7 @@ public class PartitionRegionConfigValidator {
// LRUHeap doesn't support maximum, but other eviction algos do
if (!ea.getAlgorithm().isLRUHeap() && ea.getMaximum() !=
prconfEa.getMaximum()) {
logger.warn(
- "For Partitioned Region %s the locally configured
EvictionAttributes {} do not match with other EvictionAttributes {} and may
cause misses during reads from VMs with smaller maximums.",
+ "For Partitioned Region {} the locally configured
EvictionAttributes {} do not match with other EvictionAttributes {} and may
cause misses during reads from VMs with smaller maximums.",
new Object[] {pr.getFullPath(), ea, prconfEa});
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 1911049..11e1bdb 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -8686,7 +8686,7 @@ public class PartitionedRegion extends LocalRegion
// Check if the returned value is instance of Index (this means the index
is
// not in create phase, its created successfully).
if (prIndex == null || !(prIndex instanceof Index)) {
- logger.info("This index %s is not on this partitoned region : {}",
+ logger.info("This index {} is not on this partitoned region : {}",
ind, this);
return numBuckets;
}
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 362d4f1..df6c660 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
@@ -1481,7 +1481,7 @@ public class CacheClientProxy implements ClientSession {
}
if (!isAuthorized) {
- logger.warn("{}: Not Adding CQ message to queue %s because
authorization failed.",
+ logger.warn("{}: Not Adding CQ message to queue {} because
authorization failed.",
new Object[] {this, clientMessage});
clientCq.delete(cqNames[i]);
}
@@ -1509,7 +1509,7 @@ public class CacheClientProxy implements ClientSession {
OperationContext opctxt = getOperationContext(clientMessage,
regionNameHolder);
if (opctxt == null) {
logger.warn(
- "{}: Not Adding message to queue: %s because the operation context
object could not be obtained for this client message.",
+ "{}: Not Adding message to queue: {} because the operation context
object could not be obtained for this client message.",
new Object[] {this, clientMessage});
return false;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index 4d04017..dd73c1b 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -227,7 +227,7 @@ public class CacheClientUpdater extends LoggingThread
implements ClientUpdater,
return false;
}
if (System.currentTimeMillis() > tilt) {
- logger.warn("{}: wait timed out (more than %s seconds)",
+ logger.warn("{}: wait timed out (more than {} seconds)",
new Object[] {this, MAX_CACHE_WAIT});
return false;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 8f2e7b1..e8541c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -3177,7 +3177,7 @@ public class Connection implements Runnable {
long blockedMs = now - queueTimeoutTarget;
blockedMs += this.asyncQueueTimeout;
logger.warn(
- "Blocked for %sms which is longer than the max of %sms,
asking slow receiver {} to disconnect.",
+ "Blocked for {}ms which is longer than the max of {}ms,
asking slow receiver {} to disconnect.",
Long.valueOf(blockedMs),
Integer.valueOf(this.asyncQueueTimeout),
this.remoteAddr);
stats.incAsyncQueueTimeouts(1);
diff --git
a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
index e322950..d90ea17 100644
---
a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
+++
b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
@@ -146,7 +146,7 @@ public abstract class AbstractRemoteGatewaySender extends
AbstractGatewaySender
this.proxy = ((PoolImpl) pf.create(this.getId()));
if (this.proxyFailureTries > 0) {
logger.info(
- "GatewaySender %s got remote locator information for remote site {}
after {} failures in connecting to remote site.",
+ "GatewaySender {} got remote locator information for remote site {}
after {} failures in connecting to remote site.",
new Object[] {this.id, this.remoteDSId, this.proxyFailureTries});
this.proxyFailureTries = 0;
}
