Merge pull request #69 from champtar/nullequals

Remove unneeded null checks & fix MagicCookieAttribute equals
This commit is contained in:
Ingo Bauersachs 2016-04-20 22:15:05 +02:00
commit de1260610d
25 changed files with 25 additions and 47 deletions

View File

@ -161,8 +161,7 @@ abstract class AddressAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof AddressAttribute) if (! (obj instanceof AddressAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -100,8 +100,7 @@ public class ChangeRequestAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof ChangeRequestAttribute) if (! (obj instanceof ChangeRequestAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -60,8 +60,7 @@ public class ChannelNumberAttribute extends Attribute
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof ChannelNumberAttribute) if (! (obj instanceof ChannelNumberAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -170,8 +170,7 @@ public class DataAttribute
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof DataAttribute) if (! (obj instanceof DataAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -54,11 +54,8 @@ public class DontFragmentAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof DontFragmentAttribute) if (! (obj instanceof DontFragmentAttribute))
|| obj == null)
{
return false; return false;
}
return true; return true;
} }

View File

@ -488,8 +488,7 @@ public class ErrorCodeAttribute extends Attribute
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof ErrorCodeAttribute) if (! (obj instanceof ErrorCodeAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -62,8 +62,7 @@ public class EvenPortAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof EvenPortAttribute) if (! (obj instanceof EvenPortAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -122,7 +122,7 @@ public class FingerprintAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof FingerprintAttribute) || obj == null) if (! (obj instanceof FingerprintAttribute))
return false; return false;
if (obj == this) if (obj == this)

View File

@ -125,8 +125,7 @@ public abstract class IceControlAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if(!(obj instanceof IceControlAttribute) if(!(obj instanceof IceControlAttribute))
|| obj == null)
return false; return false;
if(obj == this) if(obj == this)

View File

@ -61,8 +61,7 @@ public class LifetimeAttribute
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof LifetimeAttribute) if (! (obj instanceof LifetimeAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -83,8 +83,7 @@ public class MagicCookieAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof LifetimeAttribute) if (! (obj instanceof MagicCookieAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -336,7 +336,7 @@ public class MessageIntegrityAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof MessageIntegrityAttribute) || obj == null) if (! (obj instanceof MessageIntegrityAttribute))
return false; return false;
if (obj == this) if (obj == this)

View File

@ -134,8 +134,7 @@ public class OptionalAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if(obj == null if(! (obj instanceof OptionalAttribute) )
|| !(obj instanceof OptionalAttribute) )
return false; return false;
return return

View File

@ -118,8 +118,7 @@ public class PriorityAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof PriorityAttribute) if (! (obj instanceof PriorityAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -141,7 +141,7 @@ public class RealmAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof RealmAttribute) || obj == null) if (! (obj instanceof RealmAttribute))
return false; return false;
if (obj == this) if (obj == this)

View File

@ -70,8 +70,7 @@ public class RequestedTransportAttribute extends Attribute
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof RequestedTransportAttribute) if (! (obj instanceof RequestedTransportAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -216,8 +216,7 @@ public class ReservationTokenAttribute
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof ReservationTokenAttribute) if (! (obj instanceof ReservationTokenAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -151,8 +151,7 @@ public class SoftwareAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof SoftwareAttribute) if (! (obj instanceof SoftwareAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -191,8 +191,7 @@ public class UnknownAttributesAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof UnknownAttributesAttribute) if (! (obj instanceof UnknownAttributesAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -89,8 +89,7 @@ public class UseCandidateAttribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if(!(obj instanceof UseCandidateAttribute) if(!(obj instanceof UseCandidateAttribute))
|| obj == null)
return false; return false;
if(obj == this) if(obj == this)

View File

@ -147,7 +147,7 @@ public class UsernameAttribute extends Attribute
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof UsernameAttribute) || obj == null) if (! (obj instanceof UsernameAttribute))
return false; return false;
if (obj == this) if (obj == this)

View File

@ -111,8 +111,7 @@ public class XorOnlyAttribute
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if (! (obj instanceof XorOnlyAttribute) if (! (obj instanceof XorOnlyAttribute))
|| obj == null)
return false; return false;
if (obj == this) if (obj == this)

View File

@ -443,7 +443,7 @@ public class CandidatePair
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if ((obj == null) || !(obj instanceof CandidatePair)) if (! (obj instanceof CandidatePair))
return false; return false;
CandidatePair candidatePair = (CandidatePair) obj; CandidatePair candidatePair = (CandidatePair) obj;

View File

@ -867,8 +867,7 @@ public abstract class Message
@Override @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if(!(obj instanceof Message) if(!(obj instanceof Message))
|| obj == null)
return false; return false;
if(obj == this) if(obj == this)

View File

@ -129,8 +129,7 @@ public class StunDiscoveryReport
*/ */
public boolean equals(Object obj) public boolean equals(Object obj)
{ {
if(obj == null if(! (obj instanceof StunDiscoveryReport))
|| !(obj instanceof StunDiscoveryReport))
return false; return false;
if(obj == this) if(obj == this)