Clean up variable initialization

We can make local variable final and non-null, improving logic
flow in this method.

Change-Id: I2695acd5cccdef0da61b1f3e246fd9dbcb2e08a2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 4f82372f6b3d07663d2ead494fd151e0dfc83a7f)

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
index 076d6527c906fec4197a2474dce00a4f2773e86f..89074be4c33293e491f7fc319c93dc5a54a0485b 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
@@ -86,9 +86,11 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
             caseCandidate.getClass());
         final CaseSchemaNode caseNode = (CaseSchemaNode) caseCandidate;
 
-        AugmentationSchemaNode augSchema = null;
+        final AugmentationSchemaNode augSchema;
         if (choiceCandidate.isAugmenting()) {
             augSchema = findCorrespondingAugment(getSchema(), choiceCandidate);
+        } else {
+            augSchema = null;
         }
 
         // looking for existing choice
@@ -110,7 +112,7 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
     }
 
     private AbstractNodeDataWithSchema<?> addSimpleChild(final DataSchemaNode schema) {
-        SimpleNodeDataWithSchema<?> newChild = null;
+        final SimpleNodeDataWithSchema<?> newChild;
         if (schema instanceof LeafSchemaNode) {
             newChild = new LeafNodeDataWithSchema((LeafSchemaNode) schema);
         } else if (schema instanceof AnyXmlSchemaNode) {
@@ -125,9 +127,11 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
             return null;
         }
 
-        AugmentationSchemaNode augSchema = null;
+        final AugmentationSchemaNode augSchema;
         if (schema.isAugmenting()) {
             augSchema = findCorrespondingAugment(getSchema(), schema);
+        } else {
+            augSchema = null;
         }
         if (augSchema != null) {
             augmentationsToChild.put(augSchema, newChild);
@@ -176,8 +180,8 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
         return newChild;
     }
 
-    void addCompositeChild(final CompositeNodeDataWithSchema<?> newChild) {
-        AugmentationSchemaNode augSchema = findCorrespondingAugment(getSchema(), newChild.getSchema());
+    final void addCompositeChild(final CompositeNodeDataWithSchema<?> newChild) {
+        final AugmentationSchemaNode augSchema = findCorrespondingAugment(getSchema(), newChild.getSchema());
         if (augSchema != null) {
             augmentationsToChild.put(augSchema, newChild);
         } else {