[geode] branch develop updated: GEODE-5686 Remove LocalizedStrings

2018-11-02 Thread bschuchardt 
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 ce32de9  GEODE-5686 Remove LocalizedStrings
ce32de9 is described below

commit ce32de93964649dc590735d93f7005f1c103050e
Author: Bruce Schuchardt 
AuthorDate: Fri Nov 2 12:36:59 2018 -0700

GEODE-5686 Remove LocalizedStrings

Fixing two tests to expect exception text that has been slightly
changed.
---
 .../execute/PRClientServerRegionFunctionExecutionDUnitTest.java   | 4 ++--
 .../cli/commands/CreateAsyncEventQueueCommandDUnitTest.java   | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 60b0910..4eeaea6 100755
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -1483,7 +1483,7 @@ public class 
PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
 try {
   cache.getLogger()
   .info(""
-  + "Could not create an instance of  
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
+  + "Could not create an instance of 
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"
   + "");
   dataSet.withFilter(testKeysSet).setArguments(new UnDeserializable())
   .execute(new FunctionAdapter() {
@@ -1507,7 +1507,7 @@ public class 
PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
   });
 } catch (Exception expected) {
   if (!expected.getCause().getMessage().contains(
-  "Could not create an instance of  
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"))
 {
+  "Could not create an instance of 
org.apache.geode.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable"))
 {
 throw expected;
   } ;
 } finally {
diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
index 28a491b..13b2523 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
@@ -82,15 +82,15 @@ public class CreateAsyncEventQueueCommandDUnitTest {
 .tableHasRowWithValues("Member", "Status", "Message", "server-2", 
"OK", "Success");
 
 IgnoredException
-.addIgnoredException("java.lang.IllegalStateException: A GatewaySender 
with id  "
-+ "AsyncEventQueue_queue  is already defined in this cache.");
+.addIgnoredException("java.lang.IllegalStateException: A GatewaySender 
with id "
++ "AsyncEventQueue_queue is already defined in this cache.");
 // create a queue with the same id would result in failure
 gfsh.executeAndAssertThat(VALID_COMMAND + " --id=queue").statusIsError()
 .tableHasRowCount("Member", 2)
 .tableHasColumnWithExactValuesInAnyOrder("Status", "ERROR", "ERROR")
 .tableHasColumnWithExactValuesInAnyOrder("Message",
-" java.lang.IllegalStateException: A GatewaySender with id  
AsyncEventQueue_queue  is already defined in this cache.",
-" java.lang.IllegalStateException: A GatewaySender with id  
AsyncEventQueue_queue  is already defined in this cache.");
+" java.lang.IllegalStateException: A GatewaySender with id 
AsyncEventQueue_queue is already defined in this cache.",
+" java.lang.IllegalStateException: A GatewaySender with id 
AsyncEventQueue_queue is already defined in this cache.");
 
 gfsh.executeAndAssertThat("create disk-store --name=diskStore2 
--dir=diskstore");
 locator.waitUntilDiskStoreIsReadyOnExactlyThisManyServers("diskStore2", 2);

[geode] branch develop updated: GEODE-5686: Remove LocalizedStrings

2018-11-01 Thread bschuchardt 
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 
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.de

[geode] branch develop updated: GEODE-5686: Remove LocalizedStrings

2018-10-11 Thread bschuchardt 
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 64ced9f  GEODE-5686: Remove LocalizedStrings
64ced9f is described below

commit 64ced9f4cef047189a1d9825f74af19e57b43387
Author: Bruce Schuchardt 
AuthorDate: Thu Oct 11 16:42:05 2018 -0700

GEODE-5686: Remove LocalizedStrings

Fixing a few places that had %s format specifiers but needed to use the
log4j curly braces.
---
 .../apache/geode/cache/client/internal/ConnectionConnector.java   | 2 +-
 .../apache/geode/cache/client/internal/ConnectionFactoryImpl.java | 2 +-
 .../org/apache/geode/cache/client/internal/QueueManagerImpl.java  | 8 
 .../apache/geode/distributed/internal/ClusterElderManager.java| 2 +-
 .../org/apache/geode/distributed/internal/StartupOperation.java   | 2 +-
 .../org/apache/geode/distributed/internal/locks/DLockGrantor.java | 2 +-
 .../internal/membership/gms/mgr/GMSMembershipManager.java | 2 +-
 .../org/apache/geode/internal/cache/BucketPersistenceAdvisor.java | 2 +-
 .../java/org/apache/geode/internal/cache/BucketRegionQueue.java   | 2 +-
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java| 4 ++--
 .../geode/internal/cache/tier/sockets/CacheClientNotifier.java| 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionConnector.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionConnector.java
index dda185d..4a907b9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionConnector.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionConnector.java
@@ -81,7 +81,7 @@ public class ConnectionConnector {
 } finally {
   if (!initialized && connection != null) {
 if (logger.isDebugEnabled()) {
-  logger.debug("Destroy failed connection to {}", location);
+  logger.debug("Destroying failed connection to {}", location);
 }
 destroyConnection(connection);
   }
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
index a9bf616..07f43af 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
@@ -125,7 +125,7 @@ public class ConnectionFactoryImpl implements 
ConnectionFactory {
   logger.debug("Unable to connect to {}: connection refused", 
location);
 }
   } else {// print a warning with the exception stack trace
-logger.warn("Could not connect to: %s", location, e);
+logger.warn("Could not connect to: " + location, e);
   }
   testFailedConnectionToServer = true;
 } finally {
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
index f79e122..19fee55 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
@@ -315,7 +315,7 @@ public class QueueManagerImpl implements QueueManager {
   }
   if (primary.sendClientReady()) {
 try {
-  logger.info("Sending ready for events to primary: %s", primary);
+  logger.info("Sending ready for events to primary: {}", primary);
   ReadyForEventsOp.execute(pool, primary);
 } catch (Exception e) {
   if (logger.isDebugEnabled()) {
@@ -398,7 +398,7 @@ public class QueueManagerImpl implements QueueManager {
 }
 
 logger
-.info("Cache client updater for %s on endpoint %s exiting. Scheduling 
recovery.",
+.info("Cache client updater for {} on endpoint {} exiting. Scheduling 
recovery.",
 (deadConnection != null && deadConnection.getUpdater() != null)
 ? (deadConnection.getUpdater().isPrimary() ? "Primary" : 
"Redundant")
 : "Queue",
@@ -821,9 +821,9 @@ public class QueueManagerImpl implements QueueManager {
 
 if (printErrorMessage) {
   if (servers == null || servers.isEmpty()) {
-logger.error(msg,
+logger.error(String.format(msg,
 new Object[] {(excludedServers != null ? excludedServers.size() : 
0),
-(ex != null ? ex.getMessage() : "no exception")});
+(ex != null ? ex.getMessage() : "no exception")}));
   }
 }
 return servers;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterElderManage