Binding generator v2 - code style & cleanup

Change-Id: I5b5d4ffcb0ea3e4f1d69158b02f665d55c3e2366
Signed-off-by: Jie Han <han.jie@zte.com.cn>
(cherry picked from commit 2763a0ab49214e98779452b250a0bd1d68c2c67f)

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
index 4ed8c68fabdca4fcc756a52c4eab4e15f945dece..fbe25ae6b56cfe1d78a41dca41fcd78790c30949 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
@@ -279,10 +279,10 @@ final class GenHelperUtil {
     private static QName createQNameFromSuperNode(final Module module, final Object node, final SchemaNode superChildNode) {
         QName childNodeQName = null;
         if (node instanceof Module) {
-            childNodeQName = QName.create(((Module)node).getNamespace(), ((Module)node).getRevision(),
+            childNodeQName = QName.create(((Module) node).getNamespace(), ((Module) node).getRevision(),
                     superChildNode.getQName().getLocalName());
         } else if (node instanceof SchemaNode) {
-            childNodeQName = QName.create(((SchemaNode)node).getQName(), superChildNode.getQName().getLocalName());
+            childNodeQName = QName.create(((SchemaNode) node).getQName(), superChildNode.getQName().getLocalName());
         } else if (node instanceof AugmentationSchema) {
             childNodeQName = QName.create(module.getNamespace(), module.getRevision(), superChildNode.getQName().getLocalName());
         } else {
@@ -292,24 +292,19 @@ final class GenHelperUtil {
         return childNodeQName;
     }
 
-    static void addUsesImplements(final SchemaNode superNode, final Module superModule,
+    private static void addUsesImplements(final SchemaNode superNode, final Module superModule,
             final Object node, final Module module, final SchemaContext schemaContext,
             Map<Module, ModuleContext> genCtx, final BindingNamespaceType namespaceType) {
-
         if (superNode instanceof DataNodeContainer) {
-            for (DataSchemaNode superChildNode : ((DataNodeContainer)superNode).getChildNodes()) {
+            for (DataSchemaNode superChildNode : ((DataNodeContainer) superNode).getChildNodes()) {
                 if (superChildNode instanceof DataNodeContainer || superChildNode instanceof ChoiceSchemaNode) {
                     final QName childQName = createQNameFromSuperNode(module, node, superChildNode);
-                    DataSchemaNode childNode = ((DataNodeContainer)node).getDataChildByName(childQName);
+                    DataSchemaNode childNode = ((DataNodeContainer) node).getDataChildByName(childQName);
                     Preconditions.checkNotNull(childNode, node.toString() + "->" + childQName.toString());
 
                     final GeneratedTypeBuilder type = genCtx.get(module).getChildNode(childNode.getPath());
                     final GeneratedTypeBuilder superType = genCtx.get(superModule).getChildNode(superChildNode.getPath());
 
-                    //TODO:delete this after supporting uses augment
-                    if (type == null || superType == null) {
-                        return;
-                    }
                     Preconditions.checkNotNull(type, module.toString() + "->" + childNode.getPath().toString());
                     Preconditions.checkNotNull(superType, superModule.toString() + "->" + superChildNode.getPath().toString());
                     type.addImplementsType(superType);
@@ -327,9 +322,9 @@ final class GenHelperUtil {
                 }
             }
         } else if (superNode instanceof ChoiceSchemaNode) {
-            for (ChoiceCaseNode superCaseNode : ((ChoiceSchemaNode)superNode).getCases()) {
+            for (ChoiceCaseNode superCaseNode : ((ChoiceSchemaNode) superNode).getCases()) {
                 final QName childQName = createQNameFromSuperNode(module, node, superCaseNode);
-                ChoiceCaseNode caseNode = ((ChoiceSchemaNode)node).getCaseNodeByName(childQName);
+                ChoiceCaseNode caseNode = ((ChoiceSchemaNode) node).getCaseNodeByName(childQName);
                 Preconditions.checkNotNull(caseNode, node.toString() + "->" + childQName.toString());
 
                 final GeneratedTypeBuilder type = genCtx.get(module).getCase(caseNode.getPath());
@@ -368,7 +363,7 @@ final class GenHelperUtil {
     static Map<Module, ModuleContext> processUsesImplements(final Object node, final Module module,
             final SchemaContext schemaContext, Map<Module, ModuleContext> genCtx, final BindingNamespaceType namespaceType) {
         if (node instanceof DataNodeContainer) {
-            for (final UsesNode usesNode : ((DataNodeContainer)node).getUses()) {
+            for (final UsesNode usesNode : ((DataNodeContainer) node).getUses()) {
                 final GroupingDefinition grouping = findGroupingNodeFromUses(module, schemaContext, node, usesNode);
                 final Module superModule = SchemaContextUtil.findParentModule(schemaContext, grouping);
                 addUsesImplements(grouping, superModule, node, module, schemaContext, genCtx, namespaceType);
@@ -397,16 +392,6 @@ final class GenHelperUtil {
         return null;
     }
 
-    static GeneratedTypeBuilder findKeyByPath(final SchemaPath path, final Map<Module, ModuleContext> genCtx) {
-        for (final ModuleContext ctx : genCtx.values()) {
-            final GeneratedTypeBuilder result = ctx.getKeyType(path);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
     static Map<Module, ModuleContext> addRawAugmentGenTypeDefinition(final Module module, final String augmentPackageName,
             final Type targetTypeRef, final SchemaNode targetNode, final List<AugmentationSchema> schemaPathAugmentListEntry,
             final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders, final Map<Module, ModuleContext> genCtx,