Fix L2ModificationInstructions

- PopVlanInstruction
  - type mismatch in #equals()

- StripVlanInstruction
  - hide default constructor
  - align #toString() format
  - fix #equals()

Change-Id: Ifb14866df19cc32dcb9cc28ab473de5ca45d8e41

@@ -285,6 +285,8 @@ public abstract class L2ModificationInstruction implements Instruction {
 
 
     public static final class StripVlanInstruction extends L2ModificationInstruction {
     public static final class StripVlanInstruction extends L2ModificationInstruction {
 
 
+        StripVlanInstruction() {}
+
         @Override
         @Override
         public L2SubType subtype() {
         public L2SubType subtype() {
             return L2SubType.STRIP_VLAN;
             return L2SubType.STRIP_VLAN;
@@ -292,7 +294,8 @@ public abstract class L2ModificationInstruction implements Instruction {
 
 
         @Override
         @Override
         public String toString() {
         public String toString() {
-            return subtype().toString();
+            return toStringHelper(subtype().toString())
+                    .toString();
         }
         }
 
 
         @Override
         @Override
@@ -305,7 +308,9 @@ public abstract class L2ModificationInstruction implements Instruction {
             if (this == obj) {
             if (this == obj) {
                 return true;
                 return true;
             }
             }
-
+            if (obj instanceof StripVlanInstruction) {
+                return true;
+            }
             return false;
             return false;
         }
         }
     }
     }
@@ -341,8 +346,8 @@ public abstract class L2ModificationInstruction implements Instruction {
             if (this == obj) {
             if (this == obj) {
                 return true;
                 return true;
             }
             }
-            if (obj instanceof PushHeaderInstructions) {
-                PushHeaderInstructions that = (PushHeaderInstructions) obj;
+            if (obj instanceof PopVlanInstruction) {
+                PopVlanInstruction that = (PopVlanInstruction) obj;
                 return  Objects.equals(subtype, that.subtype);
                 return  Objects.equals(subtype, that.subtype);
             }
             }
             return false;
             return false;