You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2018/10/31 21:15:35 UTC
[geode] branch feature/GEODE-5686c created (now a747862)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch feature/GEODE-5686c
in repository https://gitbox.apache.org/repos/asf/geode.git.
at a747862 GEODE-5686: Remove LocalizedStrings
This branch includes the following new commits:
new a747862 GEODE-5686: Remove LocalizedStrings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 01/01: GEODE-5686: Remove LocalizedStrings
Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5686c
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a7478625e0e942abc80338704ae45c14c2b2e623
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Oct 31 14:08:33 2018 -0700
GEODE-5686: Remove LocalizedStrings
Fixing problems found by lgtm.com
There were a lot of logging calls that were improperly converted from
(MessageFormatString, Argument, Exception) to a form that treated the
Exception as part of the String.format() call.
There were a number of errors in format strings or number of arguments.
MessageFormat was more forgiving about this than String.format().
There were a few dangling MessageFormat specs that needed to be
converted to String.format() specs.
Please enter the commit message for your changes. Lines starting
---
.../partitioned/PRColocatedEquiJoinDUnitTest.java | 2 +-
.../ServerLauncherBuilderIntegrationTest.java | 2 +-
.../apache/geode/cache/DynamicRegionFactory.java | 25 ++++++++++++++--------
.../internal/pooling/ConnectionManagerImpl.java | 4 ++--
.../geode/cache/query/internal/DefaultQuery.java | 4 ++--
.../membership/gms/auth/GMSAuthenticator.java | 2 +-
.../geode/internal/InternalDataSerializer.java | 4 ++--
.../admin/remote/FetchHealthDiagnosisRequest.java | 5 ++---
.../geode/internal/cache/CacheServerLauncher.java | 2 +-
.../apache/geode/internal/cache/DiskStoreImpl.java | 9 ++++----
.../org/apache/geode/internal/cache/Oplog.java | 6 +++---
.../cache/PartitionRegionConfigValidator.java | 10 ++++-----
.../geode/internal/cache/PartitionedRegion.java | 4 ++--
.../internal/cache/PlaceHolderDiskRegion.java | 3 ++-
.../geode/internal/cache/ServerPingMessage.java | 2 +-
.../internal/cache/eviction/HeapLRUController.java | 4 ++--
.../tier/sockets/command/PutUserCredentials.java | 3 ++-
.../cache/tier/sockets/command/RemoveUserAuth.java | 3 ++-
...currentParallelGatewaySenderEventProcessor.java | 4 ++--
.../apache/geode/internal/jndi/ContextImpl.java | 4 ++--
.../apache/geode/internal/jndi/JNDIInvoker.java | 3 ++-
.../geode/internal/jta/GlobalTransaction.java | 20 ++++++++---------
.../geode/internal/jta/TransactionManagerImpl.java | 6 ++++--
.../geode/internal/logging/LoggingThreadGroup.java | 4 ++--
.../org/apache/geode/internal/tcp/Connection.java | 2 +-
.../management/internal/JmxManagerAdvisor.java | 2 +-
.../internal/beans/DistributedSystemBridge.java | 2 +-
.../internal/cli/result/model/FileResultModel.java | 2 +-
.../cache/query/internal/cq/ClientCQImpl.java | 2 +-
29 files changed, 78 insertions(+), 67 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 7a71968..b79bb22 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -773,7 +773,7 @@ public class PRColocatedEquiJoinDUnitTest extends CacheTestCase {
if (!e.getMessage().equalsIgnoreCase(
String.format(
"A query on a Partitioned Region ( %s ) may not reference any other region if query is NOT executed within a Function",
- name, "/" + coloName))) {
+ name))) {
throw e;
}
}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
index c4db526..3b6f53f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherBuilderIntegrationTest.java
@@ -269,7 +269,7 @@ public class ServerLauncherBuilderIntegrationTest {
private String workingDirectoryNotFoundErrorMessage() {
return String.format(AbstractLauncher.WORKING_DIRECTORY_NOT_FOUND_ERROR_MESSAGE,
- "Server", "Server");
+ "Server");
}
private File getWorkingDirectory() {
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 9e57819..cd0750e 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
@@ -408,7 +408,8 @@ public abstract class DynamicRegionFactory {
SystemFailure.checkFailure();
this.cache.getLogger().warning(
String.format("DynamicRegionListener %s threw exception on beforeRegionCreated",
- listener, t));
+ listener),
+ t);
}
}
}
@@ -435,7 +436,8 @@ public abstract class DynamicRegionFactory {
SystemFailure.checkFailure();
this.cache.getLogger().warning(
String.format("DynamicRegionListener %s threw exception on afterRegionCreated",
- listener, t));
+ listener),
+ t);
}
}
}
@@ -467,7 +469,8 @@ public abstract class DynamicRegionFactory {
SystemFailure.checkFailure();
this.cache.getLogger().warning(
String.format("DynamicRegionListener %s threw exception on beforeRegionDestroyed",
- listener, t));
+ listener),
+ t);
}
}
}
@@ -499,7 +502,8 @@ public abstract class DynamicRegionFactory {
SystemFailure.checkFailure();
this.cache.getLogger().warning(
String.format("DynamicRegionListener %s threw exception on afterRegionDestroyed",
- listener, t));
+ listener),
+ t);
}
}
}
@@ -577,7 +581,8 @@ public abstract class DynamicRegionFactory {
RegionDestroyedException e = new RegionDestroyedException(errMsg, parentRegionName);
this.cache.getLogger().warning(
String.format("Error -- Could not find a region named: '%s'",
- parentRegionName, e));
+ parentRegionName),
+ e);
throw e;
}
@@ -663,8 +668,8 @@ public abstract class DynamicRegionFactory {
this.dynamicRegionList.destroy(fullRegionName);
} catch (CacheException e) {
this.cache.getLogger().warning(
- String.format("Error destroying Dynamic Region '%s'", fullRegionName,
- e));
+ String.format("Error destroying Dynamic Region '%s'", fullRegionName),
+ e);
throw e;
}
@@ -828,7 +833,8 @@ public abstract class DynamicRegionFactory {
} catch (Exception e) {
cache.getLogger().warning(
String.format("Error attempting to locally create Dynamic Region: %s",
- newRegionName, e));
+ newRegionName),
+ e);
}
}
@@ -856,7 +862,8 @@ public abstract class DynamicRegionFactory {
} catch (Exception e) {
cache.getLogger().warning(
String.format("Error attempting to locally destroy Dynamic Region: %s",
- fullRegionName, e));
+ fullRegionName),
+ e);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
index c799192..99583d7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -1393,10 +1393,10 @@ public class ConnectionManagerImpl implements ConnectionManager {
private void logInfo(String message, Throwable t) {
if (t instanceof GemFireSecurityException) {
securityLogWriter.info(String.format("%s : %s",
- new Object[] {message, t}, t));
+ message, t), t);
} else {
logger.info(String.format("%s : %s",
- new Object[] {message, t}), t);
+ message, t), t);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
index f4d8669..1cb4fb0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
@@ -497,7 +497,7 @@ public class DefaultQuery implements Query {
throw new UnsupportedOperationException(
String.format(
"A query on a Partitioned Region ( %s ) may not reference any other region if query is NOT executed within a Function",
- prs.get(0).getName(), prs.get(1).getName()));
+ prs.get(0).getName()));
}
// If there are more than one PRs they have to be co-located.
@@ -520,7 +520,7 @@ public class DefaultQuery implements Query {
if (!colocated) {
throw new UnsupportedOperationException(
String.format(
- "A query on a Partitioned Region ( %s ) may not reference any other region except Co-located Partitioned Region. PR region (1) is not collocated with other PR region in the query.",
+ "A query on a Partitioned Region ( %s ) may not reference any other region except Co-located Partitioned Region. PR region %s is not collocated with other PR region in the query.",
eachPR.getName(), other.getName()));
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index c8e8c1e..dd52fdb 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -125,7 +125,7 @@ public class GMSAuthenticator implements Authenticator {
}
} catch (Exception ex) {
securityLogWriter.warning(String.format("Security check failed for [%s]. %s",
- new Object[] {member, ex.getLocalizedMessage()}, ex));
+ member, ex.getLocalizedMessage()), ex);
failMsg = String.format("Security check failed. %s", ex.getLocalizedMessage());
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 3f3046f..2d66f11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -961,7 +961,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
DataSerializer other = (DataSerializer) oldSerializer;
throw new IllegalStateException(
String.format(
- "A DataSerializer of class %s is already registered with id %s so the DataSerializer of class %s could not be registered.",
+ "A DataSerializer of class %s is already registered with id %s.",
new Object[] {other.getClass().getName(), other.getId()}));
}
}
@@ -1070,7 +1070,7 @@ public abstract class InternalDataSerializer extends DataSerializer {
if (oldValue.getId() != 0 && holder.getId() != 0 && oldValue.getId() != holder.getId()) {
throw new IllegalStateException(
String.format(
- "A DataSerializer of class %s is already registered with id %s so the DataSerializer of class %s could not be registered.",
+ "A DataSerializer of class %s is already registered with id %s.",
new Object[] {oldValue.getClass().getName(), oldValue.getId()}));
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
index 5bad4e6..3b116bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
@@ -77,9 +77,8 @@ public class FetchHealthDiagnosisRequest extends AdminRequest {
@Override
public String toString() {
- return String.format("FetchHealthDiagnosisRequest from id=%s healthCode=%s",
-
- new Object[] {this.getRecipient(), Integer.valueOf(this.id), this.healthCode});
+ return String.format("FetchHealthDiagnosisRequest from %s id=%s healthCode=%s",
+ this.getRecipient(), Integer.valueOf(this.id), this.healthCode);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 1c67ac2..407f17e2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -573,7 +573,7 @@ public class CacheServerLauncher {
protected void printStartMessage(final Map<String, Object> options, final int pid)
throws Exception {
- System.out.println(String.format("Starting %s with pid: {1,number,#}",
+ System.out.println(String.format("Starting %s with pid: %s",
this.baseName, pid));
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index e33b073..a1a15f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -3307,14 +3307,15 @@ public class DiskStoreImpl implements DiskStore {
}
// log the error
- final String message =
- "A DiskAccessException has occurred while writing to the disk for disk store {}. The cache will be closed.";
- logger.error(message, DiskStoreImpl.this.getName(), dae);
+ final String message = String.format(
+ "A DiskAccessException has occurred while writing to the disk for disk store %s. The cache will be closed.",
+ getName());
+ logger.error(message, dae);
Thread thread = new LoggingThread("Disk store exception handler", false, () -> {
try {
// now close the cache
- getCache().close(String.format(message, DiskStoreImpl.this.getName(), dae), dae);
+ getCache().close(message, dae);
_testHandleDiskAccessException.countDown();
} catch (Exception e) {
logger.error("An Exception occurred while closing the cache.", e);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index 91618d4..60371e4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -1742,7 +1742,7 @@ public class Oplog implements CompactableOplog, Flushable {
if (oldValue != null) {
throw new AssertionError(
String.format(
- "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is {0,number,#}.",
+ "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is %s.",
oplogKeyId));
}
}
@@ -2559,7 +2559,7 @@ public class Oplog implements CompactableOplog, Flushable {
if (oldValue != null) {
throw new AssertionError(
String.format(
- "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is {0,number,#}.",
+ "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is %s.",
oplogKeyId));
}
}
@@ -2952,7 +2952,7 @@ public class Oplog implements CompactableOplog, Flushable {
if (oldValue != null) {
throw new AssertionError(
String.format(
- "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is {0,number,#}.",
+ "Oplog::readNewEntry: Create is present in more than one Oplog. This should not be possible. The Oplog Key ID for this entry is %s.",
oplogKeyId));
}
// Check the actual region to see if it has this key from
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 9c5bb1e..0a8499f 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
@@ -188,25 +188,25 @@ public class PartitionRegionConfigValidator {
if (!userRA.getRegionIdleTimeout().equals(prconf.getRegionIdleTimeout())) {
throw new IllegalStateException(
String.format(
- "The %s set in RegionAttributes is incompatible with %s used by other distributed members.",
+ "The %1$s set in RegionAttributes is incompatible with %1$s used by other distributed members.",
new Object[] {" region idle timout "}));
}
if (!userRA.getRegionTimeToLive().equals(prconf.getRegionTimeToLive())) {
throw new IllegalStateException(
String.format(
- "The %s set in RegionAttributes is incompatible with %s used by other distributed members.",
+ "The %1$s set in RegionAttributes is incompatible with %1$s used by other distributed members.",
new Object[] {" region time to live "}));
}
if (!userRA.getEntryIdleTimeout().equals(prconf.getEntryIdleTimeout())) {
throw new IllegalStateException(
String.format(
- "The %s set in RegionAttributes is incompatible with %s used by other distributed members.",
+ "The %1$s set in RegionAttributes is incompatible with %1$s used by other distributed members.",
new Object[] {" entry idle timout "}));
}
if (!userRA.getEntryTimeToLive().equals(prconf.getEntryTimeToLive())) {
throw new IllegalStateException(
String.format(
- "The %s set in RegionAttributes is incompatible with %s used by other distributed members.",
+ "The %1$s set in RegionAttributes is incompatible with %1$s used by other distributed members.",
new Object[] {" entry time to live "}));
}
}
@@ -427,8 +427,6 @@ public class PartitionRegionConfigValidator {
int numSecondaries = 0;
for (FixedPartitionAttributes otherfpa : allSameFPAs) {
if (fpa.getNumBuckets() != otherfpa.getNumBuckets()) {
- Object[] prms = new Object[] {this.pr.getName(), fpa.getPartitionName(),
- fpa.getNumBuckets(), otherfpa.getNumBuckets()};
throw new IllegalStateException(
String.format(
"For region %s,for partition %s, num-buckets are not same (%s, %s)across nodes.",
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 fe01b1c..da7f58f 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
@@ -4837,8 +4837,8 @@ public class PartitionedRegion extends LocalRegion
}
} catch (Exception es) {
logger.warn(String.format("releasePRIDLock: unlocking %s caught an exception",
- Integer.valueOf(PartitionedRegionHelper.MAX_PARTITIONED_REGION_ID),
- es));
+ Integer.valueOf(PartitionedRegionHelper.MAX_PARTITIONED_REGION_ID)),
+ es);
}
}
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 75420a0..06588f8 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
@@ -181,7 +181,8 @@ public class PlaceHolderDiskRegion extends AbstractDiskRegion
getDiskStore().getCache().getLogger().error(
String.format(
"A DiskAccessException has occurred while recovering values asynchronously from disk for region %s.",
- getName(), dae));
+ 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 7526637..36fb57f 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
@@ -93,7 +93,7 @@ public class ServerPingMessage extends PooledDistributionMessage {
}
} catch (Throwable e) {
cache.getLogger().error(
- String.format("Could not ping one of the following servers: %s", filteredRecipients, e));
+ String.format("Could not ping one of the following servers: %s", filteredRecipients), e);
return false;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUController.java
index 3934a16..4a176cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUController.java
@@ -74,8 +74,8 @@ public class HeapLRUController extends SizeLRUController {
@Override
public String toString() {
return String.format(
- "HeapLRUCapacityController with a capacity of %s% of memory and eviction action %s.",
- getLimit(), getEvictionAction());
+ "HeapLRUCapacityController with a capacity of %s%s of memory and eviction action %s.",
+ getLimit(), "%", getEvictionAction());
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
index ddcc37b..8c063d6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PutUserCredentials.java
@@ -62,7 +62,8 @@ public class PutUserCredentials extends BaseCommand {
if (serverConnection.getLogWriter().warningEnabled()) {
serverConnection.getLogWriter().warning(
String.format("An exception was thrown for client [%s]. %s",
- new Object[] {serverConnection.getProxyID(), ""}, ex));
+ serverConnection.getProxyID(), ""),
+ ex);
}
writeException(clientMessage, ex, false, serverConnection);
} finally {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
index c4cff4a..2027856 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java
@@ -62,7 +62,8 @@ public class RemoveUserAuth extends BaseCommand {
if (serverConnection.getLogWriter().warningEnabled()) {
serverConnection.getLogWriter().warning(
String.format("An exception was thrown for client [%s]. %s",
- new Object[] {serverConnection.getProxyID(), ""}, ex));
+ serverConnection.getProxyID(), ""),
+ ex);
}
writeException(clientMessage, ex, false, serverConnection);
} finally {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
index 2b204897..1110b1c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
@@ -252,8 +252,8 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
} catch (ExecutionException e) {
// we don't expect any exception but if caught then eat it and log warning
- logger.warn(String.format("GatewaySender %s caught exception while stopping: %s", sender),
- e.getCause());
+ logger.warn(String.format("GatewaySender %s caught exception while stopping: %s", sender,
+ e.getCause()));
}
}
} catch (InterruptedException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
index 7e42fa8..e24009d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/ContextImpl.java
@@ -479,8 +479,8 @@ public class ContextImpl implements Context {
} catch (NameNotFoundException e) {
LogWriter writer = TransactionUtils.getLogWriter();
if (writer.infoEnabled())
- writer.info(String.format("ContextImpl::lookup::Error while looking up %s", name,
- e));
+ writer.info(String.format("ContextImpl::lookup::Error while looking up %s", name),
+ e);
throw new NameNotFoundException(
String.format("Name %s not found", new Object[] {name}));
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
index 0627a6d..1fcd032 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
@@ -304,7 +304,8 @@ public class JNDIInvoker {
writer.warning(
String.format(
"JNDIInvoker::doTransactionLookup::Found WebSphere TransactionManager factory class [%s], but could not invoke its static 'getTransactionManager' method",
- clazz.getName(), ex));
+ clazz.getName()),
+ ex);
throw new NameNotFoundException(
String.format(
"JNDIInvoker::doTransactionLookup::Found WebSphere TransactionManager factory class [%s], but could not invoke its static 'getTransactionManager' method",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
index 00959c5..53a981e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
@@ -104,11 +104,12 @@ public class GlobalTransaction {
writer.severe(
String.format(
"GlobalTransaction::Constructor::Error while trying to create Xid due to %s",
- e, e));
+ e),
+ e);
String exception =
String.format(
"GlobalTransaction::Constructor::Error while trying to create Xid due to %s",
- new Object[] {e});
+ e);
throw new SystemException(exception);
}
}
@@ -184,8 +185,7 @@ public class GlobalTransaction {
}
} catch (Exception e) {
if (VERBOSE)
- writer.info(String.format("%s",
- "GlobalTransaction::commit:Exception in delisting XAResource", e));
+ writer.info("GlobalTransaction::commit:Exception in delisting XAResource", e);
}
}
}
@@ -283,8 +283,7 @@ public class GlobalTransaction {
}
} catch (Exception e) {
if (VERBOSE)
- writer.info(String.format("%s",
- "GlobalTransaction::rollback:Exception in delisting XAResource", e));
+ writer.info("GlobalTransaction::rollback:Exception in delisting XAResource", e);
}
}
}
@@ -299,8 +298,8 @@ public class GlobalTransaction {
String exception =
String.format(
"GlobalTransaction::rollback:Rollback not successful due to exception %s %s",
- new Object[] {e, " " + (e instanceof XAException
- ? ("Error Code =" + ((XAException) e).errorCode) : "")});
+ e, " " + (e instanceof XAException
+ ? ("Error Code =" + ((XAException) e).errorCode) : ""));
if (VERBOSE)
writer.fine(exception);
SystemException sysEx = new SystemException(exception);
@@ -625,7 +624,8 @@ public class GlobalTransaction {
writer.severe(
String.format(
"GlobaTransaction::expireGTX:Error occurred while removing transactional mappings %s",
- e, e));
+ e),
+ e);
}
}
@@ -651,7 +651,7 @@ public class GlobalTransaction {
String exception =
String.format(
"Exception occurred while trying to set the XAResource TimeOut due to %s Error code, %s",
- new Object[] {e, Integer.valueOf(e.errorCode)});
+ e, Integer.valueOf(e.errorCode));
LogWriter writer = TransactionUtils.getLogWriter();
if (VERBOSE)
writer.fine(exception);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
index ee6dad8..3a24323 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
@@ -331,7 +331,8 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
if (writer.infoEnabled())
writer.info(
String.format("Exception in notify after completion due to %s",
- ge.getMessage(), ge));
+ ge.getMessage()),
+ ge);
}
Thread thread = Thread.currentThread();
transactionMap.remove(thread);
@@ -465,7 +466,8 @@ public class TransactionManagerImpl implements TransactionManager, Serializable
if (writer.infoEnabled())
writer.info(
String.format("Exception in notify after completion due to %s",
- e1.getMessage(), e1));
+ e1.getMessage()),
+ e1);
}
Thread thread = Thread.currentThread();
transactionMap.remove(thread);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
index a6a77a3..6b06c71 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LoggingThreadGroup.java
@@ -273,12 +273,12 @@ public class LoggingThreadGroup extends ThreadGroup {
this.logWriter.info(String.format(msg, msgArgs));
}
} else {
- stderr.severe(String.format("Uncaught exception in thread %s", t, ex));
+ stderr.severe(String.format("Uncaught exception in thread %s", t), ex);
if (this.logger != null) {
this.logger.fatal(String.format("Uncaught exception in thread %s", t), ex);
}
if (this.logWriter != null) {
- this.logWriter.severe(String.format("Uncaught exception in thread %s", t, ex));
+ this.logWriter.severe(String.format("Uncaught exception in thread %s", t), ex);
}
}
// if (!(ex instanceof RuntimeException) && (ex instanceof Exception)) {
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 13fba79..a00f51e 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
@@ -3709,7 +3709,7 @@ public class Connection implements Runnable {
if (this.replyCode != REPLY_CODE_OK
&& this.replyCode != REPLY_CODE_OK_WITH_ASYNC_INFO) {
String err =
- "Unknown handshake reply code: {} nioMessageLength=%s processorType={}";
+ "Unknown handshake reply code: %s nioMessageLength: %s";
Object[] errArgs = new Object[] {Integer.valueOf(this.replyCode),
Integer.valueOf(nioMessageLength)};
if (replyCode == 0 && logger.isDebugEnabled()) { // bug 37113
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
index acd4011..11cc069 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
@@ -201,7 +201,7 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
if (thr != null) {
dm.getCancelCriterion().checkCancelInProgress(null);
logger.info(String.format("This member caught exception processing profile %s %s",
- new Object[] {p, toString()}, thr));
+ p, toString()), thr);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index b15f7e8..6c1fd38 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -614,7 +614,7 @@ public class DistributedSystemBridge {
if (bean != null) {
return bean;
} else {
- throw new Exception(String.format("{0} is an invalid member name or Id", member));
+ throw new Exception(String.format("%s is an invalid member name or Id", member));
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/FileResultModel.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/FileResultModel.java
index 6726fcf..22ec9e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/FileResultModel.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/FileResultModel.java
@@ -104,7 +104,7 @@ public class FileResultModel {
Gfsh gfsh = Gfsh.getCurrentInstance();
if (file.exists()) {
- String fileExistsMessage = String.format("File with name \"$s\" already exists in \"$s\".",
+ String fileExistsMessage = String.format("File with name \"%s\" already exists in \"%s\".",
filename, directory.getAbsolutePath());
if (gfsh != null && !gfsh.isQuietMode()) {
fileExistsMessage += " Overwrite? " + options + " : ";
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
index 687a035..f0a4eb3 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ClientCQImpl.java
@@ -418,7 +418,7 @@ public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
if (ex.getCause() instanceof GemFireSecurityException) {
if (securityLogWriter.warningEnabled()) {
securityLogWriter.warning(
- String.format("Exception while executing cq Exception: %s", ex, null));
+ String.format("Exception while executing cq Exception: %s", ex));
}
throw new CqException(ex.getCause().getMessage(), ex.getCause());
} else if (ex instanceof CqException) {