From f6f366b5532c51d9166ed68073f611097aec1db4 Mon Sep 17 00:00:00 2001 From: Jakub Dudycz Date: Mon, 12 Mar 2018 16:05:57 +0100 Subject: MessageFormatter unit tests Improved code coverage Change-Id: I8ef81c6c8efaa796d62d8913e7dfbf160bf3c02d Issue-ID: APPC-724 Signed-off-by: Jakub Dudycz --- .../src/main/java/org/onap/appc/util/MessageFormatter.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'appc-common/src/main/java') diff --git a/appc-common/src/main/java/org/onap/appc/util/MessageFormatter.java b/appc-common/src/main/java/org/onap/appc/util/MessageFormatter.java index 71ef40641..ba56867a0 100644 --- a/appc-common/src/main/java/org/onap/appc/util/MessageFormatter.java +++ b/appc-common/src/main/java/org/onap/appc/util/MessageFormatter.java @@ -32,13 +32,11 @@ import java.util.regex.Pattern; public class MessageFormatter { private final static String paramNameRegexGroupName = "paramName"; - private final static String paramRegex = "\\$\\{(?[^}$]+)\\}"; // start with ${ and - // after there is one - // or more characters - // that are not $ and - // not } and ended - // with } + /** + * start with ${ and after there is one or more characters that are not $ and not } and ended with } + */ + private final static String paramRegex = "\\$\\{(?[^}$]+)\\}"; public static String format(String messageTemplate, Map params) { if (StringUtils.isEmpty(messageTemplate)) @@ -69,7 +67,7 @@ public class MessageFormatter { public static List getParamsNamesList(String messageTemplate) { List paramsNames = null; if (!StringUtils.isEmpty(messageTemplate)) { - paramsNames = new ArrayList(); + paramsNames = new ArrayList<>(); Matcher m = Pattern.compile(paramRegex).matcher(messageTemplate); while (m.find()) { String paramName = m.group(paramNameRegexGroupName); -- cgit 1.2.3-korg