This is an automated email from the ASF dual-hosted git repository. klund pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 07424378194d48dec755ffc1578d72f5c7c65627 Author: Kirk Lund <[email protected]> AuthorDate: Fri Jul 13 14:04:41 2018 -0700 GEODE-5405: Cleanup PersistentMemberPattern * add missing @Override annotations * change fields to be private * minor changes to format --- .../cache/persistence/PersistentMemberPattern.java | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java index 360934d..0a1cb98 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberPattern.java @@ -33,10 +33,11 @@ import org.apache.geode.internal.net.SocketCreator; * @since GemFire prPersistSprint1 */ public class PersistentMemberPattern implements PersistentID, Comparable<PersistentMemberPattern> { - protected InetAddress host; - protected String directory; - protected UUID diskStoreID; - protected long revokedTime; + + private InetAddress host; + private String directory; + private UUID diskStoreID; + private long revokedTime; public PersistentMemberPattern(PersistentMemberID id) { this(id.host, id.directory, id.diskStoreId.toUUID(), 0); @@ -62,14 +63,15 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist this.diskStoreID = diskStoreID; } - // Used for deserialization only - public PersistentMemberPattern() {} + public PersistentMemberPattern() { + // Used for deserialization only + } public boolean matches(PersistentMemberID id) { - boolean matches = true; if (id == null) { return false; } + boolean matches = true; matches &= host == null || host.equals(id.host); matches &= directory == null || directory.equals(id.directory); matches &= diskStoreID == null @@ -96,7 +98,7 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist result.append(SocketCreator.getHostName(host)); result.append(":"); result.append(directory); - result.append(",revokedTime").append(revokedTime); + result.append(",revoked@").append(revokedTime); result.append("]"); } @@ -143,18 +145,22 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist return true; } + @Override public InetAddress getHost() { return host; } + @Override public String getDirectory() { return directory; } + @Override public UUID getUUID() { return diskStoreID; } + @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { boolean hasHost = in.readBoolean(); if (hasHost) { @@ -168,6 +174,7 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist revokedTime = in.readLong(); } + @Override public void toData(DataOutput out) throws IOException { out.writeBoolean(host != null); if (host != null) { @@ -182,6 +189,7 @@ public class PersistentMemberPattern implements PersistentID, Comparable<Persist out.writeLong(revokedTime); } + @Override public int compareTo(PersistentMemberPattern o) { int result = compare(diskStoreID, o.diskStoreID); if (result != 0) {
