Revert "Revert "BUG-7262: Operational data tree should enforce mandatory nodes""

This reverts commit 7e8657de5bbcbcb098eca56df3445d155f20bb50.

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfiguration.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfiguration.java
index b8eae24c3fdde405ea189f4918f5cc5d12f76dcc..3f8c52b85f2ff570eb8dd080366a911493e378ea 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfiguration.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfiguration.java
@@ -42,7 +42,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 public class DataTreeConfiguration implements Immutable {
     public static final DataTreeConfiguration DEFAULT_CONFIGURATION = new Builder(TreeType.CONFIGURATION)
             .setMandatoryNodesValidation(true).build();
-    public static final DataTreeConfiguration DEFAULT_OPERATIONAL = new Builder(TreeType.OPERATIONAL).build();
+    public static final DataTreeConfiguration DEFAULT_OPERATIONAL = new Builder(TreeType.OPERATIONAL)
+            .setMandatoryNodesValidation(true).build();
 
     private final TreeType treeType;
     private final YangInstanceIdentifier rootPath;

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfigurationTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfigurationTest.java
index 0365aa163c81a49f6082d2187614afe5f4427c3d..b3688baadf550996a8a1223e74eb59c291c10fd2 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfigurationTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeConfigurationTest.java
@@ -44,6 +44,6 @@ public class DataTreeConfigurationTest {
         dataTreeConfiguration = DataTreeConfiguration.getDefault(TreeType.OPERATIONAL);
         assertEquals(TreeType.OPERATIONAL, dataTreeConfiguration.getTreeType());
         assertFalse(dataTreeConfiguration.isUniqueIndexEnabled());
-        assertFalse(dataTreeConfiguration.isMandatoryNodesValidationEnabled());
+        assertTrue(dataTreeConfiguration.isMandatoryNodesValidationEnabled());
     }
 }