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%2Fmodel%2Fparser%2Fbuilder%2Fimpl%2FNotificationBuilder.java;h=f2a0a07777e713498a2dbd2290f80163749c77e7;hp=d2010c6578deb987f946f39e0ec29fe7e3178edc;hb=a3ff738aee0c392a1adbd3c6397539bb4130b57d;hpb=09ea3cfd65c19cca18d9bc6dff42fb78a0d74836

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/NotificationBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/NotificationBuilder.java
index d2010c6578..f2a0a07777 100644
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/NotificationBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/NotificationBuilder.java
@@ -35,42 +35,46 @@ import org.opendaylight.controller.yang.model.parser.builder.api.UsesNodeBuilder
 
 public class NotificationBuilder extends AbstractChildNodeBuilder implements
         TypeDefinitionAwareBuilder, SchemaNodeBuilder {
-
     private final NotificationDefinitionImpl instance;
+    private final int line;
+    private SchemaPath schemaPath;
     private final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<TypeDefinitionBuilder>();
     private final Set<UsesNodeBuilder> addedUsesNodes = new HashSet<UsesNodeBuilder>();
     private final List<UnknownSchemaNodeBuilder> addedUnknownNodes = new ArrayList<UnknownSchemaNodeBuilder>();
 
-    NotificationBuilder(QName qname) {
+    NotificationBuilder(final QName qname, final int line) {
         super(qname);
+        this.line = line;
         instance = new NotificationDefinitionImpl(qname);
     }
 
     @Override
     public SchemaNode build() {
+        instance.setPath(schemaPath);
+
         // CHILD NODES
-        Map<QName, DataSchemaNode> childs = new HashMap<QName, DataSchemaNode>();
+        final Map<QName, DataSchemaNode> childs = new HashMap<QName, DataSchemaNode>();
         for (DataSchemaNodeBuilder node : childNodes) {
             childs.put(node.getQName(), node.build());
         }
         instance.setChildNodes(childs);
 
         // GROUPINGS
-        Set<GroupingDefinition> groupingDefinitions = new HashSet<GroupingDefinition>();
+        final Set<GroupingDefinition> groupingDefs = new HashSet<GroupingDefinition>();
         for (GroupingBuilder builder : groupings) {
-            groupingDefinitions.add(builder.build());
+            groupingDefs.add(builder.build());
         }
-        instance.setGroupings(groupingDefinitions);
+        instance.setGroupings(groupingDefs);
 
         // TYPEDEFS
-        Set<TypeDefinition<?>> typedefs = new HashSet<TypeDefinition<?>>();
+        final Set<TypeDefinition<?>> typedefs = new HashSet<TypeDefinition<?>>();
         for (TypeDefinitionBuilder entry : addedTypedefs) {
             typedefs.add(entry.build());
         }
         instance.setTypeDefinitions(typedefs);
 
         // USES
-        Set<UsesNode> uses = new HashSet<UsesNode>();
+        final Set<UsesNode> uses = new HashSet<UsesNode>();
         for (UsesNodeBuilder builder : addedUsesNodes) {
             uses.add(builder.build());
         }
@@ -78,7 +82,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
 
         // UNKNOWN NODES
         final List<UnknownSchemaNode> unknownNodes = new ArrayList<UnknownSchemaNode>();
-        for(UnknownSchemaNodeBuilder b : addedUnknownNodes) {
+        for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
             unknownNodes.add(b.build());
         }
         instance.setUnknownSchemaNodes(unknownNodes);
@@ -87,54 +91,63 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
     }
 
     @Override
-    public void addTypedef(TypeDefinitionBuilder type) {
+    public int getLine() {
+        return line;
+    }
+
+    @Override
+    public void addTypedef(final TypeDefinitionBuilder type) {
         addedTypedefs.add(type);
     }
 
     @Override
-    public void addUsesNode(UsesNodeBuilder usesNodeBuilder) {
+    public void addUsesNode(final UsesNodeBuilder usesNodeBuilder) {
         addedUsesNodes.add(usesNodeBuilder);
     }
 
+    @Override
+    public SchemaPath getPath() {
+        return schemaPath;
+    }
+
     @Override
     public void setPath(SchemaPath schemaPath) {
-        instance.setPath(schemaPath);
+        this.schemaPath = schemaPath;
     }
 
     @Override
-    public void setDescription(String description) {
+    public void setDescription(final String description) {
         instance.setDescription(description);
     }
 
     @Override
-    public void setReference(String reference) {
+    public void setReference(final String reference) {
         instance.setReference(reference);
     }
 
     @Override
-    public void setStatus(Status status) {
+    public void setStatus(final Status status) {
         instance.setStatus(status);
     }
 
     @Override
-    public void addUnknownSchemaNode(UnknownSchemaNodeBuilder unknownSchemaNodeBuilder) {
-        addedUnknownNodes.add(unknownSchemaNodeBuilder);
+    public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) {
+        addedUnknownNodes.add(unknownNode);
     }
 
     private class NotificationDefinitionImpl implements NotificationDefinition {
-
         private final QName qname;
         private SchemaPath path;
         private String description;
         private String reference;
-        private Status status;
+        private Status status = Status.CURRENT;
         private Map<QName, DataSchemaNode> childNodes = Collections.emptyMap();
         private Set<GroupingDefinition> groupings = Collections.emptySet();
         private Set<TypeDefinition<?>> typeDefinitions = Collections.emptySet();
         private Set<UsesNode> uses = Collections.emptySet();
-        private List<UnknownSchemaNode> unknownSchemaNodes = Collections.emptyList();
+        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
 
-        private NotificationDefinitionImpl(QName qname) {
+        private NotificationDefinitionImpl(final QName qname) {
             this.qname = qname;
         }
 
@@ -148,7 +161,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
             return path;
         }
 
-        private void setPath(SchemaPath path) {
+        private void setPath(final SchemaPath path) {
             this.path = path;
         }
 
@@ -157,7 +170,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
             return description;
         }
 
-        private void setDescription(String description) {
+        private void setDescription(final String description) {
             this.description = description;
         }
 
@@ -176,7 +189,9 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
         }
 
         private void setStatus(Status status) {
-            this.status = status;
+            if (status != null) {
+                this.status = status;
+            }
         }
 
         @Override
@@ -185,7 +200,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
         }
 
         private void setChildNodes(Map<QName, DataSchemaNode> childNodes) {
-            if(childNodes != null) {
+            if (childNodes != null) {
                 this.childNodes = childNodes;
             }
         }
@@ -196,7 +211,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
         }
 
         private void setGroupings(Set<GroupingDefinition> groupings) {
-            if(groupings != null) {
+            if (groupings != null) {
                 this.groupings = groupings;
             }
         }
@@ -207,7 +222,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
         }
 
         private void setUses(Set<UsesNode> uses) {
-            if(uses != null) {
+            if (uses != null) {
                 this.uses = uses;
             }
         }
@@ -217,20 +232,22 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
             return typeDefinitions;
         }
 
-        private void setTypeDefinitions(Set<TypeDefinition<?>> typeDefinitions) {
-            if(typeDefinitions != null) {
+        private void setTypeDefinitions(
+                final Set<TypeDefinition<?>> typeDefinitions) {
+            if (typeDefinitions != null) {
                 this.typeDefinitions = typeDefinitions;
             }
         }
 
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return unknownSchemaNodes;
+            return unknownNodes;
         }
 
-        private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
-            if(unknownSchemaNodes != null) {
-                this.unknownSchemaNodes = unknownSchemaNodes;
+        private void setUnknownSchemaNodes(
+                final List<UnknownSchemaNode> unknownNodes) {
+            if (unknownNodes != null) {
+                this.unknownNodes = unknownNodes;
             }
         }
 
@@ -271,7 +288,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
             if (getClass() != obj.getClass()) {
                 return false;
             }
-            NotificationDefinitionImpl other = (NotificationDefinitionImpl) obj;
+            final NotificationDefinitionImpl other = (NotificationDefinitionImpl) obj;
             if (qname == null) {
                 if (other.qname != null) {
                     return false;
@@ -293,7 +310,7 @@ public class NotificationBuilder extends AbstractChildNodeBuilder implements
         public String toString() {
             StringBuilder sb = new StringBuilder(
                     NotificationDefinitionImpl.class.getSimpleName());
-            sb.append("[qname=" + qname + ", path="+ path +"]");
+            sb.append("[qname=" + qname + ", path=" + path + "]");
             return sb.toString();
         }
     }