You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/11/06 23:40:44 UTC
[geode] 02/02: fixup
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch feature/GEODE-3940
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 273dbf8113053f186b377ac13840e70df88b10ba
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Nov 6 15:40:18 2017 -0800
fixup
---
.../geode/admin/internal/FinishBackupRequest.java | 15 ++++----
.../geode/admin/internal/FlushToDiskRequest.java | 5 +--
.../geode/admin/internal/PrepareBackupRequest.java | 13 ++++---
.../org/apache/geode/distributed/internal/DM.java | 18 ++++------
.../internal/LonerDistributionManager.java | 9 +++--
.../admin/remote/AddHealthListenerResponse.java | 4 +--
.../admin/remote/AddStatListenerRequest.java | 1 +
.../admin/remote/AddStatListenerResponse.java | 4 +--
.../admin/remote/AdminFailureResponse.java | 4 +--
.../internal/admin/remote/CacheConfigResponse.java | 4 +--
.../internal/admin/remote/CacheInfoRequest.java | 1 +
.../internal/admin/remote/CacheInfoResponse.java | 3 +-
.../admin/remote/CancelStatListenerResponse.java | 4 +--
.../admin/remote/DurableClientInfoRequest.java | 1 +
.../admin/remote/DurableClientInfoResponse.java | 4 +--
.../admin/remote/FetchDistLockInfoRequest.java | 1 +
.../admin/remote/FetchDistLockInfoResponse.java | 3 +-
.../admin/remote/FetchHealthDiagnosisResponse.java | 4 +--
.../internal/admin/remote/FetchHostResponse.java | 3 +-
.../remote/FetchResourceAttributesResponse.java | 3 +-
.../internal/admin/remote/FetchStatsResponse.java | 16 ++++-----
.../internal/admin/remote/FetchSysCfgResponse.java | 3 +-
.../internal/admin/remote/LicenseInfoRequest.java | 1 +
.../internal/admin/remote/LicenseInfoResponse.java | 10 ++----
.../admin/remote/ObjectDetailsRequest.java | 1 +
.../admin/remote/ObjectDetailsResponse.java | 3 +-
.../internal/admin/remote/ObjectNamesRequest.java | 1 +
.../internal/admin/remote/ObjectNamesResponse.java | 3 +-
.../remote/RefreshMemberSnapshotResponse.java | 3 +-
.../admin/remote/RegionAttributesRequest.java | 1 +
.../admin/remote/RegionAttributesResponse.java | 4 +--
.../geode/internal/admin/remote/RegionRequest.java | 1 +
.../internal/admin/remote/RegionResponse.java | 2 +-
.../internal/admin/remote/RegionSizeRequest.java | 1 +
.../internal/admin/remote/RegionSizeResponse.java | 3 +-
.../admin/remote/RegionStatisticsResponse.java | 4 +--
.../admin/remote/RemoveHealthListenerResponse.java | 4 +--
.../admin/remote/ResetHealthStatusRequest.java | 1 +
.../admin/remote/ResetHealthStatusResponse.java | 4 +--
.../internal/admin/remote/RootRegionResponse.java | 3 +-
.../internal/admin/remote/StoreSysCfgResponse.java | 3 +-
.../internal/admin/remote/SubRegionRequest.java | 1 +
.../internal/admin/remote/SubRegionResponse.java | 3 +-
.../internal/admin/remote/TailLogResponse.java | 3 +-
.../internal/admin/remote/VersionInfoRequest.java | 1 +
.../internal/admin/remote/VersionInfoResponse.java | 3 +-
.../cache/persistence/PersistentMemberManager.java | 4 +--
.../admin/internal/FinishBackupRequestTest.java | 37 +++++++++----------
.../admin/internal/FlushToDiskRequestTest.java | 30 ++++++++--------
.../admin/internal/PrepareBackupRequestTest.java | 41 +++++++++++-----------
.../geode/internal/cache/BackupLockTest.java | 19 +---------
51 files changed, 149 insertions(+), 169 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
index cd7b765..5da68c6 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
@@ -63,11 +63,14 @@ public class FinishBackupRequest extends CliLegacyMessage {
this.replyProcessor = null;
}
- private FinishBackupRequest(DM dm, Set<InternalDistributedMember> recipients, File targetDir, File baselineDir, boolean abort) {
- this(dm, recipients, new FinishBackupReplyProcessor(dm, recipients), targetDir, baselineDir, abort);
+ private FinishBackupRequest(DM dm, Set<InternalDistributedMember> recipients, File targetDir,
+ File baselineDir, boolean abort) {
+ this(dm, recipients, new FinishBackupReplyProcessor(dm, recipients), targetDir, baselineDir,
+ abort);
}
- FinishBackupRequest(DM dm, Set<InternalDistributedMember> recipients, FinishBackupReplyProcessor replyProcessor, File targetDir, File baselineDir, boolean abort) {
+ FinishBackupRequest(DM dm, Set<InternalDistributedMember> recipients,
+ FinishBackupReplyProcessor replyProcessor, File targetDir, File baselineDir, boolean abort) {
this.dm = dm;
this.targetDir = targetDir;
this.baselineDir = baselineDir;
@@ -79,7 +82,8 @@ public class FinishBackupRequest extends CliLegacyMessage {
public static Map<DistributedMember, Set<PersistentID>> send(DM dm, Set recipients,
File targetDir, File baselineDir, boolean abort) {
- FinishBackupRequest request = new FinishBackupRequest(dm, recipients, targetDir, baselineDir, abort);
+ FinishBackupRequest request =
+ new FinishBackupRequest(dm, recipients, targetDir, baselineDir, abort);
return request.send();
}
@@ -111,8 +115,7 @@ public class FinishBackupRequest extends CliLegacyMessage {
try {
persistentIds = doBackup(dm);
} catch (IOException e) {
- logger.error(
- LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, getClass()), e);
+ logger.error(LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, getClass()), e);
return AdminFailureResponse.create(getSender(), e);
}
return new FinishBackupResponse(getSender(), persistentIds);
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
index 3734752..f60f29e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
@@ -51,7 +51,8 @@ public class FlushToDiskRequest extends CliLegacyMessage {
this(dm, recipients, new FlushToDiskProcessor(dm, recipients));
}
- FlushToDiskRequest(DM dm, Set<InternalDistributedMember> recipients, FlushToDiskProcessor replyProcessor) {
+ FlushToDiskRequest(DM dm, Set<InternalDistributedMember> recipients,
+ FlushToDiskProcessor replyProcessor) {
this.dm = dm;
setRecipients(recipients);
this.replyProcessor = replyProcessor;
@@ -89,7 +90,7 @@ public class FlushToDiskRequest extends CliLegacyMessage {
cache.listDiskStoresIncludingRegionOwned().forEach(DiskStore::flush);
}
- return new FlushToDiskResponse(this.getSender());
+ return new FlushToDiskResponse(getSender());
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
index 28f9757..bf5762a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
@@ -61,7 +61,8 @@ public class PrepareBackupRequest extends CliLegacyMessage {
this(dm, recipients, new PrepareBackupReplyProcessor(dm, recipients));
}
- PrepareBackupRequest(DM dm, Set<InternalDistributedMember> recipients, PrepareBackupReplyProcessor replyProcessor) {
+ PrepareBackupRequest(DM dm, Set<InternalDistributedMember> recipients,
+ PrepareBackupReplyProcessor replyProcessor) {
this.dm = dm;
setRecipients(recipients);
this.replyProcessor = replyProcessor;
@@ -97,16 +98,15 @@ public class PrepareBackupRequest extends CliLegacyMessage {
protected AdminResponse createResponse(DM dm) {
HashSet<PersistentID> persistentIds;
try {
- persistentIds = prepareForBackup();
+ persistentIds = prepareForBackup(dm);
} catch (IOException e) {
- logger.error(
- LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, getClass()), e);
+ logger.error(LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, getClass()), e);
return AdminFailureResponse.create(getSender(), e);
}
return new PrepareBackupResponse(getSender(), persistentIds);
}
- HashSet<PersistentID> prepareForBackup() throws IOException {
+ HashSet<PersistentID> prepareForBackup(DM dm) throws IOException {
InternalCache cache = dm.getCache();
HashSet<PersistentID> persistentIds;
if (cache == null) {
@@ -139,8 +139,7 @@ public class PrepareBackupRequest extends CliLegacyMessage {
@Override
protected void process(DistributionMessage message, boolean warn) {
if (message instanceof PrepareBackupResponse) {
- HashSet<PersistentID> persistentIds =
- ((PrepareBackupResponse) message).getPersistentIds();
+ HashSet<PersistentID> persistentIds = ((PrepareBackupResponse) message).getPersistentIds();
if (persistentIds != null && !persistentIds.isEmpty()) {
results.put(message.getSender(), persistentIds);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
index dc8fb8b..bdc18f4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DM.java
@@ -71,7 +71,7 @@ public interface DM extends ReplySender {
* @since GemFire 8.0
*/
void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
- Version version);
+ Version version);
/**
* removes members that have the given version or later from the given collection, typically a Set
@@ -80,7 +80,7 @@ public interface DM extends ReplySender {
* @since GemFire 8.0
*/
void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
- Version version);
+ Version version);
/**
* Returns an unmodifiable set containing the identities of all of the known distribution
@@ -244,8 +244,7 @@ public interface DM extends ReplySender {
*
* @see ShutdownMessage#process
*/
- void handleManagerDeparture(InternalDistributedMember theId, boolean crashed,
- String reason);
+ void handleManagerDeparture(InternalDistributedMember theId, boolean crashed, String reason);
/**
* getThreadPool gets this distribution manager's message-processing thread pool
@@ -371,11 +370,9 @@ public interface DM extends ReplySender {
boolean enforceUniqueZone();
- Set<InternalDistributedMember> getMembersInSameZone(
- InternalDistributedMember acceptedMember);
+ Set<InternalDistributedMember> getMembersInSameZone(InternalDistributedMember acceptedMember);
- boolean areInSameZone(InternalDistributedMember member1,
- InternalDistributedMember member2);
+ boolean areInSameZone(InternalDistributedMember member1, InternalDistributedMember member2);
/**
* Returns true is the two members are on the same equivalent host machine based on overlapping IP
@@ -384,8 +381,7 @@ public interface DM extends ReplySender {
* @param member1 First member
* @param member2 Second member
*/
- boolean areOnEquivalentHost(InternalDistributedMember member1,
- InternalDistributedMember member2);
+ boolean areOnEquivalentHost(InternalDistributedMember member1, InternalDistributedMember member2);
Set<InetAddress> getEquivalents(InetAddress in);
@@ -404,7 +400,7 @@ public interface DM extends ReplySender {
* @since GemFire 6.6.3
*/
void addHostedLocators(InternalDistributedMember member, Collection<String> locators,
- boolean isSharedConfigurationEnabled);
+ boolean isSharedConfigurationEnabled);
/**
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index 5655e47..b1213ca 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -1391,16 +1391,19 @@ public class LonerDistributionManager implements DM {
@Override
public HealthMonitor getHealthMonitor(InternalDistributedMember owner) {
- throw new UnsupportedOperationException("getHealthMonitor is not supported by " + getClass().getSimpleName());
+ throw new UnsupportedOperationException(
+ "getHealthMonitor is not supported by " + getClass().getSimpleName());
}
@Override
public void removeHealthMonitor(InternalDistributedMember owner, int theId) {
- throw new UnsupportedOperationException("removeHealthMonitor is not supported by " + getClass().getSimpleName());
+ throw new UnsupportedOperationException(
+ "removeHealthMonitor is not supported by " + getClass().getSimpleName());
}
@Override
public void createHealthMonitor(InternalDistributedMember owner, GemFireHealthConfig cfg) {
- throw new UnsupportedOperationException("createHealthMonitor is not supported by " + getClass().getSimpleName());
+ throw new UnsupportedOperationException(
+ "createHealthMonitor is not supported by " + getClass().getSimpleName());
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
index 457cfdf..50aed79 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
@@ -35,8 +35,8 @@ public class AddHealthListenerResponse extends AdminResponse {
* Returns a <code>AddHealthListenerResponse</code> that will be returned to the specified
* recipient.
*/
- public static AddHealthListenerResponse create(DM dm,
- InternalDistributedMember recipient, GemFireHealthConfig cfg) {
+ public static AddHealthListenerResponse create(DM dm, InternalDistributedMember recipient,
+ GemFireHealthConfig cfg) {
AddHealthListenerResponse m = new AddHealthListenerResponse();
m.setRecipient(recipient);
dm.createHealthMonitor(recipient, cfg);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
index e4de846..37111dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
@@ -47,6 +47,7 @@ public class AddStatListenerRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
index c71b4c7..19b430e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
@@ -34,8 +34,8 @@ public class AddStatListenerResponse extends AdminResponse {
* Returns a <code>AddStatListenerResponse</code> that will be returned to the specified
* recipient. The message will contains a copy of the local manager's system config.
*/
- public static AddStatListenerResponse create(DM dm,
- InternalDistributedMember recipient, long resourceId, String statName) {
+ public static AddStatListenerResponse create(DM dm, InternalDistributedMember recipient,
+ long resourceId, String statName) {
AddStatListenerResponse m = new AddStatListenerResponse();
m.setRecipient(recipient);
GemFireStatSampler sampler = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
index 43196f3..b709cf5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
@@ -29,8 +29,8 @@ public class AdminFailureResponse extends AdminResponse {
private Exception cause;
/**
- * Returns a {@code AdminFailureResponse} that will be returned to the specified recipient.
- * The message will contains a copy of the local manager's system config.
+ * Returns a {@code AdminFailureResponse} that will be returned to the specified recipient. The
+ * message will contains a copy of the local manager's system config.
*/
public static AdminFailureResponse create(InternalDistributedMember recipient, Exception cause) {
AdminFailureResponse message = new AdminFailureResponse();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
index a1b15d3..098d3f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
@@ -45,8 +45,8 @@ public class CacheConfigResponse extends AdminResponse {
/**
* Returns a {@code CacheConfigResponse} that will be returned to the specified recipient.
*/
- public static CacheConfigResponse create(DM dm,
- InternalDistributedMember recipient, int cacheId, byte attributeCode, int newValue) {
+ public static CacheConfigResponse create(DM dm, InternalDistributedMember recipient, int cacheId,
+ byte attributeCode, int newValue) {
CacheConfigResponse m = new CacheConfigResponse();
m.setRecipient(recipient);
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
index a721040..2692d28 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
@@ -42,6 +42,7 @@ public class CacheInfoRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
index 6f03a10..bc79498 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
@@ -37,8 +37,7 @@ public class CacheInfoResponse extends AdminResponse {
/**
* Returns a {@code CacheInfoResponse} that will be returned to the specified recipient.
*/
- public static CacheInfoResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static CacheInfoResponse create(DM dm, InternalDistributedMember recipient) {
CacheInfoResponse m = new CacheInfoResponse();
m.setRecipient(recipient);
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
index 3f57f76..73058bb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
@@ -34,8 +34,8 @@ public class CancelStatListenerResponse extends AdminResponse {
* Returns a <code>CancelStatListenerResponse</code> that will be returned to the specified
* recipient. The message will contains a copy of the local manager's system config.
*/
- public static CancelStatListenerResponse create(DM dm,
- InternalDistributedMember recipient, int listenerId) {
+ public static CancelStatListenerResponse create(DM dm, InternalDistributedMember recipient,
+ int listenerId) {
CancelStatListenerResponse m = new CancelStatListenerResponse();
m.setRecipient(recipient);
GemFireStatSampler sampler = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
index d8f7e1c..5d8abd0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoRequest.java
@@ -55,6 +55,7 @@ public class DurableClientInfoRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
protected AdminResponse createResponse(DM dm) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
index c3f7b80..f44109c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DurableClientInfoResponse.java
@@ -40,8 +40,8 @@ public class DurableClientInfoResponse extends AdminResponse {
/**
* Returns a {@code DurableClientInfoResponse} that will be returned to the specified recipient.
*/
- public static DurableClientInfoResponse create(DM dm,
- InternalDistributedMember recipient, DurableClientInfoRequest request) {
+ public static DurableClientInfoResponse create(DM dm, InternalDistributedMember recipient,
+ DurableClientInfoRequest request) {
DurableClientInfoResponse m = new DurableClientInfoResponse();
m.setRecipient(recipient);
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
index fb4e35a..5a3500f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
@@ -37,6 +37,7 @@ public class FetchDistLockInfoRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
index 2f5fa43..5804e65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
@@ -35,8 +35,7 @@ public class FetchDistLockInfoResponse extends AdminResponse {
* recipient. The message will contains a copy of the local manager's distributed lock service
* information.
*/
- public static FetchDistLockInfoResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static FetchDistLockInfoResponse create(DM dm, InternalDistributedMember recipient) {
FetchDistLockInfoResponse m = new FetchDistLockInfoResponse();
InternalDistributedMember id = dm.getDistributionManagerId();
Set entries = DLockService.snapshotAllServices().entrySet();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
index 20888f4..e134f19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
@@ -36,8 +36,8 @@ public class FetchHealthDiagnosisResponse extends AdminResponse {
* Returns a <code>FetchHealthDiagnosisResponse</code> that will be returned to the specified
* recipient.
*/
- public static FetchHealthDiagnosisResponse create(DM dm,
- InternalDistributedMember recipient, int id, GemFireHealth.Health healthCode) {
+ public static FetchHealthDiagnosisResponse create(DM dm, InternalDistributedMember recipient,
+ int id, GemFireHealth.Health healthCode) {
FetchHealthDiagnosisResponse m = new FetchHealthDiagnosisResponse();
m.setRecipient(recipient);
{
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
index 233dccc..e568a47 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
@@ -59,8 +59,7 @@ public class FetchHostResponse extends AdminResponse {
* Returns a <code>FetchHostResponse</code> that will be returned to the specified recipient. The
* message will contains a copy of this vm's local host.
*/
- public static FetchHostResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static FetchHostResponse create(DM dm, InternalDistributedMember recipient) {
FetchHostResponse m = new FetchHostResponse();
m.setRecipient(recipient);
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
index 2273a5d..709a89d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
@@ -30,7 +30,8 @@ public class FetchResourceAttributesResponse extends AdminResponse {
private RemoteStat[] stats;
- public static FetchResourceAttributesResponse create(DM dm, InternalDistributedMember recipient, long rsrcUniqueId) {
+ public static FetchResourceAttributesResponse create(DM dm, InternalDistributedMember recipient,
+ long rsrcUniqueId) {
FetchResourceAttributesResponse m = new FetchResourceAttributesResponse();
m.setRecipient(recipient);
Statistics s = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
index 38fc980..665f6c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
@@ -14,18 +14,18 @@
*/
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.Statistics;
-import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.InternalDistributedSystem.StatisticsVisitor;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Statistics;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.InternalDistributedSystem.StatisticsVisitor;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+
/**
* Provides a response of remote statistic resources for a {@code FetchStatsRequest}
*/
@@ -40,8 +40,8 @@ public class FetchStatsResponse extends AdminResponse {
* @param recipient the recipient who made the original request
* @return response containing all remote stat resources
*/
- public static FetchStatsResponse create(DM dm,
- InternalDistributedMember recipient, final String statisticsTypeName) {
+ public static FetchStatsResponse create(DM dm, InternalDistributedMember recipient,
+ final String statisticsTypeName) {
FetchStatsResponse m = new FetchStatsResponse();
m.setRecipient(recipient);
List<RemoteStatResource> statList = new ArrayList<RemoteStatResource>();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
index 21b531c..e5405bc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
@@ -34,8 +34,7 @@ public class FetchSysCfgResponse extends AdminResponse {
* Returns a <code>FetchSysCfgResponse</code> that will be returned to the specified recipient.
* The message will contains a copy of the local manager's config.
*/
- public static FetchSysCfgResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static FetchSysCfgResponse create(DM dm, InternalDistributedMember recipient) {
FetchSysCfgResponse m = new FetchSysCfgResponse();
m.setRecipient(recipient);
Config conf = dm.getSystem().getConfig();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
index c15d1dc..11877d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
@@ -40,6 +40,7 @@ public class LicenseInfoRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
index efa2f38..edc63d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
@@ -14,12 +14,6 @@
*/
package org.apache.geode.internal.admin.remote;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -28,6 +22,7 @@ import java.util.Properties;
import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.logging.LogService;
@@ -43,8 +38,7 @@ public class LicenseInfoResponse extends AdminResponse {
/**
* Returns a {@code LicenseInfoResponse} that will be returned to the specified recipient.
*/
- public static LicenseInfoResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static LicenseInfoResponse create(DM dm, InternalDistributedMember recipient) {
LicenseInfoResponse m = new LicenseInfoResponse();
m.setRecipient(recipient);
m.p = new Properties();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
index 110e66b..1dd5c26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
@@ -56,6 +56,7 @@ public class ObjectDetailsRequest extends RegionAdminRequest implements Cancella
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
index f6518f5..490a3b1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
@@ -38,8 +38,7 @@ public class ObjectDetailsResponse extends AdminResponse implements Cancellable
* Returns a <code>ObjectValueResponse</code> that will be returned to the specified recipient.
* The message will contains a copy of the local manager's system config.
*/
- public static ObjectDetailsResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static ObjectDetailsResponse create(DM dm, InternalDistributedMember recipient) {
ObjectDetailsResponse m = new ObjectDetailsResponse();
m.setRecipient(recipient);
return m;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
index 5366c20..5987340 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
@@ -44,6 +44,7 @@ public class ObjectNamesRequest extends RegionAdminRequest implements Cancellabl
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
index ce61a21..c916f0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
@@ -36,8 +36,7 @@ public class ObjectNamesResponse extends AdminResponse implements Cancellable {
* Returns a <code>ObjectNamesResponse</code> that will be returned to the specified recipient.
* The message will contains a copy of the local manager's system config.
*/
- public static ObjectNamesResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static ObjectNamesResponse create(DM dm, InternalDistributedMember recipient) {
ObjectNamesResponse m = new ObjectNamesResponse();
m.setRecipient(recipient);
return m;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
index df71ac8..bf0bd6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java
@@ -38,8 +38,7 @@ public class RefreshMemberSnapshotResponse extends AdminResponse {
* Returns a {@code FetchSysCfgResponse} that will be returned to the specified recipient. The
* message will contains a copy of the local manager's config.
*/
- public static RefreshMemberSnapshotResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static RefreshMemberSnapshotResponse create(DM dm, InternalDistributedMember recipient) {
RefreshMemberSnapshotResponse m = new RefreshMemberSnapshotResponse();
m.setRecipient(recipient);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
index 29d0f13..16ce17c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
@@ -42,6 +42,7 @@ public class RegionAttributesRequest extends RegionAdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
index d44edec..abd2b77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
@@ -34,8 +34,8 @@ public class RegionAttributesResponse extends AdminResponse {
* Returns a <code>RegionAttributesResponse</code> that will be returned to the specified
* recipient. The message will contains a copy of the local manager's system config.
*/
- public static RegionAttributesResponse create(DM dm,
- InternalDistributedMember recipient, Region r) {
+ public static RegionAttributesResponse create(DM dm, InternalDistributedMember recipient,
+ Region r) {
RegionAttributesResponse m = new RegionAttributesResponse();
m.setRecipient(recipient);
m.attributes = new RemoteRegionAttributes(r.getAttributes());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
index 1529cd6..596c59c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
@@ -111,6 +111,7 @@ public class RegionRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
index 09519a4..5faefe1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
@@ -49,7 +49,7 @@ public class RegionResponse extends AdminResponse {
* message will contains a copy of the local manager's system config.
*/
public static RegionResponse create(DM dm, InternalDistributedMember recipient,
- RegionRequest request) {
+ RegionRequest request) {
RegionResponse m = new RegionResponse();
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
index e809cf9..94902a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
@@ -40,6 +40,7 @@ public class RegionSizeRequest extends RegionAdminRequest implements Cancellable
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
index 999a92f..883c1d7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
@@ -35,8 +35,7 @@ public class RegionSizeResponse extends AdminResponse implements Cancellable {
/**
* Returns a <code>RegionSizeResponse</code> that will be returned to the specified recipient.
*/
- public static RegionSizeResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static RegionSizeResponse create(DM dm, InternalDistributedMember recipient) {
RegionSizeResponse m = new RegionSizeResponse();
m.setRecipient(recipient);
return m;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
index e260bf6..4778d15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
@@ -34,8 +34,8 @@ public class RegionStatisticsResponse extends AdminResponse {
* Returns a <code>RegionStatisticsResponse</code> that will be returned to the specified
* recipient. The message will contains a copy of the local manager's system config.
*/
- public static RegionStatisticsResponse create(DM dm,
- InternalDistributedMember recipient, Region r) {
+ public static RegionStatisticsResponse create(DM dm, InternalDistributedMember recipient,
+ Region r) {
RegionStatisticsResponse m = new RegionStatisticsResponse();
m.setRecipient(recipient);
m.regionStatistics = new RemoteCacheStatistics(r.getStatistics());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
index c3c825d..9c44464 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
@@ -33,8 +33,8 @@ public class RemoveHealthListenerResponse extends AdminResponse {
* Returns a <code>RemoveHealthListenerResponse</code> that will be returned to the specified
* recipient.
*/
- public static RemoveHealthListenerResponse create(DM dm,
- InternalDistributedMember recipient, int id) {
+ public static RemoveHealthListenerResponse create(DM dm, InternalDistributedMember recipient,
+ int id) {
RemoveHealthListenerResponse m = new RemoveHealthListenerResponse();
m.setRecipient(recipient);
dm.removeHealthMonitor(recipient, id);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
index ef2a834..7a75c36 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
@@ -46,6 +46,7 @@ public class ResetHealthStatusRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
index c622164..b5a5c22 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
@@ -33,8 +33,8 @@ public class ResetHealthStatusResponse extends AdminResponse {
* Returns a <code>ResetHealthStatusResponse</code> that will be returned to the specified
* recipient.
*/
- public static ResetHealthStatusResponse create(DM dm,
- InternalDistributedMember recipient, int id) {
+ public static ResetHealthStatusResponse create(DM dm, InternalDistributedMember recipient,
+ int id) {
ResetHealthStatusResponse m = new ResetHealthStatusResponse();
m.setRecipient(recipient);
{
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
index beb141d..64bd67d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
@@ -43,8 +43,7 @@ public class RootRegionResponse extends AdminResponse {
* Returns a {@code RootRegionResponse} that will be returned to the specified recipient. The
* message will contains a copy of the local manager's system config.
*/
- public static RootRegionResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static RootRegionResponse create(DM dm, InternalDistributedMember recipient) {
RootRegionResponse m = new RootRegionResponse();
try {
InternalCache cache = (InternalCache) CacheFactory.getInstance(dm.getSystem());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
index b9479e1..bf6c41a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
@@ -35,8 +35,7 @@ public class StoreSysCfgResponse extends AdminResponse {
* Returns a <code>StoreSysCfgResponse</code> that states that a given set of distribution
* managers are known by <code>dm</code> to be started.
*/
- public static StoreSysCfgResponse create(DM dm,
- InternalDistributedMember recipient, Config sc) {
+ public static StoreSysCfgResponse create(DM dm, InternalDistributedMember recipient, Config sc) {
StoreSysCfgResponse m = new StoreSysCfgResponse();
m.setRecipient(recipient);
InternalDistributedSystem sys = dm.getSystem();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
index e473aee..8f0e88e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
@@ -42,6 +42,7 @@ public class SubRegionRequest extends RegionAdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
index 7edb84b..e049318 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
@@ -37,8 +37,7 @@ public class SubRegionResponse extends AdminResponse {
* Returns a <code>SubRegionResponse</code> that will be returned to the specified recipient. The
* message will contains a copy of the local manager's system config.
*/
- public static SubRegionResponse create(DM dm,
- InternalDistributedMember recipient, Region r) {
+ public static SubRegionResponse create(DM dm, InternalDistributedMember recipient, Region r) {
SubRegionResponse m = new SubRegionResponse();
m.setRecipient(recipient);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
index 4f3602a..6e7ee03 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
@@ -38,8 +38,7 @@ public class TailLogResponse extends AdminResponse {
private String tail;
private String childTail;
- public static TailLogResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static TailLogResponse create(DM dm, InternalDistributedMember recipient) {
TailLogResponse m = new TailLogResponse();
m.setRecipient(recipient);
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
index 5ea387b..25ff383 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
@@ -42,6 +42,7 @@ public class VersionInfoRequest extends AdminRequest {
/**
* Must return a proper response to this request.
+ *
* @param dm
*/
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
index 21b21a4..f67f8e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
@@ -36,8 +36,7 @@ public class VersionInfoResponse extends AdminResponse {
/**
* Returns a <code>VersionInfoResponse</code> that will be returned to the specified recipient.
*/
- public static VersionInfoResponse create(DM dm,
- InternalDistributedMember recipient) {
+ public static VersionInfoResponse create(DM dm, InternalDistributedMember recipient) {
VersionInfoResponse m = new VersionInfoResponse();
m.setRecipient(recipient);
m.verInfo = GemFireVersion.asString();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
index 201ad85..34b1ecb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java
@@ -165,7 +165,7 @@ public class PersistentMemberManager {
* should be aborted because the disk store is already running.
*/
public boolean prepareRevoke(PersistentMemberPattern pattern, DM dm,
- InternalDistributedMember sender) {
+ InternalDistributedMember sender) {
if (logger.isDebugEnabled()) {
logger.debug("Preparing revoke if pattern {}", pattern);
}
@@ -235,7 +235,7 @@ public class PersistentMemberManager {
private DM dm;
public PendingRevokeListener(PersistentMemberPattern pattern, InternalDistributedMember sender,
- DM dm) {
+ DM dm) {
this.dm = dm;
this.pattern = pattern;
this.sender = sender;
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/FinishBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/FinishBackupRequestTest.java
index 492fd44..721959e 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/FinishBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/FinishBackupRequestTest.java
@@ -24,19 +24,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.InOrder;
-
import org.apache.geode.admin.internal.FinishBackupRequest.FinishBackupReplyProcessor;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.persistence.PersistentID;
@@ -49,6 +36,18 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.InOrder;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
@Category(UnitTest.class)
public class FinishBackupRequestTest {
@@ -91,7 +90,8 @@ public class FinishBackupRequestTest {
recipients.add(member1);
recipients.add(member2);
- finishBackupRequest = new FinishBackupRequest(dm, recipients, replyProcessor, targetDir, baselineDir, false);
+ finishBackupRequest =
+ new FinishBackupRequest(dm, recipients, replyProcessor, targetDir, baselineDir, false);
}
@Test
@@ -185,18 +185,19 @@ public class FinishBackupRequestTest {
}
@Test
- public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException() throws Exception {
+ public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException()
+ throws Exception {
doThrow(new ReplyException(new CacheClosedException())).when(replyProcessor).waitForReplies();
finishBackupRequest.send();
}
@Test
- public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCacheClosedException() throws Exception {
+ public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCacheClosedException()
+ throws Exception {
doThrow(new ReplyException(new NullPointerException())).when(replyProcessor).waitForReplies();
- assertThatThrownBy(() -> finishBackupRequest.send())
- .isInstanceOf(ReplyException.class)
+ assertThatThrownBy(() -> finishBackupRequest.send()).isInstanceOf(ReplyException.class)
.hasCauseInstanceOf(NullPointerException.class);
}
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/FlushToDiskRequestTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/FlushToDiskRequestTest.java
index 277db59..2730146 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/FlushToDiskRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/FlushToDiskRequestTest.java
@@ -24,16 +24,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.InOrder;
-
import org.apache.geode.admin.internal.FlushToDiskRequest.FlushToDiskProcessor;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.DiskStore;
@@ -43,6 +33,15 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.admin.remote.AdminResponse;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.InOrder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
@Category(UnitTest.class)
public class FlushToDiskRequestTest {
@@ -152,18 +151,19 @@ public class FlushToDiskRequestTest {
}
@Test
- public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException() throws Exception {
+ public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException()
+ throws Exception {
doThrow(new ReplyException(new CacheClosedException())).when(replyProcessor).waitForReplies();
flushToDiskRequest.send();
}
@Test
- public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCancelException() throws Exception {
+ public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCancelException()
+ throws Exception {
doThrow(new ReplyException(new NullPointerException())).when(replyProcessor).waitForReplies();
- assertThatThrownBy(() -> flushToDiskRequest.send())
- .isInstanceOf(ReplyException.class)
+ assertThatThrownBy(() -> flushToDiskRequest.send()).isInstanceOf(ReplyException.class)
.hasCauseInstanceOf(NullPointerException.class);
}
@@ -174,4 +174,4 @@ public class FlushToDiskRequestTest {
flushToDiskRequest.send();
}
-}
\ No newline at end of file
+}
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/PrepareBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/admin/internal/PrepareBackupRequestTest.java
index c8fd60f..2f327d4 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/internal/PrepareBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/internal/PrepareBackupRequestTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.admin.internal;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
@@ -26,19 +25,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.InOrder;
-
import org.apache.geode.admin.internal.PrepareBackupRequest.PrepareBackupReplyProcessor;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.persistence.PersistentID;
@@ -51,10 +37,21 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
import org.apache.geode.internal.cache.BackupManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.InOrder;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
@Category(UnitTest.class)
public class PrepareBackupRequestTest {
-
+
private PrepareBackupRequest prepareBackupRequest;
private PrepareBackupReplyProcessor replyProcessor;
@@ -171,9 +168,10 @@ public class PrepareBackupRequestTest {
}
@Test
- public void repliesWithAdminFailureResponseWhenPrepareForBackupThrowsIOException() throws Exception {
+ public void repliesWithAdminFailureResponseWhenPrepareForBackupThrowsIOException()
+ throws Exception {
prepareBackupRequest = spy(prepareBackupRequest);
- doThrow(new IOException()).when(prepareBackupRequest).prepareForBackup();
+ doThrow(new IOException()).when(prepareBackupRequest).prepareForBackup(dm);
prepareBackupRequest.send();
@@ -181,18 +179,19 @@ public class PrepareBackupRequestTest {
}
@Test
- public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException() throws Exception {
+ public void sendShouldCompleteIfWaitForRepliesThrowsReplyExceptionCausedByCacheClosedException()
+ throws Exception {
doThrow(new ReplyException(new CacheClosedException())).when(replyProcessor).waitForReplies();
prepareBackupRequest.send();
}
@Test
- public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCacheClosedException() throws Exception {
+ public void sendShouldThrowIfWaitForRepliesThrowsReplyExceptionNotCausedByCacheClosedException()
+ throws Exception {
doThrow(new ReplyException(new NullPointerException())).when(replyProcessor).waitForReplies();
- assertThatThrownBy(() -> prepareBackupRequest.send())
- .isInstanceOf(ReplyException.class)
+ assertThatThrownBy(() -> prepareBackupRequest.send()).isInstanceOf(ReplyException.class)
.hasCauseInstanceOf(NullPointerException.class);
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupLockTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupLockTest.java
index 9c5282a..a2939eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupLockTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupLockTest.java
@@ -43,23 +43,6 @@ public class BackupLockTest {
executor = Executors.newSingleThreadExecutor();
}
- // BackupLock does not protect from multiple threads calling lockForBackup
- public void onlyOneThreadCanLockForBackupAndSetBackupThread() throws Exception {
- // problem #1: two threads can can lockForBackup without invoking unlockForBackup
- // problem #2: lockForBackup and setBackupThread should be one call
-
- backupLock.lockForBackup();
- backupLock.setBackupThread();
-
- Future<Boolean> future = executor.submit(() -> {
- backupLock.lockForBackup();
- backupLock.setBackupThread();
- return true;
- });
-
- assertThatThrownBy(() -> future.get(5, SECONDS)).isInstanceOf(TimeoutException.class);
- }
-
@Test
public void lockShouldBlockUntilLockForBackup() throws Exception {
backupLock.lockForBackup();
@@ -122,4 +105,4 @@ public class BackupLockTest {
assertThat(backupLock.hasThreadLocal()).isFalse();
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.