Introduce SchemaNodeIdentifier.asSchemaPath()

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / effective / ExtensionEffectiveStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java
index df925dd16be2925411d66cb98f08d3495158b9d8..a73b90404147ca848f4d533fbc97698b70979c8b 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java
@@ -7,31 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective;
 
+import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.LinkedList;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import com.google.common.collect.ImmutableList;
 import java.util.List;
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
 
-public class ExtensionEffectiveStatementImpl extends
-        AbstractEffectiveDocumentedNode<QName, ExtensionStatement> implements
-        ExtensionDefinition {
+public class ExtensionEffectiveStatementImpl extends AbstractEffectiveDocumentedNode<QName, ExtensionStatement>
+        implements ExtensionDefinition {
     private final QName qname;
-    String argument;
+    private String argument;
     private final SchemaPath schemaPath;
 
-    ImmutableList<UnknownSchemaNode> unknownNodes;
-    boolean yin;
+    private ImmutableList<UnknownSchemaNode> unknownNodes;
+    private boolean yin;
 
     public ExtensionEffectiveStatementImpl(
-            StmtContext<QName, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>> ctx) {
+            final StmtContext<QName, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>> ctx) {
         super(ctx);
 
         this.qname = ctx.getStatementArgument();
@@ -39,7 +39,6 @@ public class ExtensionEffectiveStatementImpl extends
 
         initSubstatementCollections();
         initFields();
-
     }
 
     private void initFields() {
@@ -48,31 +47,30 @@ public class ExtensionEffectiveStatementImpl extends
 
         if (argumentSubstatement != null) {
             this.argument = argumentSubstatement.argument().getLocalName();
-        }
-
-        YinElementEffectiveStatementImpl yinElement = firstEffective(YinElementEffectiveStatementImpl.class);
 
-        if (yinElement != null) {
-            this.yin = yinElement.argument();
-        } else {
-            yin = false;
+            YinElementEffectiveStatementImpl yinElement = argumentSubstatement
+                    .firstEffective(YinElementEffectiveStatementImpl.class);
+            if (yinElement != null) {
+                this.yin = yinElement.argument();
+            } else {
+                this.yin = false;
+            }
         }
-
     }
 
     private void initSubstatementCollections() {
         Collection<? extends EffectiveStatement<?, ?>> effectiveSubstatements = effectiveSubstatements();
 
-        LinkedList<UnknownSchemaNode> unknownNodes = new LinkedList<UnknownSchemaNode>();
+        List<UnknownSchemaNode> unknownNodesInit = new LinkedList<>();
 
         for (EffectiveStatement<?, ?> effectiveStatement : effectiveSubstatements) {
             if (effectiveStatement instanceof UnknownSchemaNode) {
                 UnknownSchemaNode unknownNode = (UnknownSchemaNode) effectiveStatement;
-                unknownNodes.add(unknownNode);
+                unknownNodesInit.add(unknownNode);
             }
         }
 
-        this.unknownNodes = ImmutableList.copyOf(unknownNodes);
+        this.unknownNodes = ImmutableList.copyOf(unknownNodesInit);
     }
 
     @Override
@@ -104,9 +102,8 @@ public class ExtensionEffectiveStatementImpl extends
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((qname == null) ? 0 : qname.hashCode());
-        result = prime * result
-                + ((schemaPath == null) ? 0 : schemaPath.hashCode());
+        result = prime * result + Objects.hashCode(qname);
+        result = prime * result + Objects.hashCode(schemaPath);
         return result;
     }
 
@@ -122,27 +119,12 @@ public class ExtensionEffectiveStatementImpl extends
             return false;
         }
         ExtensionEffectiveStatementImpl other = (ExtensionEffectiveStatementImpl) obj;
-        if (qname == null) {
-            if (other.qname != null) {
-                return false;
-            }
-        } else if (!qname.equals(other.qname)) {
-            return false;
-        }
-        if (schemaPath == null) {
-            if (other.schemaPath != null) {
-                return false;
-            }
-        } else if (!schemaPath.equals(other.schemaPath)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(qname, other.qname) && Objects.equals(schemaPath, other.schemaPath);
     }
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder(
-                ExtensionEffectiveStatementImpl.class.getSimpleName());
+        StringBuilder sb = new StringBuilder(ExtensionEffectiveStatementImpl.class.getSimpleName());
         sb.append("[");
         sb.append("argument=").append(argument);
         sb.append(", qname=").append(qname);
@@ -152,4 +134,4 @@ public class ExtensionEffectiveStatementImpl extends
         sb.append("]");
         return sb.toString();
     }
-}
\ No newline at end of file
+}