Minor code style improvements to eliminate eclipse warnings.

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / RpcDefinitionBuilder.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
index da752b0c6984b5011fb3519093251113329f4d10..e503977590c4a87dcee8f56ceebd38386f9c7bd7 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
@@ -32,50 +32,50 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
     private final RpcDefinitionImpl instance;
     private ContainerSchemaNodeBuilder inputBuilder;
     private ContainerSchemaNodeBuilder outputBuilder;
-    private final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<TypeDefinitionBuilder>();
-    private final Set<GroupingBuilder> addedGroupings = new HashSet<GroupingBuilder>();
+    private final Set<TypeDefinition<?>> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+    private final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<>();
+    private final Set<GroupingDefinition> groupings = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+    private final Set<GroupingBuilder> addedGroupings = new HashSet<>();
 
-    RpcDefinitionBuilder(final String moduleName, final int line, final QName qname) {
+    public ContainerSchemaNodeBuilder getInput() {
+        return inputBuilder;
+    }
+
+    public ContainerSchemaNodeBuilder getOutput() {
+        return outputBuilder;
+    }
+
+    RpcDefinitionBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) {
         super(moduleName, line, qname);
-        this.instance = new RpcDefinitionImpl(qname);
+        this.schemaPath = path;
+        this.instance = new RpcDefinitionImpl(qname, path);
     }
 
     @Override
     public RpcDefinition build() {
         if (!isBuilt) {
-            instance.setDescription(description);
-            instance.setReference(reference);
-            instance.setStatus(status);
-
             final ContainerSchemaNode input = inputBuilder == null ? null : inputBuilder.build();
             final ContainerSchemaNode output = outputBuilder == null ? null : outputBuilder.build();
             instance.setInput(input);
             instance.setOutput(output);
 
-            instance.setPath(schemaPath);
-
             // TYPEDEFS
-            final Set<TypeDefinition<?>> typedefs = new TreeSet<TypeDefinition<?>>(Comparators.SCHEMA_NODE_COMP);
             for (TypeDefinitionBuilder entry : addedTypedefs) {
                 typedefs.add(entry.build());
             }
             instance.setTypeDefinitions(typedefs);
 
             // GROUPINGS
-            final Set<GroupingDefinition> groupings = new TreeSet<GroupingDefinition>(Comparators.SCHEMA_NODE_COMP);
             for (GroupingBuilder entry : addedGroupings) {
                 groupings.add(entry.build());
             }
             instance.setGroupings(groupings);
 
             // UNKNOWN NODES
-            if (unknownNodes == null) {
-                unknownNodes = new ArrayList<UnknownSchemaNode>();
-                for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
-                    unknownNodes.add(b.build());
-                }
-                Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
+            for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
+                unknownNodes.add(b.build());
             }
+            Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
             instance.setUnknownSchemaNodes(unknownNodes);
 
             isBuilt = true;
@@ -83,6 +83,43 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
         return instance;
     }
 
+    @Override
+    public SchemaPath getPath() {
+        return instance.path;
+    }
+
+    @Override
+    public String getDescription() {
+        return instance.description;
+    }
+
+    @Override
+    public void setDescription(final String description) {
+        instance.description = description;
+    }
+
+    @Override
+    public String getReference() {
+        return instance.reference;
+    }
+
+    @Override
+    public void setReference(final String reference) {
+        instance.reference = reference;
+    }
+
+    @Override
+    public Status getStatus() {
+        return instance.status;
+    }
+
+    @Override
+    public void setStatus(Status status) {
+        if (status != null) {
+            instance.status = status;
+        }
+    }
+
     void setInput(final ContainerSchemaNodeBuilder inputBuilder) {
         this.inputBuilder = inputBuilder;
     }
@@ -147,20 +184,21 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
         return "rpc " + qname.getLocalName();
     }
 
-    private final class RpcDefinitionImpl implements RpcDefinition {
+    private static final class RpcDefinitionImpl implements RpcDefinition {
         private final QName qname;
-        private SchemaPath path;
+        private final SchemaPath path;
         private String description;
         private String reference;
         private Status status;
         private ContainerSchemaNode input;
         private ContainerSchemaNode output;
-        private Set<TypeDefinition<?>> typeDefinitions;
-        private Set<GroupingDefinition> groupings;
-        private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
+        private final Set<TypeDefinition<?>> typeDefinitions = new HashSet<>();
+        private final Set<GroupingDefinition> groupings = new HashSet<>();
+        private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
 
-        private RpcDefinitionImpl(final QName qname) {
+        private RpcDefinitionImpl(final QName qname, final SchemaPath path) {
             this.qname = qname;
+            this.path = path;
         }
 
         @Override
@@ -173,37 +211,21 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
             return path;
         }
 
-        private void setPath(SchemaPath path) {
-            this.path = path;
-        }
-
         @Override
         public String getDescription() {
             return description;
         }
 
-        private void setDescription(String description) {
-            this.description = description;
-        }
-
         @Override
         public String getReference() {
             return reference;
         }
 
-        private void setReference(String reference) {
-            this.reference = reference;
-        }
-
         @Override
         public Status getStatus() {
             return status;
         }
 
-        private void setStatus(Status status) {
-            this.status = status;
-        }
-
         @Override
         public ContainerSchemaNode getInput() {
             return input;
@@ -224,30 +246,30 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
 
         @Override
         public Set<TypeDefinition<?>> getTypeDefinitions() {
-            return typeDefinitions;
+            return Collections.unmodifiableSet(typeDefinitions);
         }
 
         private void setTypeDefinitions(Set<TypeDefinition<?>> typeDefinitions) {
-            this.typeDefinitions = typeDefinitions;
+            this.typeDefinitions.addAll(typeDefinitions);
         }
 
         @Override
         public Set<GroupingDefinition> getGroupings() {
-            return groupings;
+            return Collections.unmodifiableSet(groupings);
         }
 
         private void setGroupings(Set<GroupingDefinition> groupings) {
-            this.groupings = groupings;
+            this.groupings.addAll(groupings);
         }
 
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-            return unknownNodes;
+            return Collections.unmodifiableList(unknownNodes);
         }
 
         private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownNodes) {
             if (unknownNodes != null) {
-                this.unknownNodes = unknownNodes;
+                this.unknownNodes.addAll(unknownNodes);
             }
         }
 
@@ -291,11 +313,17 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
 
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder(RpcDefinitionImpl.class.getSimpleName() + "[");
-            sb.append("qname=" + qname);
-            sb.append(", path=" + path);
-            sb.append(", input=" + input);
-            sb.append(", output=" + output + "]");
+            StringBuilder sb = new StringBuilder(RpcDefinitionImpl.class.getSimpleName());
+            sb.append("[");
+            sb.append("qname=");
+            sb.append(qname);
+            sb.append(", path=");
+            sb.append(path);
+            sb.append(", input=");
+            sb.append(input);
+            sb.append(", output=");
+            sb.append(output);
+            sb.append("]");
             return sb.toString();
         }
     }