From d0f30cd7654e3083e23eb49669cc9fb78d5dfd6a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 28 May 2018 17:10:11 +0200 Subject: [PATCH 1/1] Revert "Do not generate GhoiceIn" This reverts commit 4714aa33bf2538c6c8178f06bc362be8a2b8f9ce. Change-Id: I2bf320711df534e0df1405b67a33f670cf7f5a79 Signed-off-by: Robert Varga --- .../mdsal/binding/generator/impl/AbstractTypeGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index d617d685dc..f8c68f8b61 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -15,7 +15,6 @@ import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.com import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForAugmentedGeneratedType; import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForGeneratedType; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.BASE_IDENTITY; -import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_CONTAINER; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_OBJECT; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_ROOT; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.IDENTIFIABLE; @@ -26,6 +25,7 @@ import static org.opendaylight.mdsal.binding.model.util.BindingTypes.ROUTING_CON import static org.opendaylight.mdsal.binding.model.util.BindingTypes.RPC_SERVICE; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.augmentable; import static org.opendaylight.mdsal.binding.model.util.BindingTypes.childOf; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.choiceIn; import static org.opendaylight.mdsal.binding.model.util.Types.BOOLEAN; import static org.opendaylight.mdsal.binding.model.util.Types.FUTURE; import static org.opendaylight.mdsal.binding.model.util.Types.typeForClass; @@ -1049,7 +1049,7 @@ abstract class AbstractTypeGenerator { final GeneratedTypeBuilder choiceTypeBuilder = addRawInterfaceDefinition( JavaTypeName.create(packageNameForGeneratedType(context.modulePackageName(), choiceNode.getPath()), BindingMapping.getClassName(choiceNode.getQName())), choiceNode); - choiceTypeBuilder.addImplementsType(DATA_CONTAINER); + choiceTypeBuilder.addImplementsType(choiceIn(parent)); annotateDeprecatedIfNecessary(choiceNode.getStatus(), choiceTypeBuilder); context.addChildNodeType(choiceNode, choiceTypeBuilder); -- 2.36.6