Merge "Replaced Equals/HashcodeBuilder for DatapacketListener"

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / builder / impl / ConstraintsBuilder.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java
index a1936dea55a5183eb2d155e6e803afc0175452e0..b1aa7de06a58fddcfad9884abeba13d651f47761 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java
@@ -12,13 +12,12 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
 import org.opendaylight.controller.yang.model.api.MustDefinition;
 import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
 import org.opendaylight.controller.yang.parser.builder.api.Builder;
 
-public class ConstraintsBuilder implements Builder {
+public final class ConstraintsBuilder implements Builder {
     private final ConstraintDefinitionImpl instance;
     private final int line;
     private final Set<MustDefinition> mustDefinitions;
@@ -94,20 +93,14 @@ public class ConstraintsBuilder implements Builder {
         this.mandatory = mandatory;
     }
 
-    private static class ConstraintDefinitionImpl implements
+    private final class ConstraintDefinitionImpl implements
             ConstraintDefinition {
-        private DataSchemaNode parent;
         private RevisionAwareXPath whenCondition;
         private Set<MustDefinition> mustConstraints;
         private boolean mandatory;
         private Integer minElements;
         private Integer maxElements;
 
-        @Override
-        public DataSchemaNode getParent() {
-            return parent;
-        }
-
         @Override
         public RevisionAwareXPath getWhenCondition() {
             return whenCondition;
@@ -163,8 +156,6 @@ public class ConstraintsBuilder implements Builder {
         public int hashCode() {
             final int prime = 31;
             int result = 1;
-            result = prime * result
-                    + ((parent == null) ? 0 : parent.hashCode());
             result = prime * result
                     + ((whenCondition == null) ? 0 : whenCondition.hashCode());
             result = prime
@@ -191,13 +182,6 @@ public class ConstraintsBuilder implements Builder {
                 return false;
             }
             ConstraintDefinitionImpl other = (ConstraintDefinitionImpl) obj;
-            if (parent == null) {
-                if (other.parent != null) {
-                    return false;
-                }
-            } else if (!parent.equals(other.parent)) {
-                return false;
-            }
             if (whenCondition == null) {
                 if (other.whenCondition != null) {
                     return false;
@@ -237,8 +221,7 @@ public class ConstraintsBuilder implements Builder {
             StringBuilder sb = new StringBuilder(
                     ConstraintDefinitionImpl.class.getSimpleName());
             sb.append("[");
-            sb.append("parent=" + parent);
-            sb.append(", whenCondition=" + whenCondition);
+            sb.append("whenCondition=" + whenCondition);
             sb.append(", mustConstraints=" + mustConstraints);
             sb.append(", mandatory=" + mandatory);
             sb.append(", minElements=" + minElements);