Deprecate SchemaPath.getPath() for removal

We do not really need this method anymore, mark it as deprecated.
Also migrate users, whose sole requirement is to have Collection.size()
available.

Change-Id: Ie86bbca934ac5f40a96fe280efdb65dc4124955c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java
index 551e4258d2d9316e200cca5ba1ca19af38466a47..e2b02d3a2ba8c30c65008a44a9a7a977e252c3ef 100755 (executable)
--- a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java
+++ b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/AbstractNormalizedNodeDataOutput.java
@@ -9,10 +9,10 @@ package org.opendaylight.yangtools.yang.data.codec.binfmt;
 
 import static java.util.Objects.requireNonNull;
 
+import com.google.common.collect.Iterables;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -168,8 +168,9 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut
         ensureHeaderWritten();
 
         output.writeBoolean(path.isAbsolute());
-        final List<QName> qnames = path.getPath();
-        output.writeInt(qnames.size());
+
+        final Iterable<QName> qnames = path.getPathFromRoot();
+        output.writeInt(Iterables.size(qnames));
         for (QName qname : qnames) {
             writeQNameInternal(qname);
         }

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
index edd4469700a3b3f5820929862511ac238eb3c0be..24432284ce909d9f70007f338960056fab1e1800 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
@@ -140,7 +140,7 @@ public abstract class SchemaPath implements Immutable {
      *
      * @deprecated Use {@link #getPathFromRoot()} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public List<QName> getPath() {
         return getLegacyPath();
     }