Do not use EnumerationType in BindingRuntimeContext

This is a preparatory patch, which makes handling of enumerations based
on interfaces rather than a deprecated implementation.

Change-Id: I0b2f610d63df2f4151d620e1e7638b8bf01b9b36
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java
index 2c16ba45adfa7825862e6c84137c4d797b839373..bdcd7c719886e464611b7fd98ed0edb6e60c0487 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java
@@ -54,7 +54,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.EffectiveAugmentationSchema;
-import org.opendaylight.yangtools.yang.model.util.EnumerationType;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 import org.opendaylight.yangtools.yang.model.util.SchemaNodeUtils;
 import org.slf4j.Logger;
@@ -333,12 +332,12 @@ public class BindingRuntimeContext implements Immutable {
     private static BiMap<String, String> getEnumMapping(final Entry<GeneratedType, Object> typeWithSchema) {
         final TypeDefinition<?> typeDef = (TypeDefinition<?>) typeWithSchema.getValue();
 
-        final EnumerationType enumType;
+        final EnumTypeDefinition enumType;
         if(typeDef instanceof ExtendedType) {
-            enumType = (EnumerationType) ((ExtendedType) typeDef).getBaseType();
+            enumType = (EnumTypeDefinition) ((ExtendedType) typeDef).getBaseType();
         } else {
-            Preconditions.checkArgument(typeDef instanceof EnumerationType);
-            enumType = (EnumerationType) typeDef;
+            Preconditions.checkArgument(typeDef instanceof EnumTypeDefinition);
+            enumType = (EnumTypeDefinition) typeDef;
         }
 
         final HashBiMap<String, String> mappedEnums = HashBiMap.create();