BUG-2606: add support for removing augmentations

This patch adds an explicit removeAugmentation() method to the builder.

Change-Id: I2111da008485512930dc2cfe551a787106c5f599
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
index 8f3f45fd326674c749932586cc1816ee419a3d68..3a53ad2a9396f602818caa90c049fa249230c43b 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
@@ -455,10 +455,14 @@ class BuilderTemplate extends BaseTemplate {
 
             public «type.name»«BUILDER» add«augmentField.name.toFirstUpper»(«Class.importedName»<? extends «augmentField.returnType.importedName»> augmentationType, «augmentField.returnType.importedName» augmentation) {
                 if (augmentation == null) {
-                    this.«augmentField.name».remove(augmentationType);
-                } else {
-                    this.«augmentField.name».put(augmentationType, augmentation);
+                    return remove«augmentField.name.toFirstUpper»(augmentationType);
                 }
+                this.«augmentField.name».put(augmentationType, augmentation);
+                return this;
+            }
+
+            public «type.name»«BUILDER» remove«augmentField.name.toFirstUpper»(«Class.importedName»<? extends «augmentField.returnType.importedName»> augmentationType) {
+                this.«augmentField.name».remove(augmentationType);
                 return this;
             }
         «ENDIF»