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)
{
if (! (obj instanceof AddressAttribute)
|| obj == null)
if (! (obj instanceof AddressAttribute))
return false;
if (obj == this)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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;
}

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

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

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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;

View File

@ -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)

View File

@ -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)