Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / CaseEnforcer.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java
index 47301e353ff69737f6b4f592e2eafdcfeb3593e5..14dcd267e09c0959db527275c112bf08c3e3efa1 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/CaseEnforcer.java
@@ -13,6 +13,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Sets;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
@@ -26,17 +27,30 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 
-final class CaseEnforcer implements Immutable {
+class CaseEnforcer implements Immutable {
+    private static final class EnforcingMandatory extends CaseEnforcer {
+        private final MandatoryLeafEnforcer enforcer;
+
+        EnforcingMandatory(final ImmutableMap<NodeIdentifier, DataSchemaNode> children,
+                final ImmutableMap<AugmentationIdentifier, AugmentationSchemaNode> augmentations,
+                final MandatoryLeafEnforcer enforcer) {
+            super(children, augmentations);
+            this.enforcer = requireNonNull(enforcer);
+        }
+
+        @Override
+        void enforceOnTreeNode(final NormalizedNode normalizedNode) {
+            enforcer.enforceOnData(normalizedNode);
+        }
+    }
+
     private final ImmutableMap<NodeIdentifier, DataSchemaNode> children;
     private final ImmutableMap<AugmentationIdentifier, AugmentationSchemaNode> augmentations;
-    private final MandatoryLeafEnforcer enforcer;
 
-    private CaseEnforcer(final ImmutableMap<NodeIdentifier, DataSchemaNode> children,
-                         final ImmutableMap<AugmentationIdentifier, AugmentationSchemaNode> augmentations,
-                         final MandatoryLeafEnforcer enforcer) {
+    CaseEnforcer(final ImmutableMap<NodeIdentifier, DataSchemaNode> children,
+            final ImmutableMap<AugmentationIdentifier, AugmentationSchemaNode> augmentations) {
         this.children = requireNonNull(children);
         this.augmentations = requireNonNull(augmentations);
-        this.enforcer = requireNonNull(enforcer);
     }
 
     static CaseEnforcer forTree(final CaseSchemaNode schema, final DataTreeConfiguration treeConfig) {
@@ -58,31 +72,36 @@ final class CaseEnforcer implements Immutable {
         }
 
         final ImmutableMap<NodeIdentifier, DataSchemaNode> children = childrenBuilder.build();
-        return children.isEmpty() ? null : new CaseEnforcer(children, augmentationsBuilder.build(),
-            MandatoryLeafEnforcer.forContainer(schema, treeConfig));
+        if (children.isEmpty()) {
+            return null;
+        }
+        final ImmutableMap<AugmentationIdentifier, AugmentationSchemaNode> augmentations = augmentationsBuilder.build();
+        final Optional<MandatoryLeafEnforcer> enforcer = MandatoryLeafEnforcer.forContainer(schema, treeConfig);
+        return enforcer.isPresent() ? new EnforcingMandatory(children, augmentations, enforcer.get())
+                : new CaseEnforcer(children, augmentations);
     }
 
-    Set<Entry<NodeIdentifier, DataSchemaNode>> getChildEntries() {
+    final Set<Entry<NodeIdentifier, DataSchemaNode>> getChildEntries() {
         return children.entrySet();
     }
 
-    Set<NodeIdentifier> getChildIdentifiers() {
+    final Set<NodeIdentifier> getChildIdentifiers() {
         return children.keySet();
     }
 
-    Set<Entry<AugmentationIdentifier, AugmentationSchemaNode>> getAugmentationEntries() {
+    final Set<Entry<AugmentationIdentifier, AugmentationSchemaNode>> getAugmentationEntries() {
         return augmentations.entrySet();
     }
 
-    Set<AugmentationIdentifier> getAugmentationIdentifiers() {
+    final Set<AugmentationIdentifier> getAugmentationIdentifiers() {
         return augmentations.keySet();
     }
 
-    Set<PathArgument> getAllChildIdentifiers() {
+    final Set<PathArgument> getAllChildIdentifiers() {
         return Sets.union(children.keySet(), augmentations.keySet());
     }
 
-    void enforceOnTreeNode(final NormalizedNode<?, ?> normalizedNode) {
-        enforcer.enforceOnData(normalizedNode);
+    void enforceOnTreeNode(final NormalizedNode normalizedNode) {
+        // Default is no-op
     }
 }