Do not generate GhoiceIn 31/72331/1
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 26 May 2018 09:08:22 +0000 (11:08 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 26 May 2018 09:08:22 +0000 (11:08 +0200)
It seems this break OFP, until we understand how, do not generate
the interface binding.

Change-Id: Ib24f0e1bfe1d6b3c1186e9d1057ab6bd43630cda
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java

index 13d3b064ba0ecc1b374cd8613cc9b85390251970..9080f046569ad3676723b0f12970aa0003536b97 100644 (file)
@@ -15,6 +15,7 @@ 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;
@@ -25,7 +26,6 @@ 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(choiceIn(parent));
+            choiceTypeBuilder.addImplementsType(DATA_CONTAINER);
             annotateDeprecatedIfNecessary(choiceNode.getStatus(), choiceTypeBuilder);
             context.addChildNodeType(choiceNode, choiceTypeBuilder);