BUG-4658: fix default value in BooleanType

The default value should be null. Also fix up an ancient test case. Also
fix leafref and identityref.

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
index 3783da14f9e9b43251b75354f971374cc51b9a79..e205052fcb24b07d1f286b9e4342166c87e546c1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
@@ -73,7 +73,7 @@ public final class BooleanType implements BooleanTypeDefinition {
      */
     @Override
     public Object getDefaultValue() {
-        return false;
+        return null;
     }
 
     /*

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
index 43def3464b4c8c7e9122e4aff1ccf90d1c0e3ea2..9f0ed190169f5dca0040fde597cb46bea88520b0 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java
@@ -57,7 +57,7 @@ public final class IdentityrefType implements IdentityrefTypeDefinition {
 
     @Override
     public Object getDefaultValue() {
-        return identity;
+        return null;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java
index 431e666cca6b84d7fb6730a5873d2d34ab40ad6b..0af2f8b35e5f2832a706675ca22d465034cc580a 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import org.junit.Test;
-import org.opendaylight.yangtools.yang.model.api.Status;
-
-import java.util.Collections;
-
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.model.api.Status;
 
 public class BooleanTypeTest {
 
@@ -36,10 +35,10 @@ public class BooleanTypeTest {
 
         assertEquals("Base type is null", null, boolType.getBaseType());
 
-        assertEquals("Default value is false", false, boolType.getDefaultValue());
+        assertNull("Default value is null", boolType.getDefaultValue());
 
         assertEquals("Status CURRENT", Status.CURRENT, boolType.getStatus());
 
         assertEquals("Should contain empty list", Collections.EMPTY_LIST, boolType.getUnknownSchemaNodes());
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java
index c2d5755db847e9bc520f1cc3a21d4da1301204b5..33447d8576d7941ac4e5a3af6480a0c20b30bca9 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LeafrefSpecificationEffectiveStatementImpl.java
@@ -68,7 +68,7 @@ public class LeafrefSpecificationEffectiveStatementImpl extends DeclaredEffectiv
 
     @Override
     public Object getDefaultValue() {
-        return this;
+        return null;
     }
 
     @Override

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java
index 98f6490b052097f9c64af5c10120c839efb47ff7..070db9e93ac696b1b7e1784eb99cfcbdeddc6a51 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/effective/build/test/EffectiveStatementTypeTest.java
@@ -310,7 +310,7 @@ public class EffectiveStatementTypeTest {
         assertEquals("/container-test/leaf-test", leafrefEff.getPathStatement().toString());
         assertNull(leafrefEff.getBaseType());
         assertEquals("", leafrefEff.getUnits());
-        assertEquals("leafref", ((LeafrefSpecificationEffectiveStatementImpl) leafrefEff.getDefaultValue()).argument());
+        assertNull("leafref", leafrefEff.getDefaultValue());
         assertNotNull(leafrefEff.toString());
         assertEquals("leafref", leafrefEff.getQName().getLocalName());
         assertEquals("CURRENT", leafrefEff.getStatus().toString());
@@ -497,4 +497,4 @@ public class EffectiveStatementTypeTest {
         assertEquals(1, stringEff.getLengthConstraints().size());
         assertNotNull(stringEff.getPatternConstraints());
     }
-}
\ No newline at end of file
+}