X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FModuleBuilder.java;h=740f39916843f8cf27697390a827bcf2bedfa7a5;hp=1f281898a33ef0aee0c58700c2ca11081bd562a2;hb=d0f1a6162437a9e003e87c7a8b36ea875f8de984;hpb=06aa5ce746e29a3760688b2ef2817f50bec5ea7a diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java index 1f281898a3..740f399168 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java @@ -555,7 +555,7 @@ public class ModuleBuilder implements Builder { .get(pathToAnyXml); if (parent != null) { if (parent instanceof AugmentationSchemaBuilder) { - throw new UnsupportedOperationException( + throw new YangParseException( "An anyxml node cannot be augmented."); } parent.addChildNode(builder); @@ -646,9 +646,11 @@ public class ModuleBuilder implements Builder { Builder builder = moduleNodes.get(parentPath); // current api did not support adding config to deviate if (!(builder instanceof DeviationBuilder)) { - DataSchemaNodeBuilder configBuilder = (DataSchemaNodeBuilder) moduleNodes - .get(parentPath); - configBuilder.setConfiguration(configuration); + if(builder instanceof RefineHolder) { + ((RefineHolder)builder).setConfig(configuration); + } else { + ((DataSchemaNodeBuilder)builder).setConfiguration(configuration); + } } } @@ -993,26 +995,12 @@ public class ModuleBuilder implements Builder { public String toString() { StringBuilder sb = new StringBuilder( ModuleImpl.class.getSimpleName()); - sb.append("[\n"); - sb.append("name=" + name + ",\n"); - sb.append("namespace=" + namespace + ",\n"); - sb.append("revision=" + revision + ",\n"); - sb.append("prefix=" + prefix + ",\n"); - sb.append("yangVersion=" + yangVersion + ",\n"); - sb.append("description=" + description + ",\n"); - sb.append("reference=" + reference + ",\n"); - sb.append("organization=" + organization + ",\n"); - sb.append("contact=" + contact + ",\n"); - sb.append("childNodes=" + childNodes.values() + ",\n"); - sb.append("groupings=" + groupings + ",\n"); - sb.append("imports=" + imports + ",\n"); - sb.append("features=" + features + ",\n"); - sb.append("typeDefinitions=" + typeDefinitions + ",\n"); - sb.append("notifications=" + notifications + ",\n"); - sb.append("augmentations=" + augmentations + ",\n"); - sb.append("rpcs=" + rpcs + ",\n"); - sb.append("deviations=" + deviations + "\n"); - sb.append("uses=" + uses + "\n"); + sb.append("["); + sb.append("name=" + name); + sb.append(", namespace=" + namespace); + sb.append(", revision=" + revision); + sb.append(", prefix=" + prefix); + sb.append(", yangVersion=" + yangVersion); sb.append("]"); return sb.toString(); }