ONOS-1746 Fixed hashCode implementation to be immune from non-deterministic enum hashCode.

Change-Id: I96d0a7850ee28d62b1152c4fee4f4ce7648c4931

@@ -62,7 +62,7 @@ public final class EthCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, mac);
+        return Objects.hash(type.ordinal(), mac);
     }
     }
 
 
     @Override
     @Override

@@ -59,7 +59,7 @@ public final class EthTypeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), ethType);
+        return Objects.hash(type().ordinal(), ethType);
     }
     }
 
 
     @Override
     @Override

@@ -62,7 +62,7 @@ public final class IPCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, ip);
+        return Objects.hash(type().ordinal(), ip);
     }
     }
 
 
     @Override
     @Override

@@ -58,7 +58,7 @@ public final class IPDscpCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), ipDscp);
+        return Objects.hash(type().ordinal(), ipDscp);
     }
     }
 
 
     @Override
     @Override

@@ -58,7 +58,7 @@ public final class IPEcnCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), ipEcn);
+        return Objects.hash(type().ordinal(), ipEcn);
     }
     }
 
 
     @Override
     @Override

@@ -59,7 +59,7 @@ public final class IPProtocolCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), proto);
+        return Objects.hash(type().ordinal(), proto);
     }
     }
 
 
     @Override
     @Override

@@ -60,7 +60,7 @@ public final class IPv6ExthdrFlagsCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), exthdrFlags);
+        return Objects.hash(type().ordinal(), exthdrFlags);
     }
     }
 
 
     @Override
     @Override

@@ -58,7 +58,7 @@ public final class IPv6FlowLabelCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), flowLabel);
+        return Objects.hash(type().ordinal(), flowLabel);
     }
     }
 
 
     @Override
     @Override

@@ -62,7 +62,7 @@ public final class IPv6NDLinkLayerAddressCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, mac);
+        return Objects.hash(type().ordinal(), mac);
     }
     }
 
 
     @Override
     @Override

@@ -58,7 +58,7 @@ public final class IPv6NDTargetAddressCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), targetAddress);
+        return Objects.hash(type().ordinal(), targetAddress);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class IcmpCodeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), icmpCode);
+        return Objects.hash(type().ordinal(), icmpCode);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class IcmpTypeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), icmpType);
+        return Objects.hash(type().ordinal(), icmpType);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class Icmpv6CodeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), icmpv6Code);
+        return Objects.hash(type().ordinal(), icmpv6Code);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class Icmpv6TypeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), icmpv6Type);
+        return Objects.hash(type().ordinal(), icmpv6Type);
     }
     }
 
 
     @Override
     @Override

@@ -56,7 +56,7 @@ public class IndexedLambdaCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(lambda);
+        return Objects.hash(type().ordinal(), lambda);
     }
     }
 
 
     @Override
     @Override

@@ -62,7 +62,7 @@ public final class LambdaCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, lambda);
+        return Objects.hash(type().ordinal(), lambda);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class MetadataCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), metadata);
+        return Objects.hash(type().ordinal(), metadata);
     }
     }
 
 
     @Override
     @Override

@@ -49,7 +49,7 @@ public final class MplsCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), mplsLabel);
+        return Objects.hash(type().ordinal(), mplsLabel);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class OchSignalCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(lambda);
+        return Objects.hash(type().ordinal(), lambda);
     }
     }
 
 
     @Override
     @Override

@@ -54,7 +54,7 @@ public class OchSignalTypeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(signalType);
+        return Objects.hash(type().ordinal(), signalType);
     }
     }
 
 
     @Override
     @Override

@@ -62,7 +62,7 @@ public final class OpticalSignalTypeCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, signalType);
+        return Objects.hash(type().ordinal(), signalType);
     }
     }
 
 
     @Override
     @Override

@@ -62,7 +62,7 @@ public final class PortCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), port);
+        return Objects.hash(type().ordinal(), port);
     }
     }
 
 
     @Override
     @Override

@@ -61,7 +61,7 @@ public final class SctpPortCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, sctpPort);
+        return Objects.hash(type().ordinal(), sctpPort);
     }
     }
 
 
     @Override
     @Override

@@ -61,7 +61,7 @@ public final class TcpPortCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, tcpPort);
+        return Objects.hash(type().ordinal(), tcpPort);
     }
     }
 
 
     @Override
     @Override

@@ -61,7 +61,7 @@ public final class UdpPortCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type, udpPort);
+        return Objects.hash(type().ordinal(), udpPort);
     }
     }
 
 
     @Override
     @Override

@@ -58,7 +58,7 @@ public final class VlanIdCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), vlanId);
+        return Objects.hash(type().ordinal(), vlanId);
     }
     }
 
 
     @Override
     @Override

@@ -57,7 +57,7 @@ public final class VlanPcpCriterion implements Criterion {
 
 
     @Override
     @Override
     public int hashCode() {
     public int hashCode() {
-        return Objects.hash(type(), vlanPcp);
+        return Objects.hash(type().ordinal(), vlanPcp);
     }
     }
 
 
     @Override
     @Override

@@ -352,7 +352,7 @@ public final class Instructions {
 
 
         @Override
         @Override
         public int hashCode() {
         public int hashCode() {
-            return Objects.hash(type());
+            return Objects.hash(type().ordinal());
         }
         }
 
 
         @Override
         @Override
@@ -393,7 +393,7 @@ public final class Instructions {
 
 
         @Override
         @Override
         public int hashCode() {
         public int hashCode() {
-            return Objects.hash(type(), port);
+            return Objects.hash(type().ordinal(), port);
         }
         }
 
 
         @Override
         @Override
@@ -437,7 +437,7 @@ public final class Instructions {
 
 
         @Override
         @Override
         public int hashCode() {
         public int hashCode() {
-            return Objects.hash(type(), groupId);
+            return Objects.hash(type().ordinal(), groupId);
         }
         }
 
 
         @Override
         @Override
@@ -481,7 +481,7 @@ public final class Instructions {
 
 
         @Override
         @Override
         public int hashCode() {
         public int hashCode() {
-            return Objects.hash(type(), tableId);
+            return Objects.hash(type().ordinal(), tableId);
         }
         }
 
 
         @Override
         @Override
@@ -533,7 +533,7 @@ public final class Instructions {
 
 
         @Override
         @Override
         public int hashCode() {
         public int hashCode() {
-            return Objects.hash(type(), metadata, metadataMask);
+            return Objects.hash(type().ordinal(), metadata, metadataMask);
         }
         }
 
 
         @Override
         @Override