From af8c32ecd7ebdac504aaa490584865e5c00e6491 Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Tue, 19 Apr 2016 09:31:11 +0200 Subject: [PATCH 1/2] Fix MagicCookieAttribute equals this looks like a copy/paste error Signed-off-by: Etienne CHAMPETIER --- src/main/java/org/ice4j/attribute/MagicCookieAttribute.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/ice4j/attribute/MagicCookieAttribute.java b/src/main/java/org/ice4j/attribute/MagicCookieAttribute.java index 31d324f..2062bc6 100644 --- a/src/main/java/org/ice4j/attribute/MagicCookieAttribute.java +++ b/src/main/java/org/ice4j/attribute/MagicCookieAttribute.java @@ -83,8 +83,7 @@ public class MagicCookieAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof LifetimeAttribute) - || obj == null) + if (! (obj instanceof MagicCookieAttribute)) return false; if (obj == this) From 9155707329a73f454e22da3322f0b31eff668378 Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Tue, 19 Apr 2016 10:36:29 +0200 Subject: [PATCH 2/2] Remove unneeded null checks in equals instanceof already check for null Signed-off-by: Etienne CHAMPETIER --- src/main/java/org/ice4j/attribute/AddressAttribute.java | 3 +-- .../java/org/ice4j/attribute/ChangeRequestAttribute.java | 3 +-- .../java/org/ice4j/attribute/ChannelNumberAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/DataAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/DontFragmentAttribute.java | 5 +---- src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/EvenPortAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/FingerprintAttribute.java | 2 +- src/main/java/org/ice4j/attribute/IceControlAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/LifetimeAttribute.java | 3 +-- .../java/org/ice4j/attribute/MessageIntegrityAttribute.java | 2 +- src/main/java/org/ice4j/attribute/OptionalAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/PriorityAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/RealmAttribute.java | 2 +- .../org/ice4j/attribute/RequestedTransportAttribute.java | 3 +-- .../java/org/ice4j/attribute/ReservationTokenAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/SoftwareAttribute.java | 3 +-- .../java/org/ice4j/attribute/UnknownAttributesAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/UseCandidateAttribute.java | 3 +-- src/main/java/org/ice4j/attribute/UsernameAttribute.java | 2 +- src/main/java/org/ice4j/attribute/XorOnlyAttribute.java | 3 +-- src/main/java/org/ice4j/ice/CandidatePair.java | 2 +- src/main/java/org/ice4j/message/Message.java | 3 +-- src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java | 3 +-- 24 files changed, 24 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/ice4j/attribute/AddressAttribute.java b/src/main/java/org/ice4j/attribute/AddressAttribute.java index 226f2a5..827fe8f 100644 --- a/src/main/java/org/ice4j/attribute/AddressAttribute.java +++ b/src/main/java/org/ice4j/attribute/AddressAttribute.java @@ -161,8 +161,7 @@ abstract class AddressAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof AddressAttribute) - || obj == null) + if (! (obj instanceof AddressAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java b/src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java index 7445646..4d4c999 100644 --- a/src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java +++ b/src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java @@ -100,8 +100,7 @@ public class ChangeRequestAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof ChangeRequestAttribute) - || obj == null) + if (! (obj instanceof ChangeRequestAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java b/src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java index 7306854..f62e7e3 100644 --- a/src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java +++ b/src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java @@ -60,8 +60,7 @@ public class ChannelNumberAttribute extends Attribute @Override public boolean equals(Object obj) { - if (! (obj instanceof ChannelNumberAttribute) - || obj == null) + if (! (obj instanceof ChannelNumberAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/DataAttribute.java b/src/main/java/org/ice4j/attribute/DataAttribute.java index db96228..fd70c44 100644 --- a/src/main/java/org/ice4j/attribute/DataAttribute.java +++ b/src/main/java/org/ice4j/attribute/DataAttribute.java @@ -170,8 +170,7 @@ public class DataAttribute public boolean equals(Object obj) { - if (! (obj instanceof DataAttribute) - || obj == null) + if (! (obj instanceof DataAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/DontFragmentAttribute.java b/src/main/java/org/ice4j/attribute/DontFragmentAttribute.java index bf62fa0..3f116fa 100644 --- a/src/main/java/org/ice4j/attribute/DontFragmentAttribute.java +++ b/src/main/java/org/ice4j/attribute/DontFragmentAttribute.java @@ -54,11 +54,8 @@ public class DontFragmentAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof DontFragmentAttribute) - || obj == null) - { + if (! (obj instanceof DontFragmentAttribute)) return false; - } return true; } diff --git a/src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java b/src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java index 3a55ff4..993168c 100644 --- a/src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java +++ b/src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java @@ -488,8 +488,7 @@ public class ErrorCodeAttribute extends Attribute @Override public boolean equals(Object obj) { - if (! (obj instanceof ErrorCodeAttribute) - || obj == null) + if (! (obj instanceof ErrorCodeAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/EvenPortAttribute.java b/src/main/java/org/ice4j/attribute/EvenPortAttribute.java index 02e903e..0d1f391 100644 --- a/src/main/java/org/ice4j/attribute/EvenPortAttribute.java +++ b/src/main/java/org/ice4j/attribute/EvenPortAttribute.java @@ -62,8 +62,7 @@ public class EvenPortAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof EvenPortAttribute) - || obj == null) + if (! (obj instanceof EvenPortAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/FingerprintAttribute.java b/src/main/java/org/ice4j/attribute/FingerprintAttribute.java index 41dcba4..a658b78 100644 --- a/src/main/java/org/ice4j/attribute/FingerprintAttribute.java +++ b/src/main/java/org/ice4j/attribute/FingerprintAttribute.java @@ -122,7 +122,7 @@ public class FingerprintAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof FingerprintAttribute) || obj == null) + if (! (obj instanceof FingerprintAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/IceControlAttribute.java b/src/main/java/org/ice4j/attribute/IceControlAttribute.java index 6a96b79..50483e8 100644 --- a/src/main/java/org/ice4j/attribute/IceControlAttribute.java +++ b/src/main/java/org/ice4j/attribute/IceControlAttribute.java @@ -125,8 +125,7 @@ public abstract class IceControlAttribute */ public boolean equals(Object obj) { - if(!(obj instanceof IceControlAttribute) - || obj == null) + if(!(obj instanceof IceControlAttribute)) return false; if(obj == this) diff --git a/src/main/java/org/ice4j/attribute/LifetimeAttribute.java b/src/main/java/org/ice4j/attribute/LifetimeAttribute.java index c797abe..9e5ca3a 100644 --- a/src/main/java/org/ice4j/attribute/LifetimeAttribute.java +++ b/src/main/java/org/ice4j/attribute/LifetimeAttribute.java @@ -61,8 +61,7 @@ public class LifetimeAttribute @Override public boolean equals(Object obj) { - if (! (obj instanceof LifetimeAttribute) - || obj == null) + if (! (obj instanceof LifetimeAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java b/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java index 0b81815..349f1a1 100644 --- a/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java +++ b/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java @@ -335,7 +335,7 @@ public class MessageIntegrityAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof MessageIntegrityAttribute) || obj == null) + if (! (obj instanceof MessageIntegrityAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/OptionalAttribute.java b/src/main/java/org/ice4j/attribute/OptionalAttribute.java index cc7a862..1ec84ed 100644 --- a/src/main/java/org/ice4j/attribute/OptionalAttribute.java +++ b/src/main/java/org/ice4j/attribute/OptionalAttribute.java @@ -134,8 +134,7 @@ public class OptionalAttribute */ public boolean equals(Object obj) { - if(obj == null - || !(obj instanceof OptionalAttribute) ) + if(! (obj instanceof OptionalAttribute) ) return false; return diff --git a/src/main/java/org/ice4j/attribute/PriorityAttribute.java b/src/main/java/org/ice4j/attribute/PriorityAttribute.java index 05afd2e..8ef9c4f 100644 --- a/src/main/java/org/ice4j/attribute/PriorityAttribute.java +++ b/src/main/java/org/ice4j/attribute/PriorityAttribute.java @@ -118,8 +118,7 @@ public class PriorityAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof PriorityAttribute) - || obj == null) + if (! (obj instanceof PriorityAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/RealmAttribute.java b/src/main/java/org/ice4j/attribute/RealmAttribute.java index b3a2ea6..d1c5b83 100644 --- a/src/main/java/org/ice4j/attribute/RealmAttribute.java +++ b/src/main/java/org/ice4j/attribute/RealmAttribute.java @@ -141,7 +141,7 @@ public class RealmAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof RealmAttribute) || obj == null) + if (! (obj instanceof RealmAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java b/src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java index da0ef8b..4ded03e 100644 --- a/src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java +++ b/src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java @@ -70,8 +70,7 @@ public class RequestedTransportAttribute extends Attribute @Override public boolean equals(Object obj) { - if (! (obj instanceof RequestedTransportAttribute) - || obj == null) + if (! (obj instanceof RequestedTransportAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java b/src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java index 039da40..fed327c 100644 --- a/src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java +++ b/src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java @@ -216,8 +216,7 @@ public class ReservationTokenAttribute @Override public boolean equals(Object obj) { - if (! (obj instanceof ReservationTokenAttribute) - || obj == null) + if (! (obj instanceof ReservationTokenAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/SoftwareAttribute.java b/src/main/java/org/ice4j/attribute/SoftwareAttribute.java index 1d966bd..12a2d43 100644 --- a/src/main/java/org/ice4j/attribute/SoftwareAttribute.java +++ b/src/main/java/org/ice4j/attribute/SoftwareAttribute.java @@ -151,8 +151,7 @@ public class SoftwareAttribute */ public boolean equals(Object obj) { - if (! (obj instanceof SoftwareAttribute) - || obj == null) + if (! (obj instanceof SoftwareAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java b/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java index dc2a647..bfaa86e 100644 --- a/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java +++ b/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java @@ -191,8 +191,7 @@ public class UnknownAttributesAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof UnknownAttributesAttribute) - || obj == null) + if (! (obj instanceof UnknownAttributesAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/UseCandidateAttribute.java b/src/main/java/org/ice4j/attribute/UseCandidateAttribute.java index 73e6e1a..a56eb8e 100644 --- a/src/main/java/org/ice4j/attribute/UseCandidateAttribute.java +++ b/src/main/java/org/ice4j/attribute/UseCandidateAttribute.java @@ -89,8 +89,7 @@ public class UseCandidateAttribute */ public boolean equals(Object obj) { - if(!(obj instanceof UseCandidateAttribute) - || obj == null) + if(!(obj instanceof UseCandidateAttribute)) return false; if(obj == this) diff --git a/src/main/java/org/ice4j/attribute/UsernameAttribute.java b/src/main/java/org/ice4j/attribute/UsernameAttribute.java index a5aafa2..5bdaefe 100644 --- a/src/main/java/org/ice4j/attribute/UsernameAttribute.java +++ b/src/main/java/org/ice4j/attribute/UsernameAttribute.java @@ -147,7 +147,7 @@ public class UsernameAttribute extends Attribute */ public boolean equals(Object obj) { - if (! (obj instanceof UsernameAttribute) || obj == null) + if (! (obj instanceof UsernameAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/attribute/XorOnlyAttribute.java b/src/main/java/org/ice4j/attribute/XorOnlyAttribute.java index eda54e3..e98ce5b 100644 --- a/src/main/java/org/ice4j/attribute/XorOnlyAttribute.java +++ b/src/main/java/org/ice4j/attribute/XorOnlyAttribute.java @@ -111,8 +111,7 @@ public class XorOnlyAttribute public boolean equals(Object obj) { - if (! (obj instanceof XorOnlyAttribute) - || obj == null) + if (! (obj instanceof XorOnlyAttribute)) return false; if (obj == this) diff --git a/src/main/java/org/ice4j/ice/CandidatePair.java b/src/main/java/org/ice4j/ice/CandidatePair.java index 265ae06..336c592 100644 --- a/src/main/java/org/ice4j/ice/CandidatePair.java +++ b/src/main/java/org/ice4j/ice/CandidatePair.java @@ -443,7 +443,7 @@ public class CandidatePair @Override public boolean equals(Object obj) { - if ((obj == null) || !(obj instanceof CandidatePair)) + if (! (obj instanceof CandidatePair)) return false; CandidatePair candidatePair = (CandidatePair) obj; diff --git a/src/main/java/org/ice4j/message/Message.java b/src/main/java/org/ice4j/message/Message.java index bb1fba7..ca9e78b 100644 --- a/src/main/java/org/ice4j/message/Message.java +++ b/src/main/java/org/ice4j/message/Message.java @@ -867,8 +867,7 @@ public abstract class Message @Override public boolean equals(Object obj) { - if(!(obj instanceof Message) - || obj == null) + if(!(obj instanceof Message)) return false; if(obj == this) diff --git a/src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java b/src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java index b7f2e87..a71fc9c 100644 --- a/src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java +++ b/src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java @@ -129,8 +129,7 @@ public class StunDiscoveryReport */ public boolean equals(Object obj) { - if(obj == null - || !(obj instanceof StunDiscoveryReport)) + if(! (obj instanceof StunDiscoveryReport)) return false; if(obj == this)