Merge "BUG-994: do not use SchemaPath.getPath()"

diff --combined yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index ee8ef76994885b6ef19dedc1fd8d160e9848b327,a33c76cab2023e3db05ea7b6a66ae7f28a1fbbcd..77d390f8f7a9aeb0742590d1e71e3aaadc92299d
--- 1/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
--- 2/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@@ -25,6 -25,10 +25,10 @@@ import static org.opendaylight.yangtool
  import static org.opendaylight.yangtools.yang.parser.builder.impl.TypeUtils.resolveTypeUnionWithContext;
  import static org.opendaylight.yangtools.yang.parser.builder.impl.TypeUtils.resolveTypeWithContext;
  
+ import com.google.common.base.Optional;
+ import com.google.common.base.Preconditions;
+ import com.google.common.collect.HashBiMap;
+ import com.google.common.io.ByteSource;
  import java.io.File;
  import java.io.IOException;
  import java.io.InputStream;
@@@ -41,7 -45,6 +45,6 @@@ import java.util.List
  import java.util.Map;
  import java.util.Set;
  import java.util.TreeMap;
- 
  import org.antlr.v4.runtime.ANTLRInputStream;
  import org.antlr.v4.runtime.CommonTokenStream;
  import org.antlr.v4.runtime.tree.ParseTree;
@@@ -83,7 -86,7 +86,7 @@@ import org.opendaylight.yangtools.yang.
  import org.opendaylight.yangtools.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
  import org.opendaylight.yangtools.yang.parser.builder.impl.IdentityrefTypeBuilder;
  import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
 -import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder.ModuleImpl;
 +import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleImpl;
  import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder;
  import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilderImpl;
  import org.opendaylight.yangtools.yang.parser.builder.util.Comparators;
@@@ -95,11 -98,6 +98,6 @@@ import org.opendaylight.yangtools.yang.
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import com.google.common.base.Optional;
- import com.google.common.base.Preconditions;
- import com.google.common.collect.HashBiMap;
- import com.google.common.io.ByteSource;
- 
  public final class YangParserImpl implements YangContextParser {
      private static final Logger LOG = LoggerFactory.getLogger(YangParserImpl.class);
  
@@@ -827,7 -825,6 +825,6 @@@
              final AugmentationSchemaBuilder augment, final SchemaContext context) {
          ModuleBuilder module = BuilderUtils.getParentModule(augment);
          SchemaPath oldSchemaPath = augment.getTargetPath();
-         List<QName> oldPath = oldSchemaPath.getPath();
          List<QName> newPath = new ArrayList<>();
  
          Builder parent = augment.getParent();
@@@ -851,10 -848,11 +848,11 @@@
              }
  
              final QNameModule qm = QNameModule.create(ns, revision);
-             for (QName qn : oldSchemaPath.getPath()) {
+             for (QName qn : oldSchemaPath.getPathFromRoot()) {
                  newPath.add(QName.create(qm, prefix, qn.getLocalName()));
              }
          } else {
+             Iterable<QName> oldPath = oldSchemaPath.getPathFromRoot();
              for (QName qn : oldPath) {
                  URI ns = module.getNamespace();
                  Date rev = module.getRevision();