From d1c72901da8e180fc10ef8279b5da9c19c9374e8 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Fri, 27 Jan 2017 18:32:32 +0100
Subject: [PATCH] mdsalutil-api clean up Checkstyle violations (not enforced
 yet)

org.opendaylight.genius.mdsalutil.matches package is CS clean now.

Change-Id: Iea28d160dc90696a676a529630d51b7da95d6091
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---
 .../genius/mdsalutil/matches/MatchArpOp.java  | 16 +++++++++----
 .../genius/mdsalutil/matches/MatchArpSha.java | 18 +++++++++-----
 .../genius/mdsalutil/matches/MatchArpSpa.java | 16 +++++++++----
 .../genius/mdsalutil/matches/MatchArpTha.java | 18 +++++++++-----
 .../genius/mdsalutil/matches/MatchArpTpa.java | 16 +++++++++----
 .../matches/MatchEthernetDestination.java     | 20 +++++++++++-----
 .../matches/MatchEthernetSource.java          | 20 +++++++++++-----
 .../mdsalutil/matches/MatchEthernetType.java  | 18 +++++++++-----
 .../genius/mdsalutil/matches/MatchIcmpv4.java | 24 ++++++++++++-------
 .../genius/mdsalutil/matches/MatchIcmpv6.java | 24 ++++++++++++-------
 .../genius/mdsalutil/matches/MatchInPort.java | 22 +++++++++++------
 .../mdsalutil/matches/MatchIpProtocol.java    | 18 +++++++++-----
 .../matches/MatchIpv4Destination.java         | 16 +++++++++----
 .../mdsalutil/matches/MatchIpv4Source.java    | 16 +++++++++----
 .../matches/MatchIpv6Destination.java         | 16 +++++++++----
 .../mdsalutil/matches/MatchIpv6NdTarget.java  | 18 +++++++++-----
 .../mdsalutil/matches/MatchIpv6Source.java    | 16 +++++++++----
 .../mdsalutil/matches/MatchMetadata.java      | 20 +++++++++++-----
 .../mdsalutil/matches/MatchMplsLabel.java     | 20 ++++++++++------
 .../mdsalutil/matches/MatchPbbIsid.java       | 20 ++++++++++------
 .../matches/MatchTcpDestinationPort.java      | 18 +++++++++-----
 .../mdsalutil/matches/MatchTcpFlags.java      | 16 +++++++++----
 .../mdsalutil/matches/MatchTcpSourcePort.java | 18 +++++++++-----
 .../mdsalutil/matches/MatchTunnelId.java      | 20 +++++++++++-----
 .../matches/MatchUdpDestinationPort.java      | 18 +++++++++-----
 .../mdsalutil/matches/MatchUdpSourcePort.java | 18 +++++++++-----
 .../mdsalutil/matches/MatchVlanVid.java       | 16 +++++++++----
 27 files changed, 336 insertions(+), 160 deletions(-)

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpOp.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpOp.java
index 172434b7e..737ba3d60 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpOp.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpOp.java
@@ -40,12 +40,18 @@ public class MatchArpOp extends MatchInfoHelper<ArpMatch, ArpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchArpOp that = (MatchArpOp) o;
+        MatchArpOp that = (MatchArpOp) other;
 
         return op == that.op;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSha.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSha.java
index c5c3f21e2..af83e876a 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSha.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSha.java
@@ -38,12 +38,18 @@ public class MatchArpSha extends MatchInfoHelper<ArpMatch, ArpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchArpSha that = (MatchArpSha) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchArpSha that = (MatchArpSha) other;
 
         return address != null ? address.equals(that.address) : that.address == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSpa.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSpa.java
index 5011a4885..c3d4130e9 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSpa.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpSpa.java
@@ -46,12 +46,18 @@ public class MatchArpSpa extends MatchInfoHelper<ArpMatch, ArpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchArpSpa that = (MatchArpSpa) o;
+        MatchArpSpa that = (MatchArpSpa) other;
 
         return address != null ? address.equals(that.address) : that.address == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTha.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTha.java
index 82088723c..e9dfe9e34 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTha.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTha.java
@@ -38,12 +38,18 @@ public class MatchArpTha extends MatchInfoHelper<ArpMatch, ArpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchArpTha that = (MatchArpTha) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchArpTha that = (MatchArpTha) other;
 
         return address != null ? address.equals(that.address) : that.address == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTpa.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTpa.java
index d98edd202..5b7a026ff 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTpa.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchArpTpa.java
@@ -46,12 +46,18 @@ public class MatchArpTpa extends MatchInfoHelper<ArpMatch, ArpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchArpTpa that = (MatchArpTpa) o;
+        MatchArpTpa that = (MatchArpTpa) other;
 
         return address != null ? address.equals(that.address) : that.address == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetDestination.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetDestination.java
index 2d208b836..a3efe8bfa 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetDestination.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetDestination.java
@@ -52,14 +52,22 @@ public class MatchEthernetDestination extends MatchInfoHelper<EthernetMatch, Eth
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchEthernetDestination that = (MatchEthernetDestination) o;
+        MatchEthernetDestination that = (MatchEthernetDestination) other;
 
-        if (address != null ? !address.equals(that.address) : that.address != null) return false;
+        if (address != null ? !address.equals(that.address) : that.address != null) {
+            return false;
+        }
         return mask != null ? mask.equals(that.mask) : that.mask == null;
     }
 
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetSource.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetSource.java
index f53ffccde..68a93a2b8 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetSource.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetSource.java
@@ -52,14 +52,22 @@ public class MatchEthernetSource extends MatchInfoHelper<EthernetMatch, Ethernet
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchEthernetSource that = (MatchEthernetSource) o;
+        MatchEthernetSource that = (MatchEthernetSource) other;
 
-        if (address != null ? !address.equals(that.address) : that.address != null) return false;
+        if (address != null ? !address.equals(that.address) : that.address != null) {
+            return false;
+        }
         return mask != null ? mask.equals(that.mask) : that.mask == null;
     }
 
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetType.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetType.java
index 2d7225183..8b0851761 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetType.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchEthernetType.java
@@ -45,12 +45,18 @@ public class MatchEthernetType extends MatchInfoHelper<EthernetMatch, EthernetMa
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchEthernetType that = (MatchEthernetType) o;
+        MatchEthernetType that = (MatchEthernetType) other;
 
         return type == that.type;
     }
@@ -58,7 +64,7 @@ public class MatchEthernetType extends MatchInfoHelper<EthernetMatch, EthernetMa
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) (type ^ (type >>> 32));
+        result = 31 * result + (int) (type ^ type >>> 32);
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv4.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv4.java
index 86b0ffc62..101a6fbbd 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv4.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv4.java
@@ -42,22 +42,30 @@ public class MatchIcmpv4 extends MatchInfoHelper<Icmpv4Match, Icmpv4MatchBuilder
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIcmpv4 that = (MatchIcmpv4) o;
+        MatchIcmpv4 that = (MatchIcmpv4) other;
 
-        if (type != that.type) return false;
+        if (type != that.type) {
+            return false;
+        }
         return code == that.code;
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) type;
-        result = 31 * result + (int) code;
+        result = 31 * result + type;
+        result = 31 * result + code;
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv6.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv6.java
index 9a7e8e043..687c9d97a 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv6.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIcmpv6.java
@@ -42,22 +42,30 @@ public class MatchIcmpv6 extends MatchInfoHelper<Icmpv6Match, Icmpv6MatchBuilder
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIcmpv6 that = (MatchIcmpv6) o;
+        MatchIcmpv6 that = (MatchIcmpv6) other;
 
-        if (type != that.type) return false;
+        if (type != that.type) {
+            return false;
+        }
         return code == that.code;
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) type;
-        result = 31 * result + (int) code;
+        result = 31 * result + type;
+        result = 31 * result + code;
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInPort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInPort.java
index bf22e8d6d..5c130e977 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInPort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchInPort.java
@@ -46,14 +46,22 @@ public class MatchInPort extends MatchInfo {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchInPort that = (MatchInPort) o;
+        MatchInPort that = (MatchInPort) other;
 
-        if (portNumber != that.portNumber) return false;
+        if (portNumber != that.portNumber) {
+            return false;
+        }
         return dpId != null ? dpId.equals(that.dpId) : that.dpId == null;
     }
 
@@ -61,7 +69,7 @@ public class MatchInPort extends MatchInfo {
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + (dpId != null ? dpId.hashCode() : 0);
-        result = 31 * result + (int) (portNumber ^ (portNumber >>> 32));
+        result = 31 * result + (int) (portNumber ^ portNumber >>> 32);
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpProtocol.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpProtocol.java
index 2ada1b03b..80adf2ed1 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpProtocol.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpProtocol.java
@@ -42,12 +42,18 @@ public class MatchIpProtocol extends MatchInfoHelper<IpMatch, IpMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIpProtocol that = (MatchIpProtocol) o;
+        MatchIpProtocol that = (MatchIpProtocol) other;
 
         return protocol == that.protocol;
     }
@@ -55,7 +61,7 @@ public class MatchIpProtocol extends MatchInfoHelper<IpMatch, IpMatchBuilder> {
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) protocol;
+        result = 31 * result + protocol;
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Destination.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Destination.java
index 789409203..1e2a7fdab 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Destination.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Destination.java
@@ -46,12 +46,18 @@ public class MatchIpv4Destination extends MatchInfoHelper<Ipv4Match, Ipv4MatchBu
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIpv4Destination that = (MatchIpv4Destination) o;
+        MatchIpv4Destination that = (MatchIpv4Destination) other;
 
         return prefix != null ? prefix.equals(that.prefix) : that.prefix == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Source.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Source.java
index 0c884c1d6..ab411a89c 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Source.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv4Source.java
@@ -46,12 +46,18 @@ public class MatchIpv4Source extends MatchInfoHelper<Ipv4Match, Ipv4MatchBuilder
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIpv4Source that = (MatchIpv4Source) o;
+        MatchIpv4Source that = (MatchIpv4Source) other;
 
         return prefix != null ? prefix.equals(that.prefix) : that.prefix == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Destination.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Destination.java
index 2977177a5..cc7093ce0 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Destination.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Destination.java
@@ -41,12 +41,18 @@ public class MatchIpv6Destination extends MatchInfoHelper<Ipv6Match, Ipv6MatchBu
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIpv6Destination that = (MatchIpv6Destination) o;
+        MatchIpv6Destination that = (MatchIpv6Destination) other;
 
         return prefix != null ? prefix.equals(that.prefix) : that.prefix == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6NdTarget.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6NdTarget.java
index ccaa88b5f..ac4352119 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6NdTarget.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6NdTarget.java
@@ -37,12 +37,18 @@ public class MatchIpv6NdTarget extends MatchInfoHelper<Ipv6Match, Ipv6MatchBuild
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchIpv6NdTarget that = (MatchIpv6NdTarget) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchIpv6NdTarget that = (MatchIpv6NdTarget) other;
 
         return address != null ? address.equals(that.address) : that.address == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Source.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Source.java
index 47bd918d3..2a12960e3 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Source.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchIpv6Source.java
@@ -41,12 +41,18 @@ public class MatchIpv6Source extends MatchInfoHelper<Ipv6Match, Ipv6MatchBuilder
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchIpv6Source that = (MatchIpv6Source) o;
+        MatchIpv6Source that = (MatchIpv6Source) other;
 
         return prefix != null ? prefix.equals(that.prefix) : that.prefix == null;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMetadata.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMetadata.java
index 9bccb6ba9..d186e293a 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMetadata.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMetadata.java
@@ -43,14 +43,22 @@ public class MatchMetadata extends MatchInfoHelper<Metadata, MetadataBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchMetadata that = (MatchMetadata) o;
+        MatchMetadata that = (MatchMetadata) other;
 
-        if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) return false;
+        if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) {
+            return false;
+        }
         return mask != null ? mask.equals(that.mask) : that.mask == null;
     }
 
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMplsLabel.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMplsLabel.java
index 1d8cf877f..3057a0e87 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMplsLabel.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchMplsLabel.java
@@ -36,12 +36,18 @@ public class MatchMplsLabel extends MatchInfoHelper<ProtocolMatchFields, Protoco
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchMplsLabel that = (MatchMplsLabel) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchMplsLabel that = (MatchMplsLabel) other;
 
         return label == that.label;
     }
@@ -49,7 +55,7 @@ public class MatchMplsLabel extends MatchInfoHelper<ProtocolMatchFields, Protoco
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) (label ^ (label >>> 32));
+        result = 31 * result + (int) (label ^ label >>> 32);
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchPbbIsid.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchPbbIsid.java
index 13c0b539a..a0649caf6 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchPbbIsid.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchPbbIsid.java
@@ -37,12 +37,18 @@ public class MatchPbbIsid extends MatchInfoHelper<ProtocolMatchFields, ProtocolM
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchPbbIsid that = (MatchPbbIsid) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchPbbIsid that = (MatchPbbIsid) other;
 
         return isid == that.isid;
     }
@@ -50,7 +56,7 @@ public class MatchPbbIsid extends MatchInfoHelper<ProtocolMatchFields, ProtocolM
     @Override
     public int hashCode() {
         int result = super.hashCode();
-        result = 31 * result + (int) (isid ^ (isid >>> 32));
+        result = 31 * result + (int) (isid ^ isid >>> 32);
         return result;
     }
 }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpDestinationPort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpDestinationPort.java
index 745cf8f05..2bbb8f363 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpDestinationPort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpDestinationPort.java
@@ -37,12 +37,18 @@ public class MatchTcpDestinationPort extends MatchInfoHelper<TcpMatch, TcpMatchB
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchTcpDestinationPort that = (MatchTcpDestinationPort) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchTcpDestinationPort that = (MatchTcpDestinationPort) other;
 
         return port == that.port;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpFlags.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpFlags.java
index 80ecda200..ec62a5247 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpFlags.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpFlags.java
@@ -40,12 +40,18 @@ public class MatchTcpFlags extends MatchInfoHelper<TcpFlagsMatch, TcpFlagsMatchB
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchTcpFlags that = (MatchTcpFlags) o;
+        MatchTcpFlags that = (MatchTcpFlags) other;
 
         return flags == that.flags;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpSourcePort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpSourcePort.java
index 516019592..c628d89e2 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpSourcePort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTcpSourcePort.java
@@ -37,12 +37,18 @@ public class MatchTcpSourcePort extends MatchInfoHelper<TcpMatch, TcpMatchBuilde
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchTcpSourcePort that = (MatchTcpSourcePort) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchTcpSourcePort that = (MatchTcpSourcePort) other;
 
         return port == that.port;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTunnelId.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTunnelId.java
index dc2ff20df..17c0c68fe 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTunnelId.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchTunnelId.java
@@ -51,14 +51,22 @@ public class MatchTunnelId extends MatchInfoHelper<Tunnel, TunnelBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchTunnelId that = (MatchTunnelId) o;
+        MatchTunnelId that = (MatchTunnelId) other;
 
-        if (tunnelId != null ? !tunnelId.equals(that.tunnelId) : that.tunnelId != null) return false;
+        if (tunnelId != null ? !tunnelId.equals(that.tunnelId) : that.tunnelId != null) {
+            return false;
+        }
         return tunnelMask != null ? tunnelMask.equals(that.tunnelMask) : that.tunnelMask == null;
     }
 
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpDestinationPort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpDestinationPort.java
index 357e09ede..db9bb01c1 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpDestinationPort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpDestinationPort.java
@@ -37,12 +37,18 @@ public class MatchUdpDestinationPort extends MatchInfoHelper<UdpMatch, UdpMatchB
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchUdpDestinationPort that = (MatchUdpDestinationPort) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchUdpDestinationPort that = (MatchUdpDestinationPort) other;
 
         return port == that.port;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpSourcePort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpSourcePort.java
index 95e72c5a0..ddf2eeb64 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpSourcePort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchUdpSourcePort.java
@@ -37,12 +37,18 @@ public class MatchUdpSourcePort extends MatchInfoHelper<UdpMatch, UdpMatchBuilde
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-
-        MatchUdpSourcePort that = (MatchUdpSourcePort) o;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
+
+        MatchUdpSourcePort that = (MatchUdpSourcePort) other;
 
         return port == that.port;
     }
diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchVlanVid.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchVlanVid.java
index b5105a8a5..ff02d742b 100644
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchVlanVid.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/matches/MatchVlanVid.java
@@ -41,12 +41,18 @@ public class MatchVlanVid extends MatchInfoHelper<VlanMatch, VlanMatchBuilder> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        if (!super.equals(other)) {
+            return false;
+        }
 
-        MatchVlanVid that = (MatchVlanVid) o;
+        MatchVlanVid that = (MatchVlanVid) other;
 
         return vlanId == that.vlanId;
     }
-- 
2.36.6