fix: Id lacking equals/hashCode

Author: qixils

USAGE.md

@@ -42,7 +42,7 @@ Add to the `dependencies` section of your `pom.xml` file:
 <dependency>
     <groupId>dev.qixils.crowdcontrol</groupId>
     <artifactId>crowd-control-receiver</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
 </dependency>
 ```
 
@@ -54,13 +54,13 @@ Add to the `dependencies` section of your `pom.xml` file:
 Add to the `dependencies` section of your `build.gradle` file:
 
 ```gradle
-compileOnly 'dev.qixils.crowdcontrol:crowd-control-receiver:3.7.0'
+compileOnly 'dev.qixils.crowdcontrol:crowd-control-receiver:3.7.1'
 ```
 
 Or, if using Kotlin (`build.gradle.kts`):
 
 ```kts
-compileOnly("dev.qixils.crowdcontrol:crowd-control-receiver:3.7.0")
+compileOnly("dev.qixils.crowdcontrol:crowd-control-receiver:3.7.1")
 ```
 
 </details>
@@ -281,7 +281,7 @@ Add to the `dependencies` section of your `pom.xml` file:
 <dependency>
     <groupId>dev.qixils.crowdcontrol</groupId>
     <artifactId>crowd-control-sender</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
 </dependency>
 ```
 
@@ -293,13 +293,13 @@ Add to the `dependencies` section of your `pom.xml` file:
 Add to the `dependencies` section of your `build.gradle` file:
 
 ```gradle
-compileOnly 'dev.qixils.crowdcontrol:crowd-control-sender:3.7.0'
+compileOnly 'dev.qixils.crowdcontrol:crowd-control-sender:3.7.1'
 ```
 
 Or, if using Kotlin (`build.gradle.kts`):
 
 ```kts
-compileOnly("dev.qixils.crowdcontrol:crowd-control-sender:3.7.0")
+compileOnly("dev.qixils.crowdcontrol:crowd-control-sender:3.7.1")
 ```
 
 </details>

pojos/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-crowd-control</artifactId>
         <groupId>dev.qixils.crowdcontrol</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <developerConnection>scm:git:https://github.com/qixils/java-crowd-control
         </developerConnection>
         <url>https://github.com/qixils/java-crowd-control.git</url>
-        <tag>v3.7.0</tag>
+        <tag>v3.7.1</tag>
     </scm>
     <licenses>
         <license>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>dev.qixils.crowdcontrol</groupId>
     <artifactId>java-crowd-control</artifactId>
-    <version>3.7.0</version>  <!-- don't forget to update scm tags & submodule versions -->
+    <version>3.7.1</version>  <!-- don't forget to update scm tags & submodule versions -->
     <packaging>pom</packaging>
 
     <modules>
@@ -25,7 +25,7 @@
         <developerConnection>scm:git:https://github.com/qixils/java-crowd-control
         </developerConnection>
         <url>https://github.com/qixils/java-crowd-control.git</url>
-        <tag>v3.7.0</tag>
+        <tag>v3.7.1</tag>
     </scm>
     <licenses>
         <license>

receiver/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-crowd-control</artifactId>
         <groupId>dev.qixils.crowdcontrol</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <developerConnection>scm:git:https://github.com/qixils/java-crowd-control
         </developerConnection>
         <url>https://github.com/qixils/java-crowd-control.git</url>
-        <tag>v3.7.0</tag>
+        <tag>v3.7.1</tag>
     </scm>
     <licenses>
         <license>

receiver/src/main/java/dev/qixils/crowdcontrol/socket/Id.java

@@ -5,6 +5,9 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Locale;
+import java.util.Objects;
+
+import static dev.qixils.crowdcontrol.util.StringUtils.repr;
 
 class Id {
 	public final @NotNull String id;
@@ -14,4 +17,25 @@ public Id(@NotNull String id, @Nullable IdType type) {
 		this.id = id.toLowerCase(Locale.ENGLISH);
 		this.type = ExceptionUtil.validateNotNullElse(type, IdType.EFFECT);
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		Id other = (Id) o;
+		return id.equals(other.id) && type == other.type;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, type);
+	}
+
+	@Override
+	public String toString() {
+		return "Id{" +
+				"id=" + repr(id) +
+				", type=" + type +
+				'}';
+	}
 }

sender/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-crowd-control</artifactId>
         <groupId>dev.qixils.crowdcontrol</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <developerConnection>scm:git:https://github.com/qixils/java-crowd-control
         </developerConnection>
         <url>https://github.com/qixils/java-crowd-control.git</url>
-        <tag>v3.7.0</tag>
+        <tag>v3.7.1</tag>
     </scm>
     <licenses>
         <license>

tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-crowd-control</artifactId>
         <groupId>dev.qixils.crowdcontrol</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <developerConnection>scm:git:https://github.com/qixils/java-crowd-control
         </developerConnection>
         <url>https://github.com/qixils/java-crowd-control.git</url>
-        <tag>v3.7.0</tag>
+        <tag>v3.7.1</tag>
     </scm>
     <licenses>
         <license>