Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/main/java/in/dragonbra/javasteam/types/GameID.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package in.dragonbra.javasteam.types;

import java.util.Objects;
import in.dragonbra.javasteam.util.compat.ObjectsCompat;

/**
* This 64bit structure represents an app, mod, shortcut, or p2p file on the Steam network.
Expand Down Expand Up @@ -178,7 +178,7 @@ public boolean equals(Object obj) {
return false;
}

return Objects.equals(gameId.getData(), ((GameID) obj).gameId.getData());
return ObjectsCompat.equals(gameId.getData(), ((GameID) obj).gameId.getData());
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/in/dragonbra/javasteam/types/GlobalID.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package in.dragonbra.javasteam.types;

import in.dragonbra.javasteam.util.compat.ObjectsCompat;

import java.util.Date;
import java.util.Objects;

/**
* Represents a globally unique identifier within the Steam network.
Expand Down Expand Up @@ -134,7 +135,7 @@ public boolean equals(Object obj) {
return false;
}

return Objects.equals(gidBits.getData(), ((GlobalID) obj).gidBits.getData());
return ObjectsCompat.equals(gidBits.getData(), ((GlobalID) obj).gidBits.getData());
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/in/dragonbra/javasteam/types/SteamID.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import in.dragonbra.javasteam.enums.EUniverse;
import in.dragonbra.javasteam.util.CollectionUtils;
import in.dragonbra.javasteam.util.Strings;
import in.dragonbra.javasteam.util.compat.ObjectsCompat;

import java.util.*;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -554,7 +555,7 @@ public boolean equals(Object obj) {

SteamID sid = (SteamID) obj;

return Objects.equals(steamID.getData(), sid.steamID.getData());
return ObjectsCompat.equals(steamID.getData(), sid.steamID.getData());
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package in.dragonbra.javasteam.util;

import in.dragonbra.javasteam.util.compat.ObjectsCompat;

import java.util.Map;
import java.util.Objects;

/**
* @author lngtr
Expand All @@ -10,7 +11,7 @@
public class CollectionUtils {
public static <T, E> T getKeyByValue(Map<T, E> map, E value) {
for (Map.Entry<T, E> entry : map.entrySet()) {
if (Objects.equals(value, entry.getValue())) {
if (ObjectsCompat.equals(value, entry.getValue())) {
return entry.getKey();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package in.dragonbra.javasteam.util.compat;

/**
* @author steev
* @since 2018-03-21
*/
public class ObjectsCompat {
public static boolean equals(Object a, Object b) {
return (a == b) || (a != null && a.equals(b));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package in.dragonbra.javasteam.util.compat;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.Test;

import in.dragonbra.javasteam.TestBase;

public class ObjectsCompatTest extends TestBase {

@Test
public void testEquals() throws Exception {
final String a = "aaa";
final String b = "bbb";
final String c = null;

assertFalse(ObjectsCompat.equals(a, b));
assertFalse(ObjectsCompat.equals(a, c));
assertFalse(ObjectsCompat.equals(c, a));

assertTrue(ObjectsCompat.equals(a, a));
assertTrue(ObjectsCompat.equals(b, b));
assertTrue(ObjectsCompat.equals(c, c));
}

}