From 353679801e643d9e4518ba4ad73cb91b509ca1fc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 5 Jul 2023 18:16:53 +0200 Subject: [PATCH] tunnel: use record class where possible Signed-off-by: Jason A. Donenfeld --- .../wireguard/android/backend/Statistics.java | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java index 9fc92c53..08b84949 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java @@ -21,31 +21,7 @@ import androidx.annotation.Nullable; */ @NonNullForAll public class Statistics { - - // TODO: switch to Java Record class once R8 supports desugaring those. - public final class PeerStats { - public final long rxBytes, txBytes, latestHandshakeEpochMillis; - - PeerStats(final long rxBytes, final long txBytes, final long latestHandshakeEpochMillis) { - this.rxBytes = rxBytes; - this.txBytes = txBytes; - this.latestHandshakeEpochMillis = latestHandshakeEpochMillis; - } - - @Override public boolean equals(final Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - final PeerStats stats = (PeerStats) o; - return rxBytes == stats.rxBytes && txBytes == stats.txBytes && latestHandshakeEpochMillis == stats.latestHandshakeEpochMillis; - } - - @Override public int hashCode() { - return Objects.hash(rxBytes, txBytes, latestHandshakeEpochMillis); - } - } - + public record PeerStats(long rxBytes, long txBytes, long latestHandshakeEpochMillis) { } private final Map stats = new HashMap<>(); private long lastTouched = SystemClock.elapsedRealtime(); @@ -85,7 +61,7 @@ public class Statistics { */ @Nullable public PeerStats peer(final Key peer) { - return this.stats.get(peer); + return stats.get(peer); } /**