From: Robert Varga Date: Fri, 27 Sep 2019 14:09:20 +0000 (+0200) Subject: Fix references to Any{Data,Xml}SchemaNode X-Git-Tag: v5.0.0~20 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7bb07d32306379e547fd121a320502ab5f41de6d;p=mdsal.git Fix references to Any{Data,Xml}SchemaNode This is a follow-up for renames of AnyXmlSchemaNode and AnyDataSchemaNode. Change-Id: I63f9ae94b1bc3fc72385b4ad947a16803d959d0c Signed-off-by: Robert Varga --- diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend index 7a4448d7ef..5ba6138f1c 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend @@ -27,7 +27,7 @@ import org.gaul.modernizer_maven_annotations.SuppressModernizer 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.model.api.AnyXmlSchemaNode +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode import org.opendaylight.yangtools.yang.model.api.AugmentationTarget import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode @@ -416,7 +416,7 @@ class GeneratorImpl { «IF child instanceof ContainerSchemaNode» «printContainerNode(child)» «ENDIF» - «IF child instanceof AnyXmlSchemaNode» + «IF child instanceof AnyxmlSchemaNode» «printAnyXmlNode(child)» «ENDIF» «IF child instanceof LeafSchemaNode» @@ -474,7 +474,7 @@ class GeneratorImpl { ''' } - private def printAnyXmlNode(AnyXmlSchemaNode anyXmlNode) { + private def printAnyXmlNode(AnyxmlSchemaNode anyXmlNode) { return ''' <«anyXmlNode.QName.localName»>. . .</«anyXmlNode.QName.localName»> @@ -894,7 +894,7 @@ class GeneratorImpl { «printInfo(node, "container")» ''' - } else if(node instanceof AnyXmlSchemaNode) { + } else if(node instanceof AnyxmlSchemaNode) { return ''' «printInfo(node, "anyxml")» @@ -958,7 +958,7 @@ class GeneratorImpl { } def CharSequence printChildren(Iterable nodes, int level, YangInstanceIdentifier path) { - val anyxmlNodes = nodes.filter(AnyXmlSchemaNode) + val anyxmlNodes = nodes.filter(AnyxmlSchemaNode) val leafNodes = nodes.filter(LeafSchemaNode) val leafListNodes = nodes.filter(LeafListSchemaNode) val choices = nodes.filter(ChoiceSchemaNode) @@ -1125,7 +1125,7 @@ class GeneratorImpl { ''' } - def CharSequence printShortInfo(AnyXmlSchemaNode node, int level, YangInstanceIdentifier path) { + def CharSequence printShortInfo(AnyxmlSchemaNode node, int level, YangInstanceIdentifier path) { return '''
  • «strong((node.QName.localName))» (anyxml)
      diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java index 2082576f1e..1db23307a8 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java @@ -58,8 +58,8 @@ import org.opendaylight.yangtools.yang.binding.OpaqueObject; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; @@ -301,8 +301,8 @@ final class BindingCodecContext implements CodecContextFactory, BindingCodecTree final DataNodeContainer childSchema) { final Map getterToLeafSchema = new HashMap<>(); for (final DataSchemaNode leaf : childSchema.getChildNodes()) { - if (leaf instanceof TypedDataSchemaNode || leaf instanceof AnyXmlSchemaNode - || leaf instanceof AnyDataSchemaNode) { + if (leaf instanceof TypedDataSchemaNode || leaf instanceof AnyxmlSchemaNode + || leaf instanceof AnydataSchemaNode) { getterToLeafSchema.put(BindingSchemaMapping.getGetterMethodName(leaf), leaf); } } @@ -342,11 +342,11 @@ final class BindingCodecContext implements CodecContextFactory, BindingCodecTree final LeafListSchemaNode leafListSchema = (LeafListSchemaNode) schema; final IllegalArgumentCodec codec = getCodec(valueType, leafListSchema.getType()); valueNode = new LeafSetNodeCodecContext(leafListSchema, codec, method.getName()); - } else if (schema instanceof AnyXmlSchemaNode) { - valueNode = new OpaqueNodeCodecContext.AnyXml<>((AnyXmlSchemaNode) schema, method.getName(), + } else if (schema instanceof AnyxmlSchemaNode) { + valueNode = new OpaqueNodeCodecContext.Anyxml<>((AnyxmlSchemaNode) schema, method.getName(), opaqueReturnType(method), loader); - } else if (schema instanceof AnyDataSchemaNode) { - valueNode = new OpaqueNodeCodecContext.AnyData<>((AnyDataSchemaNode) schema, method.getName(), + } else if (schema instanceof AnydataSchemaNode) { + valueNode = new OpaqueNodeCodecContext.Anydata<>((AnydataSchemaNode) schema, method.getName(), opaqueReturnType(method), loader); } else { verify(schema == null, "Unhandled schema %s for method %s", schema, method); diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecPrototype.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecPrototype.java index 73b3c577b9..386a880e7b 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecPrototype.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecPrototype.java @@ -20,8 +20,8 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; @@ -115,7 +115,7 @@ final class DataContainerCodecPrototype implements NodeCon } else { haveAddressable = true; } - } else if (child instanceof AnyDataSchemaNode || child instanceof AnyXmlSchemaNode + } else if (child instanceof AnydataSchemaNode || child instanceof AnyxmlSchemaNode || child instanceof TypedDataSchemaNode) { haveUnaddressable = true; } else if (child instanceof ChoiceSchemaNode) { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamerGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamerGenerator.java index 67cfdb2c7a..f601b0628c 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamerGenerator.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamerGenerator.java @@ -62,8 +62,8 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Identifiable; import org.opendaylight.yangtools.yang.binding.Identifier; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; @@ -269,10 +269,10 @@ final class DataObjectStreamerGenerator> impleme if (childSchema instanceof ChoiceSchemaNode) { return choiceChildStream(getter); } - if (childSchema instanceof AnyDataSchemaNode) { + if (childSchema instanceof AnydataSchemaNode) { return qnameChildStream(STREAM_ANYDATA, getter, childSchema); } - if (childSchema instanceof AnyXmlSchemaNode) { + if (childSchema instanceof AnyxmlSchemaNode) { return qnameChildStream(STREAM_ANYXML, getter, childSchema); } if (childSchema instanceof LeafListSchemaNode) { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/OpaqueNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/OpaqueNodeCodecContext.java index 328a4e05a4..8099c276bd 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/OpaqueNodeCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/OpaqueNodeCodecContext.java @@ -33,14 +33,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ForeignDataNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; abstract class OpaqueNodeCodecContext> extends ValueNodeCodecContext implements BindingOpaqueObjectCodecTreeNode { - static final class AnyXml> extends OpaqueNodeCodecContext { - AnyXml(final AnyXmlSchemaNode schema, final String getterName, final Class bindingClass, + static final class Anyxml> extends OpaqueNodeCodecContext { + Anyxml(final AnyxmlSchemaNode schema, final String getterName, final Class bindingClass, final CodecClassLoader loader) { super(schema, getterName, bindingClass, loader); } @@ -61,8 +61,8 @@ abstract class OpaqueNodeCodecContext> extends ValueNo } } - static final class AnyData> extends OpaqueNodeCodecContext { - AnyData(final AnyDataSchemaNode schema, final String getterName, final Class bindingClass, + static final class Anydata> extends OpaqueNodeCodecContext { + Anydata(final AnydataSchemaNode schema, final String getterName, final Class bindingClass, final CodecClassLoader loader) { super(schema, getterName, bindingClass, loader); } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index 6d697783fc..acac00feb9 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -89,8 +89,8 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.ActionDefinition; import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; @@ -1057,7 +1057,7 @@ abstract class AbstractTypeGenerator { listToGenType(context, typeBuilder, baseInterface, (ListSchemaNode) node, inGrouping); } else if (node instanceof ChoiceSchemaNode) { choiceToGeneratedType(context, typeBuilder, (ChoiceSchemaNode) node, inGrouping); - } else if (node instanceof AnyXmlSchemaNode || node instanceof AnyDataSchemaNode) { + } else if (node instanceof AnyxmlSchemaNode || node instanceof AnydataSchemaNode) { opaqueToGeneratedType(context, typeBuilder, node); } else { LOG.debug("Unable to add schema node {} as method in {}: unsupported type of node.", node.getClass(),