Refactored YANG types resolving.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / model / 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/model/parser/builder/impl/LeafSchemaNodeBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/LeafSchemaNodeBuilder.java
index bd18ba50a3c5e8eb7065f01948d5ba0b67d8b314..614655025727d3af0d35aedefda934593a3b94e0 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/LeafSchemaNodeBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/LeafSchemaNodeBuilder.java
@@ -18,18 +18,16 @@ import org.opendaylight.controller.yang.model.api.SchemaPath;
 import org.opendaylight.controller.yang.model.api.Status;
 import org.opendaylight.controller.yang.model.api.TypeDefinition;
 import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.controller.yang.model.parser.builder.api.AbstractTypeAwareBuilder;
 import org.opendaylight.controller.yang.model.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.controller.yang.model.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.model.parser.builder.api.TypeAwareBuilder;
-
-public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
-        SchemaNodeBuilder, TypeAwareBuilder {
 
+public class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements DataSchemaNodeBuilder,
+        SchemaNodeBuilder {
     private final QName qname;
     private final LeafSchemaNodeImpl instance;
-    private final ConstraintsBuilder constraintsBuilder = new ConstraintsBuilder();
+    private final ConstraintsBuilder constraints = new ConstraintsBuilder();
     private final List<UnknownSchemaNodeBuilder> addedUnknownNodes = new ArrayList<UnknownSchemaNodeBuilder>();
-    private TypeDefinition<?> type;
 
     LeafSchemaNodeBuilder(QName qname) {
         this.qname = qname;
@@ -38,6 +36,12 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
 
     @Override
     public LeafSchemaNode build() {
+        if(type == null) {
+            instance.setType(typedef.build());
+        } else {
+            instance.setType(type);
+        }
+
         // UNKNOWN NODES
         final List<UnknownSchemaNode> unknownNodes = new ArrayList<UnknownSchemaNode>();
         for(UnknownSchemaNodeBuilder b : addedUnknownNodes) {
@@ -45,7 +49,7 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
         }
         instance.setUnknownSchemaNodes(unknownNodes);
 
-        instance.setConstraints(constraintsBuilder.build());
+        instance.setConstraints(constraints.build());
         return instance;
     }
 
@@ -88,23 +92,12 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
 
     @Override
     public ConstraintsBuilder getConstraintsBuilder() {
-        return constraintsBuilder;
-    }
-
-    @Override
-    public TypeDefinition<?> getType() {
-        return type;
-    }
-
-    @Override
-    public void setType(TypeDefinition<?> type) {
-        this.type = type;
-        instance.setType(type);
+        return constraints;
     }
 
     @Override
-    public void addUnknownSchemaNode(UnknownSchemaNodeBuilder unknownSchemaNodeBuilder) {
-        addedUnknownNodes.add(unknownSchemaNodeBuilder);
+    public void addUnknownSchemaNode(UnknownSchemaNodeBuilder unknownNode) {
+        addedUnknownNodes.add(unknownNode);
     }
 
     private class LeafSchemaNodeImpl implements LeafSchemaNode {
@@ -115,9 +108,9 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
         private Status status = Status.CURRENT;
         private boolean augmenting;
         private boolean configuration;
-        private ConstraintDefinition constraints;
+        private ConstraintDefinition constraintsDef;
         private TypeDefinition<?> type;
-        private List<UnknownSchemaNode> unknownSchemaNodes = Collections.emptyList();
+        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
 
         private LeafSchemaNodeImpl(QName qname) {
             this.qname = qname;
@@ -186,11 +179,11 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
 
         @Override
         public ConstraintDefinition getConstraints() {
-            return constraints;
+            return constraintsDef;
         }
 
-        private void setConstraints(ConstraintDefinition constraints) {
-            this.constraints = constraints;
+        private void setConstraints(ConstraintDefinition constraintsDef) {
+            this.constraintsDef = constraintsDef;
         }
 
         @Override
@@ -204,12 +197,12 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
 
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return unknownSchemaNodes;
+            return unknownNodes;
         }
 
-        private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
-            if(unknownSchemaNodes != null) {
-                this.unknownSchemaNodes = unknownSchemaNodes;
+        private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownNodes) {
+            if(unknownNodes != null) {
+                this.unknownNodes = unknownNodes;
             }
         }
 
@@ -263,9 +256,9 @@ public class LeafSchemaNodeBuilder implements DataSchemaNodeBuilder,
             sb.append(", status=" + status);
             sb.append(", augmenting=" + augmenting);
             sb.append(", configuration=" + configuration);
-            sb.append(", constraints=" + constraints);
+            sb.append(", constraints=" + constraintsDef);
             sb.append(", type=" + type);
-            sb.append(", constraints=" + constraints);
+            sb.append(", constraints=" + constraintsDef);
             sb.append("]");
             return sb.toString();
         }