Refactored SchemaPath for yang java types. Fixed SchemaPath for augmented nodes types.

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
index 3e7beda7565cb41df80c895b135fc9d81255a968..dba747db1dd9bad3aa31a3d265279119d8434b85 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
@@ -21,20 +21,23 @@ import org.opendaylight.controller.yang.model.api.SchemaNode;
 import org.opendaylight.controller.yang.model.api.SchemaPath;\r
 import org.opendaylight.controller.yang.model.api.UsesNode;\r
 import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;\r
-import org.opendaylight.controller.yang.parser.builder.api.Builder;\r
 import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;\r
 import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;\r
 import org.opendaylight.controller.yang.parser.util.RefineHolder;\r
 \r
-final class UsesNodeBuilderImpl implements UsesNodeBuilder, Builder {\r
+public final class UsesNodeBuilderImpl implements UsesNodeBuilder {\r
+    private boolean isBuilt;\r
     private final UsesNodeImpl instance;\r
     private final int line;\r
+    private final String groupingPathStr;\r
     private final SchemaPath groupingPath;\r
+    private boolean augmenting;\r
     private final Set<AugmentationSchemaBuilder> addedAugments = new HashSet<AugmentationSchemaBuilder>();\r
     private List<SchemaNodeBuilder> refineBuilders = new ArrayList<SchemaNodeBuilder>();\r
     private List<RefineHolder> refines = new ArrayList<RefineHolder>();\r
 \r
-    UsesNodeBuilderImpl(final String groupingPathStr, final int line) {\r
+    public UsesNodeBuilderImpl(final String groupingPathStr, final int line) {\r
+        this.groupingPathStr = groupingPathStr;\r
         this.groupingPath = parseUsesPath(groupingPathStr);\r
         this.line = line;\r
         instance = new UsesNodeImpl(groupingPath);\r
@@ -42,21 +45,26 @@ final class UsesNodeBuilderImpl implements UsesNodeBuilder, Builder {
 \r
     @Override\r
     public UsesNode build() {\r
-        // AUGMENTATIONS\r
-        final Set<AugmentationSchema> augments = new HashSet<AugmentationSchema>();\r
-        for (AugmentationSchemaBuilder builder : addedAugments) {\r
-            augments.add(builder.build());\r
-        }\r
-        instance.setAugmentations(augments);\r
+        if (!isBuilt) {\r
+            instance.setAugmenting(augmenting);\r
 \r
-        // REFINES\r
-        final Map<SchemaPath, SchemaNode> refineNodes = new HashMap<SchemaPath, SchemaNode>();\r
-        for (SchemaNodeBuilder refineBuilder : refineBuilders) {\r
-            SchemaNode refineNode = refineBuilder.build();\r
-            refineNodes.put(refineNode.getPath(), refineNode);\r
-        }\r
-        instance.setRefines(refineNodes);\r
+            // AUGMENTATIONS\r
+            final Set<AugmentationSchema> augments = new HashSet<AugmentationSchema>();\r
+            for (AugmentationSchemaBuilder builder : addedAugments) {\r
+                augments.add(builder.build());\r
+            }\r
+            instance.setAugmentations(augments);\r
+\r
+            // REFINES\r
+            final Map<SchemaPath, SchemaNode> refineNodes = new HashMap<SchemaPath, SchemaNode>();\r
+            for (SchemaNodeBuilder refineBuilder : refineBuilders) {\r
+                SchemaNode refineNode = refineBuilder.build();\r
+                refineNodes.put(refineNode.getPath(), refineNode);\r
+            }\r
+            instance.setRefines(refineNodes);\r
 \r
+            isBuilt = true;\r
+        }\r
         return instance;\r
     }\r
 \r
@@ -65,19 +73,39 @@ final class UsesNodeBuilderImpl implements UsesNodeBuilder, Builder {
         return line;\r
     }\r
 \r
+    @Override\r
+    public String getGroupingPathString() {\r
+        return groupingPathStr;\r
+    }\r
+\r
     @Override\r
     public SchemaPath getGroupingPath() {\r
         return groupingPath;\r
     }\r
 \r
+    @Override\r
+    public Set<AugmentationSchemaBuilder> getAugmentations() {\r
+        return addedAugments;\r
+    }\r
+\r
     @Override\r
     public void addAugment(final AugmentationSchemaBuilder augmentBuilder) {\r
         addedAugments.add(augmentBuilder);\r
     }\r
 \r
+    @Override\r
+    public boolean isAugmenting() {\r
+        return augmenting;\r
+    }\r
+\r
     @Override\r
     public void setAugmenting(final boolean augmenting) {\r
-        instance.setAugmenting(augmenting);\r
+        this.augmenting = augmenting;\r
+    }\r
+\r
+    @Override\r
+    public List<SchemaNodeBuilder> getRefineNodes() {\r
+        return refineBuilders;\r
     }\r
 \r
     @Override\r