Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Declare equals and hashCode in Socket classes for use in Java maps #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/main/java/io/gomint/jraknet/ClientSocket.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.net.InetSocketAddress;
import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import java.util.Objects;

import static io.gomint.jraknet.RakNetConstraints.*;

Expand Down Expand Up @@ -373,4 +374,19 @@ private void handleUnconnectedPong( InetSocketAddress sender, PacketBuffer datag
this.propagateEvent( new SocketEvent( SocketEvent.Type.UNCONNECTED_PONG, info ) );
}

}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
ClientSocket that = (ClientSocket) o;
return mojangModificationEnabled == that.mojangModificationEnabled &&
Objects.equals(logger, that.logger) &&
Objects.equals(connection, that.connection);
}

@Override
public int hashCode() {
return Objects.hash(super.hashCode(), logger, connection, mojangModificationEnabled);
}
}
20 changes: 16 additions & 4 deletions src/main/java/io/gomint/jraknet/ServerSocket.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
import java.net.SocketAddress;
import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

import static io.gomint.jraknet.RakNetConstraints.*;
Expand Down Expand Up @@ -448,4 +445,19 @@ private ServerConnection getConnection( InetSocketAddress sender, PacketBuffer d
return connection;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
ServerSocket that = (ServerSocket) o;
return maxConnections == that.maxConnections &&
mojangModificationEnabled == that.mojangModificationEnabled &&
Objects.equals(bindAddress, that.bindAddress);
}

@Override
public int hashCode() {
return Objects.hash(super.hashCode(), bindAddress, maxConnections, mojangModificationEnabled);
}
}
13 changes: 13 additions & 0 deletions src/main/java/io/gomint/jraknet/Socket.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.util.Arrays;
import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ThreadFactory;
Expand Down Expand Up @@ -260,4 +261,16 @@ private void update() {
this.cleanupUpdateThread();
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Socket socket = (Socket) o;
return guid == socket.guid;
}

@Override
public int hashCode() {
return Objects.hash(guid);
}
}