Bug 1193: Use format string correctly and fix corresponding unit test

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

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
index 20950f10b8f2561ef29d5ae9af9aa50c58a88a75..fc9535e0d2bd84386d3fd8545be3511bb22b6f06 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
@@ -225,7 +225,7 @@ abstract class BaseTemplate {
                 }
             }
             if (!isValidLength) {
-                throw new IllegalArgumentException(String.format("Invalid length: {}, expected: {}.", «paramName», lengthConstraints));
+                throw new IllegalArgumentException(String.format("Invalid length: %s, expected: %s.", «paramName», lengthConstraints));
             }
         }
     '''
@@ -263,18 +263,18 @@ abstract class BaseTemplate {
                 StringBuilder builder = new StringBuilder("«type.name» [");
                 boolean first = true;
 
-                «FOR i : 0..<properties.size»
-                    if («properties.get(i).fieldName» != null) {
+                «FOR property : properties»
+                    if («property.fieldName» != null) {
                         if (first) {
                             first = false;
                         } else {
                             builder.append(", ");
                         }
-                        builder.append("«properties.get(i).fieldName»=");
-                        «IF properties.get(i).returnType.name.contains("[")»
-                            builder.append(«Arrays.importedName».toString(«properties.get(i).fieldName»));
+                        builder.append("«property.fieldName»=");
+                        «IF property.returnType.name.contains("[")»
+                            builder.append(«Arrays.importedName».toString(«property.fieldName»));
                         «ELSE»
-                            builder.append(«properties.get(i).fieldName»);
+                            builder.append(«property.fieldName»);
                         «ENDIF»
                      }
                 «ENDFOR»