Fix bad message formatting

Change-Id: Id95d805362ba7971fc61b36cdcd008e12fe7ceac
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/BaseTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
index 07315c4a728df7555ad9685e9e0ca6f8d480d9af..a6591fce91c014e8bf1c2b851227ef5163c8c3c3 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
@@ -240,7 +240,7 @@ abstract class BaseTemplate {
                 }
             }
             if (!isValidRange) {
-                throw new IllegalArgumentException(String.format("Invalid range: {}, expected: {}.", «paramName», rangeConstraints));
+                throw new IllegalArgumentException(String.format("Invalid range: %s, expected: %s.", «paramName», rangeConstraints));
             }
         }
     '''

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
index a1df00c3607c78eacd3e1dd591fa1532fc67b5df..0a67eb92671ce2488db3070b2b6d6fe7a3168666 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
@@ -423,7 +423,7 @@ public class CompilationTest extends BaseCompilationTest {
         List<Range<BigDecimal>> rangeConstraints = new ArrayList<>();
         rangeConstraints.add(Range.closed(new BigDecimal("1.5"), new BigDecimal("5.5")));
         arg = new BigDecimal("1.4");
-        expectedMsg = String.format("Invalid range: {}, expected: {}.", arg, rangeConstraints);
+        expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, rangeConstraints);
         assertContainsRestrictionCheck(builderObj, m, expectedMsg, arg);
 
         cleanUp(sourcesOutputDir, compiledOutputDir);

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
index 6f6751a5e2c29225bca5922fbe241884320d8850..01676430dd0df5759e83de06f6d903be41ea94c6 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
@@ -132,7 +132,7 @@ public class TypedefCompilationTest extends BaseCompilationTest {
         List<Range<Integer>> rangeConstraints = new ArrayList<>();
         rangeConstraints.add(Range.closed(new Integer("2"), new Integer("2147483647")));
         Object arg = new Integer("1");
-        String expectedMsg = String.format("Invalid range: {}, expected: {}.", arg, rangeConstraints);
+        String expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, rangeConstraints);
         assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
         obj = expectedConstructor.newInstance(new Integer("159"));
         assertEquals(obj, defInst.invoke(null, "159"));
@@ -153,7 +153,7 @@ public class TypedefCompilationTest extends BaseCompilationTest {
         rangeConstraints.add(Range.closed(new Integer("3"), new Integer("9")));
         rangeConstraints.add(Range.closed(new Integer("11"), new Integer("2147483647")));
         arg = new Integer("10");
-        expectedMsg = String.format("Invalid range: {}, expected: {}.", arg, rangeConstraints);
+        expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, rangeConstraints);
         assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
         obj = expectedConstructor.newInstance(new Integer("2147483647"));
         assertEquals(obj, defInst.invoke(null, "2147483647"));
@@ -229,7 +229,7 @@ public class TypedefCompilationTest extends BaseCompilationTest {
         List<Range<BigDecimal>> decimalRangeConstraints = new ArrayList<>();
         decimalRangeConstraints.add(Range.closed(new BigDecimal("1.5"), new BigDecimal("5.5")));
         arg = new BigDecimal("1.4");
-        expectedMsg = String.format("Invalid range: {}, expected: {}.", arg, decimalRangeConstraints);
+        expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, decimalRangeConstraints);
         assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
         obj = expectedConstructor.newInstance(new BigDecimal("3.14"));
         assertEquals(obj, defInst.invoke(null, "3.14"));