Remove Objects.{is,non}Null abuse

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / match / SctpDestinationPortEntryDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializer.java
index 2b7dfbaf279a80f57813609d1eebe2edd9d6cfb1..76b2d9bfb81c08747e37ca949db6f1a53d96c0a5 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializer.java
@@ -5,11 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-import java.util.Objects;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.SctpMatch;
@@ -22,18 +20,17 @@ public class SctpDestinationPortEntryDeserializer extends AbstractMatchEntryDese
         processHeader(message);
         final int port = message.readUnsignedShort();
 
-        if (Objects.isNull(builder.getLayer4Match())) {
+        if (builder.getLayer4Match() == null) {
             builder.setLayer4Match(new SctpMatchBuilder()
                     .setSctpDestinationPort(new PortNumber(port))
                     .build());
-        } else if (SctpMatch.class.isInstance(builder.getLayer4Match())
-            && Objects.isNull(SctpMatch.class.cast(builder.getLayer4Match()).getSctpDestinationPort())) {
-            builder.setLayer4Match(new SctpMatchBuilder(SctpMatch.class.cast(builder.getLayer4Match()))
+        } else if (builder.getLayer4Match() instanceof SctpMatch
+            && ((SctpMatch) builder.getLayer4Match()).getSctpDestinationPort() == null) {
+            builder.setLayer4Match(new SctpMatchBuilder((SctpMatch) builder.getLayer4Match())
                     .setSctpDestinationPort(new PortNumber(port))
                     .build());
         } else {
             throwErrorOnMalformed(builder, "layer4Match", "sctpDestinationPort");
         }
     }
-
 }