From 7c27ea30965315981efd1673dd37266818554dfb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 20 Aug 2017 11:17:01 +0200 Subject: [PATCH] Revert "Revert "BUG-7262: Operational data tree should enforce mandatory nodes"" This reverts commit 7e8657de5bbcbcb098eca56df3445d155f20bb50. Change-Id: Ie976e7b5c64e53c812b0913ef9fb38cb3049a5ca Signed-off-by: Robert Varga --- .../yang/data/api/schema/tree/DataTreeConfiguration.java | 3 ++- .../yang/data/api/schema/tree/DataTreeConfigurationTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 b8eae24c3f..3f8c52b85f 100644 --- 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 0365aa163c..b3688baadf 100644 --- 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()); } } -- 2.36.6