Merge pull request #552 from davidsowerby/revert-551-master

Revert "Fixed MessageFormat which is not working when the same argument is r…"
KrailOrg · Jun 9, 2016 · 8285f3d · 8285f3d
2 parents 7beae23 + c48cd5c
commit 8285f3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 26 deletions.
diff --git a/src/main/java/uk/q3c/util/MessageFormat.java b/src/main/java/uk/q3c/util/MessageFormat.java
@@ -115,17 +115,16 @@ private static String scanForParameters(String pattern, List<Integer> parameters
     }
 
     private static Object[] sortArguments(List<Integer> parameters, Object[] arguments, String pattern) {
-        try {
-            List<Object> sortedArguments = new ArrayList<>();
-            for (Integer i : parameters) {
-                sortedArguments.add(arguments[i]);
-            }
-            return sortedArguments.toArray();
-        } catch (IndexOutOfBoundsException e) {
-            Object[] args = new Object[] { parameters.size(), arguments.length, pattern };
-            log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, "
-                    + "and {} arguments. The pattern is: '{}'", args);
+        if (parameters.size() != arguments.length) {
+            Object[] args = new Object[]{parameters.size(), arguments.length, pattern};
+            log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " +
+                    "and {} arguments. The pattern is: '{}'", args);
             throw new RuntimeException();
         }
+        List<Object> sortedArguments = new ArrayList<>();
+        for (Integer i : parameters) {
+            sortedArguments.add(arguments[i]);
+        }
+        return sortedArguments.toArray();
     }
 }
diff --git a/src/test/java/uk/q3c/util/MessageFormatTest.java b/src/test/java/uk/q3c/util/MessageFormatTest.java
@@ -16,9 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class MessageFormatTest {
     @Test
     public void formatValid() {
@@ -32,20 +29,7 @@ public void formatValid() {
         assertThat(result).isEqualTo("This is a simple pattern where the parameters can be in any order");
 
     }
-
-    @Test
-    public void formatValidRepeatedArgument() {
-
-        // given
-        String pattern = "This is a {0} pattern where the same argument is {0}";
-        Object[] arguments = new Object[]{"repeated"};
-        // when
-        String result = MessageFormat.format(pattern, arguments);
-        // then
-        assertThat(result).isEqualTo("This is a repeated pattern where the same argument is repeated");
 
-    }
-
     @Test
     public void formatValidContiguous() {