Use Empty.value() instead of Empty.getInstance()

Empty..getInstance() is going away, do not generate references to it.

Change-Id: I9322032c8b4c6741d2608948fc98711f3ce2573c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 140fdfc2474786eb3b9cbf5217d39618597eeead)

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
index 12976e8e9e04cd158c6c1b66e7348c9c6fc3361e..f3b879d83e81eb8a61d4b4d35a0eb91599599e3a 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
@@ -69,7 +69,7 @@ public class QueryBuilderTest {
                     new SystemBuilder().setName("first").setAlarms(BindingMap.of(
                         new AlarmsBuilder()
                             .setId(Uint64.ZERO)
-                            .setCritical(Empty.getInstance())
+                            .setCritical(Empty.value())
                             .setAffectedUsers(BindingMap.of(
                                 // TODO: fill
                             )).build(),
@@ -80,14 +80,14 @@ public class QueryBuilderTest {
                             )).build(),
                         new AlarmsBuilder()
                             .setId(Uint64.TWO)
-                            .setCritical(Empty.getInstance())
+                            .setCritical(Empty.value())
                             .setAffectedUsers(BindingMap.of(
                                 // TODO: fill
                                 )).build())).build(),
                     new SystemBuilder().setName("second").setAlarms(BindingMap.of(
                         new AlarmsBuilder()
                         .setId(Uint64.ZERO)
-                        .setCritical(Empty.getInstance())
+                        .setCritical(Empty.value())
                         .setAffectedUsers(BindingMap.of(
                             // TODO: fill
                         )).build())).build()

diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/EmptyLeafTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/EmptyLeafTest.java
index 44edc5f4b0b8ad5f35386e30309a95e4fad724fa..3a7594a616663ddc24839b4a0dd6f647f4a4747a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/EmptyLeafTest.java
+++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/EmptyLeafTest.java
@@ -47,7 +47,7 @@ public class EmptyLeafTest extends AbstractBindingCodecTest {
     public void testCaseWithEmptyLeafType() {
         final TopLevelList withEmptyCase = new TopLevelListBuilder()
             .withKey(TOP_FOO_KEY)
-            .setChoiceInList(new EmptyLeafBuilder().setEmptyType(Empty.getInstance()).build())
+            .setChoiceInList(new EmptyLeafBuilder().setEmptyType(Empty.value()).build())
             .build();
         final Entry<YangInstanceIdentifier, NormalizedNode> dom = codecContext.toNormalizedNode(BA_TOP_LEVEL_LIST,
             withEmptyCase);

diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
index f0abb1d1fea146b0f53b6325139552a6c8b38062..28c89be391adff4953c924e1bf61779adfeca59e 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
+++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/TypedefTest.java
@@ -50,9 +50,9 @@ public class TypedefTest extends AbstractBindingCodecTest {
     @Test
     public void testTypedefEmptyType() {
         TestCont binding = new TestContBuilder()
-                .setEmptyLeaf(Empty.getInstance())
-                .setEmptyLeaf2(new TypedefEmpty(Empty.getInstance()))
-                .setEmptyLeaf3(Empty.getInstance())
+                .setEmptyLeaf(Empty.value())
+                .setEmptyLeaf2(new TypedefEmpty(Empty.value()))
+                .setEmptyLeaf3(Empty.value())
                 .build();
         final Entry<YangInstanceIdentifier, NormalizedNode> dom =
                 codecContext.toNormalizedNode(BA_TEST_CONT, binding);

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
index d6bb9522b7c80a65f89d9f940dbc757393ea9d9c..5f021cd6a83596b2cc14d6e0c1e69dfde2242cb1 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
@@ -414,7 +414,7 @@ class ClassTemplate extends BaseTemplate {
                     return new «genTO.name»(«Base64.importedName».getDecoder().decode(defaultValue));
                 «ELSEIF EMPTY_TYPE.equals(propType)»
                     «Preconditions.importedName».checkArgument(defaultValue.isEmpty(), "Invalid value %s", defaultValue);
-                    return new «genTO.name»(«Empty.importedName».getInstance());
+                    return new «genTO.name»(«Empty.importedName».value());
                 «ELSE»
                     return new «genTO.name»(new «propType.importedName»(defaultValue));
                 «ENDIF»