Merge "Revert "BUG-1097: implemented check for null or empty list in builder classes.""

[mdsal.git] / code-generator / binding-java-api-generator / src / main / java / org / opendaylight / yangtools / sal / java / api / generator / BuilderTemplate.xtend

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 7645504e6c7584a1f1c3d2857e0bc6197383caa2..94f63e996f444a5b4ec86dfbd8121e8e770a83f9 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
@@ -31,7 +31,6 @@ import java.util.Collection
 import org.opendaylight.yangtools.yang.binding.Identifiable
 import com.google.common.collect.Range
 import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType
-import com.google.common.collect.ImmutableList
 
 /**
  * Template for generating JAVA builder classes. 
@@ -537,15 +536,7 @@ class BuilderTemplate extends BaseTemplate {
                 }
             «ENDIF»
             «FOR field : allProps»
-                «IF List.canonicalName.equals(field.returnType.fullyQualifiedName)»
-                    if (base.«field.getterMethodName»() == null || base.«field.getterMethodName»().isEmpty()) {
-                        this.«field.fieldName» = «Collections.importedName».emptyList();
-                    } else {
-                        this.«field.fieldName» = «ImmutableList.importedName».copyOf(base.«field.getterMethodName»());
-                    }
-                «ELSE»
-                    this.«field.fieldName» = base.«field.getterMethodName»();
-                «ENDIF»
+                this.«field.fieldName» = base.«field.getterMethodName»();
             «ENDFOR»
             «IF augmentField != null»
                 «IF !impl»if (base instanceof «type.name»«IMPL») {«ENDIF»
@@ -743,3 +734,4 @@ class BuilderTemplate extends BaseTemplate {
     '''
 
 }
+