X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2Fimpl%2FModuleContext.java;fp=binding%2Fmdsal-binding-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2Fimpl%2FModuleContext.java;h=e3b39ae3a31c00c4e9aaabcf762754e92aa369b8;hb=8d19626640b8f6cab9ed3e0f9908fa3c416956e5;hp=a769eabe96c6b053f2273326ddf6c49ad93c02d8;hpb=0ae97da04041d6cb57b07391325fabdf73271d38;p=mdsal.git

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java
index a769eabe96..e3b39ae3a3 100644
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java
@@ -25,8 +25,8 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -42,13 +42,13 @@ public final class ModuleContext {
     private final Map<QName,GeneratedTOBuilder> identities = new HashMap<>();
     private final Set<GeneratedTypeBuilder> topLevelNodes = new HashSet<>();
     private final List<GeneratedTypeBuilder> augmentations = new ArrayList<>();
-    private final BiMap<Type, AugmentationSchema> typeToAugmentation = HashBiMap.create();
+    private final BiMap<Type, AugmentationSchemaNode> typeToAugmentation = HashBiMap.create();
 
     private final Map<Type,Object> typeToSchema = new HashMap<>();
 
 
     private final Multimap<Type, Type> choiceToCases = HashMultimap.create();
-    private final BiMap<Type, ChoiceCaseNode> caseTypeToSchema = HashBiMap.create();
+    private final BiMap<Type, CaseSchemaNode> caseTypeToSchema = HashBiMap.create();
 
     private final Map<SchemaPath, Type> innerTypes = new HashMap<>();
 
@@ -173,22 +173,22 @@ public final class ModuleContext {
         return Collections.unmodifiableList(augmentations);
     }
 
-    public BiMap<Type, AugmentationSchema> getTypeToAugmentation() {
+    public BiMap<Type, AugmentationSchemaNode> getTypeToAugmentation() {
         return Maps.unmodifiableBiMap(typeToAugmentation);
     }
 
-    public void addTypeToAugmentation(final GeneratedTypeBuilder builder, final AugmentationSchema schema) {
+    public void addTypeToAugmentation(final GeneratedTypeBuilder builder, final AugmentationSchemaNode schema) {
         typeToAugmentation.put(builder, schema);
         typeToSchema.put(builder, schema);
     }
 
-    public void addChoiceToCaseMapping(final Type choiceType, final Type caseType, final ChoiceCaseNode schema) {
+    public void addChoiceToCaseMapping(final Type choiceType, final Type caseType, final CaseSchemaNode schema) {
         choiceToCases.put(choiceType, caseType);
         caseTypeToSchema.put(caseType, schema);
         typeToSchema.put(caseType, schema);
     }
 
-    public BiMap<Type, ChoiceCaseNode> getCaseTypeToSchemas() {
+    public BiMap<Type, CaseSchemaNode> getCaseTypeToSchemas() {
         return Maps.unmodifiableBiMap(caseTypeToSchema);
     }
 
@@ -196,7 +196,7 @@ public final class ModuleContext {
      *
      * Returns mapping of type to its schema.
      *
-     * Valid values are only instances of {@link DataSchemaNode} or {@link AugmentationSchema}
+     * Valid values are only instances of {@link DataSchemaNode} or {@link AugmentationSchemaNode}
      *
      * @return Mapping from type to corresponding schema
      */
@@ -204,7 +204,7 @@ public final class ModuleContext {
         return Collections.unmodifiableMap(typeToSchema);
     }
 
-    protected void addTypeToSchema(Type type, TypeDefinition<?> typedef) {
+    protected void addTypeToSchema(final Type type, final TypeDefinition<?> typedef) {
         typeToSchema.put(type, typedef);
     }
 
@@ -214,11 +214,11 @@ public final class ModuleContext {
      * @param path
      * @param enumBuilder
      */
-    void addInnerTypedefType(SchemaPath path, EnumBuilder enumBuilder) {
+    void addInnerTypedefType(final SchemaPath path, final EnumBuilder enumBuilder) {
         innerTypes.put(path, enumBuilder);
     }
 
-    public Type getInnerType(SchemaPath path) {
+    public Type getInnerType(final SchemaPath path) {
         return innerTypes.get(path);
     }