🔧 Optimize hashCode() for datatypes.

Ultreon · Nov 10, 2023 · d0d3eb9 · d0d3eb9
1 parent d52c26c
commit d0d3eb9
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ build/
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea/sonarlint/
 *.iws
 *.iml
 *.ipr

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-project_version=1.2.1+patch.1
+project_version=1.2.2
diff --git a/src/main/java/com/ultreon/data/DataIo.java b/src/main/java/com/ultreon/data/DataIo.java
@@ -68,7 +68,7 @@ public static <T extends IType<?>> T readCompressed(InputStream stream, T... typ
         GZIPInputStream gzipStream = new GZIPInputStream(stream);
         return read(gzipStream, type);
     }
-    
+
     public static void write(IType<?> type, File file) throws IOException {
         try (FileOutputStream stream = new FileOutputStream(file)) {
             write(type, stream);
@@ -89,7 +89,7 @@ public static void write(IType<?> type, OutputStream stream) throws IOException
         type.write(outputStream);
         outputStream.flush();
     }
-    
+
     public static void writeCompressed(IType<?> type, URL file) throws IOException {
         try (OutputStream stream = file.openConnection().getOutputStream()) {
             writeCompressed(type, stream);

diff --git a/src/main/java/com/ultreon/data/FutureVersionException.java b/src/main/java/com/ultreon/data/FutureVersionException.java
@@ -1,6 +1,6 @@
 package com.ultreon.data;
 
-public class FutureVersionException extends RuntimeException {
+public class FutureVersionException extends IllegalStateException {
     private final short read;
     private final short current;
 

diff --git a/src/main/java/com/ultreon/data/IReader.java b/src/main/java/com/ultreon/data/IReader.java
@@ -2,8 +2,8 @@
 
 import com.ultreon.data.types.IType;
 
-import java.io.IOException;
 import java.io.DataInputStream;
+import java.io.IOException;
 
 @FunctionalInterface
 public interface IReader<T extends IType<?>> {

diff --git a/src/main/java/com/ultreon/data/TypeRegistry.java b/src/main/java/com/ultreon/data/TypeRegistry.java
@@ -2,8 +2,8 @@
 
 import com.ultreon.data.types.*;
 
-import java.io.IOException;
 import java.io.DataInputStream;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/src/main/java/com/ultreon/data/types/BigDecType.java b/src/main/java/com/ultreon/data/types/BigDecType.java
@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Objects;
 
 public class BigDecType implements IType<BigDecimal> {
     private BigDecimal obj;
@@ -58,12 +57,12 @@ public boolean equals(Object other) {
         if (this == other) return true;
         if (!(other instanceof BigDecType)) return false;
         BigDecType that = (BigDecType) other;
-        return Objects.equals(obj, that.obj);
+        return obj.equals(that.obj);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj.hashCode();
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/BigIntType.java b/src/main/java/com/ultreon/data/types/BigIntType.java
@@ -6,7 +6,6 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.Objects;
 
 public class BigIntType implements IType<BigInteger> {
     private BigInteger obj;
@@ -55,12 +54,12 @@ public boolean equals(Object other) {
         if (this == other) return true;
         if (!(other instanceof BigIntType)) return false;
         BigIntType that = (BigIntType) other;
-        return Objects.equals(obj, that.obj);
+        return obj.equals(that.obj);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj.hashCode();
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/BitSetType.java b/src/main/java/com/ultreon/data/types/BitSetType.java
@@ -47,7 +47,7 @@ public void write(DataOutputStream stream) throws IOException {
     public static BitSetType read(DataInputStream stream) throws IOException {
         int len = stream.readUnsignedShort();
         byte[] arr = new byte[len];
-        for (int  i = 0; i < len; i++) {
+        for (int i = 0; i < len; i++) {
             arr[i] = stream.readByte();
         }
         return new BitSetType(arr);
@@ -63,7 +63,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj.hashCode();
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/BooleanType.java b/src/main/java/com/ultreon/data/types/BooleanType.java
@@ -5,7 +5,6 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Objects;
 
 public class BooleanType implements IType<Boolean> {
     private boolean obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj ? 1231 : 1237;
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/ByteArrayType.java b/src/main/java/com/ultreon/data/types/ByteArrayType.java
@@ -2,9 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 
 public class ByteArrayType implements IType<byte[]> {
@@ -41,7 +41,7 @@ public void write(DataOutputStream stream) throws IOException {
     public static ByteArrayType read(DataInputStream stream) throws IOException {
         int len = stream.readInt();
         byte[] arr = new byte[len];
-        for (int  i = 0; i < len; i++) {
+        for (int i = 0; i < len; i++) {
             arr[i] = stream.readByte();
         }
         return new ByteArrayType(arr);

diff --git a/src/main/java/com/ultreon/data/types/ByteType.java b/src/main/java/com/ultreon/data/types/ByteType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class ByteType implements IType<Byte> {
     private byte obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj;
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/CharType.java b/src/main/java/com/ultreon/data/types/CharType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class CharType implements IType<Character> {
     private char obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj;
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/DoubleArrayType.java b/src/main/java/com/ultreon/data/types/DoubleArrayType.java
@@ -2,9 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 
 public class DoubleArrayType implements IType<double[]> {

diff --git a/src/main/java/com/ultreon/data/types/DoubleType.java b/src/main/java/com/ultreon/data/types/DoubleType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class DoubleType implements IType<Double> {
     private double obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return Double.hashCode(obj);
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/FloatArrayType.java b/src/main/java/com/ultreon/data/types/FloatArrayType.java
@@ -2,9 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 
 public class FloatArrayType implements IType<float[]> {

diff --git a/src/main/java/com/ultreon/data/types/FloatType.java b/src/main/java/com/ultreon/data/types/FloatType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class FloatType implements IType<Float> {
     private float obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return Float.hashCode(obj);
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/IType.java b/src/main/java/com/ultreon/data/types/IType.java
@@ -1,12 +1,15 @@
 package com.ultreon.data.types;
 
-import java.io.IOException;
 import java.io.DataOutputStream;
+import java.io.IOException;
 
 public interface IType<T> {
     T getValue();
+
     void setValue(T obj);
+
     int id();
+
     void write(DataOutputStream stream) throws IOException;
 
     boolean equals(Object other);

diff --git a/src/main/java/com/ultreon/data/types/IntArrayType.java b/src/main/java/com/ultreon/data/types/IntArrayType.java
@@ -2,9 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 
 public class IntArrayType implements IType<int[]> {

diff --git a/src/main/java/com/ultreon/data/types/IntType.java b/src/main/java/com/ultreon/data/types/IntType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class IntType implements IType<Integer> {
     private int obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return obj;
     }
 
     @Override

diff --git a/src/main/java/com/ultreon/data/types/ListType.java b/src/main/java/com/ultreon/data/types/ListType.java
@@ -92,7 +92,7 @@ public static ListType<?> read(DataInputStream stream) throws IOException {
         for (int i = 0; i < len; i++) {
             list.add(TypeRegistry.read(id, stream));
         }
-        
+
         return new ListType<>(list, id);
     }
 
@@ -162,7 +162,7 @@ public int hashCode() {
     @Override
     @SuppressWarnings("unchecked")
     public ListType<T> copy() {
-        return new ListType<T>(obj.stream().map(t -> (T) t.copy()).collect(Collectors.toList()));
+        return new ListType<>(obj.stream().map(t -> (T) t.copy()).collect(Collectors.toList()));
     }
 
     public int size() {

diff --git a/src/main/java/com/ultreon/data/types/LongArrayType.java b/src/main/java/com/ultreon/data/types/LongArrayType.java
@@ -2,11 +2,10 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
-import java.util.stream.Collectors;
 
 public class LongArrayType implements IType<long[]> {
     private long[] obj;

diff --git a/src/main/java/com/ultreon/data/types/LongType.java b/src/main/java/com/ultreon/data/types/LongType.java
@@ -2,10 +2,9 @@
 
 import com.ultreon.data.Types;
 
-import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Objects;
+import java.io.IOException;
 
 public class LongType implements IType<Long> {
     private long obj;
@@ -49,7 +48,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(obj);
+        return (int) (obj ^ obj >>> 32);
     }
 
     @Override