Rework AugmentRuntimeType and Choice/Case linkage

[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / rt / AbstractCompositeRuntimeType.java

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java
index d67f1cf94c7ed0f57eb17f9c2af684dbc7f1dfe1..85ecec6148b4279d5a04ee97cda338b8ae2ca89b 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java
@@ -11,13 +11,11 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Functions;
 import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
-import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.GeneratedRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.RuntimeType;
@@ -29,26 +27,10 @@ abstract class AbstractCompositeRuntimeType<S extends EffectiveStatement<?, ?>>
         extends AbstractRuntimeType<S, GeneratedType> implements CompositeRuntimeType {
     private final ImmutableMap<JavaTypeName, GeneratedRuntimeType> byClass;
     private final ImmutableMap<QName, RuntimeType> bySchemaTree;
-    private final @NonNull ImmutableList<AugmentRuntimeType> augments;
-    private final @NonNull ImmutableList<AugmentRuntimeType> mismatchedAugments;
 
-    AbstractCompositeRuntimeType(final GeneratedType bindingType, final S statement, final List<RuntimeType> children,
-            final List<AugmentRuntimeType> augments) {
+    AbstractCompositeRuntimeType(final GeneratedType bindingType, final S statement, final List<RuntimeType> children) {
         super(bindingType, statement);
 
-        final var substatements = statement.effectiveSubstatements();
-        final var correctBuilder = ImmutableList.<AugmentRuntimeType>builder();
-        final var mismatchedBuilder = ImmutableList.<AugmentRuntimeType>builder();
-        for (var aug : augments) {
-            if (substatements.contains(aug.statement())) {
-                correctBuilder.add(aug);
-            } else {
-                mismatchedBuilder.add(aug);
-            }
-        }
-        this.augments = correctBuilder.build();
-        this.mismatchedAugments = mismatchedBuilder.build();
-
         byClass = children.stream()
             .filter(GeneratedRuntimeType.class::isInstance)
             .map(GeneratedRuntimeType.class::cast)
@@ -65,16 +47,6 @@ abstract class AbstractCompositeRuntimeType<S extends EffectiveStatement<?, ?>>
         bySchemaTree = builder.build();
     }
 
-    @Override
-    public final List<AugmentRuntimeType> augments() {
-        return augments;
-    }
-
-    @Override
-    public final List<AugmentRuntimeType> mismatchedAugments() {
-        return mismatchedAugments;
-    }
-
     @Override
     public final RuntimeType schemaTreeChild(final QName qname) {
         return bySchemaTree.get(requireNonNull(qname));