Merge "Custom Node Type jaxb string to id"

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / builder / impl / LeafSchemaNodeBuilder.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
index ee7b3b1c81f55454b1ba06db75c06030e7c6be57..ba9609b4db7f03eea305ae6b64bda80bc66b5fba 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
@@ -22,9 +22,9 @@ import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuil
 import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
 
-public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements
-        DataSchemaNodeBuilder, SchemaNodeBuilder {
-    private boolean built;
+public final class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder
+        implements DataSchemaNodeBuilder, SchemaNodeBuilder {
+    private boolean isBuilt;
     private final LeafSchemaNodeImpl instance;
     private final int line;
     // SchemaNode args
@@ -51,7 +51,7 @@ public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements
 
     @Override
     public LeafSchemaNode build() {
-        if(!built) {
+        if (!isBuilt) {
             instance.setPath(path);
             instance.setConstraints(constraints.build());
             instance.setDescription(description);
@@ -76,7 +76,7 @@ public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements
             }
             instance.setUnknownSchemaNodes(unknownNodes);
 
-            built = true;
+            isBuilt = true;
         }
         return instance;
     }
@@ -152,8 +152,6 @@ public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements
         this.augmenting = augmenting;
     }
 
-
-
     public boolean isConfiguration() {
         return configuration;
     }
@@ -179,7 +177,12 @@ public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements
         this.unitsStr = unitsStr;
     }
 
-    private class LeafSchemaNodeImpl implements LeafSchemaNode {
+    @Override
+    public String toString() {
+        return "leaf " + qname.getLocalName();
+    }
+
+    private final class LeafSchemaNodeImpl implements LeafSchemaNode {
         private final QName qname;
         private SchemaPath path;
         private String description;