X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fcodec%2Fxml%2FXmlUtils.java;h=d3acbe64400e2fe4192722147aa39426f6b7ac12;hb=73ecace3825eb4a9724d2987dbb78d177065d0cc;hp=cfb8fc0897cd5b2f620f940bd8358b1ed94a2524;hpb=e1a3876862c946f484edd03c0012575037a32d03;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java index cfb8fc0897..d3acbe6440 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java @@ -7,13 +7,7 @@ */ package org.opendaylight.yangtools.yang.data.impl.codec.xml; -import java.util.Map; import javax.annotation.Nonnull; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -30,8 +24,13 @@ public final class XmlUtils { }; private XmlUtils() { + throw new UnsupportedOperationException(); } + /** + * @deprecated This utility method is no longer needed: check type identity directly + */ + @Deprecated public static TypeDefinition resolveBaseTypeFrom(final @Nonnull TypeDefinition type) { TypeDefinition superType = type; while (superType.getBaseType() != null) { @@ -39,42 +38,4 @@ public final class XmlUtils { } return superType; } - - /** - * - * @deprecated Use {@link RandomPrefixInstanceIdentifierSerializer} instead. - */ - @Deprecated - static String encodeIdentifier(final RandomPrefix prefixes, final YangInstanceIdentifier id) { - StringBuilder textContent = new StringBuilder(); - for (PathArgument pathArgument : id.getPathArguments()) { - textContent.append('/'); - - final QName nt = pathArgument.getNodeType(); - textContent.append(prefixes.encodePrefix(nt.getNamespace())); - textContent.append(':'); - textContent.append(nt.getLocalName()); - - if (pathArgument instanceof NodeIdentifierWithPredicates) { - Map predicates = ((NodeIdentifierWithPredicates) pathArgument).getKeyValues(); - - for (Map.Entry entry : predicates.entrySet()) { - final QName key = entry.getKey(); - textContent.append('['); - textContent.append(prefixes.encodePrefix(key.getNamespace())); - textContent.append(':'); - textContent.append(key.getLocalName()); - textContent.append("='"); - textContent.append(String.valueOf(entry.getValue())); - textContent.append("']"); - } - } else if (pathArgument instanceof NodeWithValue) { - textContent.append("[.='"); - textContent.append(((NodeWithValue) pathArgument).getValue()); - textContent.append("']"); - } - } - - return textContent.toString(); - } }