commit 6a47964aadb153f9cb82371d56a653dbe53ca8f0
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Sun Feb 08 01:28:50 2015 -0800
committer Jonathan Hart <jono@onlab.us> Fri Feb 20 19:12:19 2015 +0000
tree 87698276be3853a865f0521a8a83a44447cc4916
parent e6f8400f83f029d72b21e38312a53d226c15990a

Instruction related fixes

- Removed redundant equality check. (ONOS-975)
- Enforced using Instruction Factory methods.
- cosmetic fixes.

Change-Id: I178b55f8568c1a9132f0aa88465b8b34dc2b2df2

core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
index 246d21a..926d267 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
@@ -260,11 +260,13 @@
         return new TableTypeTransition(type);
     }
 
-    /*
-     *  Drop instructions
+    /**
+     *  Drop instruction.
      */
-
     public static final class DropInstruction implements Instruction {
+
+        private DropInstruction() {}
+
         @Override
         public Type type() {
             return Type.DROP;
@@ -287,18 +289,15 @@
                 return true;
             }
             if (obj instanceof DropInstruction) {
-                DropInstruction that = (DropInstruction) obj;
-                return Objects.equals(type(), that.type());
-
+                return true;
             }
             return false;
         }
     }
 
-    /*
-     *  Output Instruction
+    /**
+     *  Output Instruction.
      */
-
     public static final class OutputInstruction implements Instruction {
         private final PortNumber port;
 
@@ -339,10 +338,9 @@
         }
     }
 
-    /*
-     *  Group Instruction
+    /**
+     *  Group Instruction.
      */
-
     public static final class GroupInstruction implements Instruction {
         private final GroupId groupId;
 
@@ -389,7 +387,7 @@
     public static class TableTypeTransition implements Instruction {
         private final FlowRule.Type tableType;
 
-        public TableTypeTransition(FlowRule.Type type) {
+        TableTypeTransition(FlowRule.Type type) {
             this.tableType = type;
         }
 
@@ -405,7 +403,7 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("group ID", this.tableType).toString();
+                    .add("tableType", this.tableType).toString();
         }
 
         @Override