From 2111fe7094b1d794f78ca175d806b7b211fb960d Mon Sep 17 00:00:00 2001 From: Jie Han Date: Mon, 17 Jul 2017 16:30:22 +0800 Subject: [PATCH] Binding generator v2 - uses statement - uses of cases - interface for case data extends interface for same case for referenced grouping Change-Id: If71de3c1361d87c5d6f4cf352e1fa9798a6e1ada Signed-off-by: Jie Han --- .../binding/javav2/generator/impl/AugmentToGenType.java | 5 ++++- .../mdsal/binding/javav2/generator/impl/GenHelperUtil.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java index 1f72bf5578..339ad82c79 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java @@ -8,6 +8,8 @@ package org.opendaylight.mdsal.binding.javav2.generator.impl; +import static org.opendaylight.mdsal.binding.javav2.generator.impl.GenHelperUtil.processUsesImplements; + import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -139,7 +141,7 @@ final class AugmentToGenType { verboseClassComments, resultCtx, genTypeBuilders, typeProvider); for (AugmentationSchema augSchema : schemaPathAugmentListEntry.getValue()) { - GenHelperUtil.processUsesImplements(augSchema, module, schemaContext, genCtx, BindingNamespaceType.Data); + processUsesImplements(augSchema, module, schemaContext, genCtx, BindingNamespaceType.Data); } } @@ -473,6 +475,7 @@ final class AugmentToGenType { GenHelperUtil.resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, childNodes, genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); + processUsesImplements(node, module, schemaContext, genCtx, namespaceType); } genCtx.get(module).addCaseType(caseNode.getPath(), caseTypeBuilder); genCtx.get(module).addChoiceToCaseMapping(targetType, caseTypeBuilder, node); 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 11ac9465a1..7f772fd68c 100644 --- 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 @@ -1065,6 +1065,7 @@ final class GenHelperUtil { genCtx, verboseClassComments), caseChildNodes, genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); } + processUsesImplements(caseNode, module, schemaContext, genCtx, namespaceType); } } } -- 2.36.6