From 50d9f2ba56f265b5b0b1a19e67ad569ecabf61c3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Jul 2017 11:23:35 +0200 Subject: [PATCH] Optimize JavaIdentifierNormalizer.convertFirst() Rather than fiddling around with temporary strings, perform a direct replacement capabilities of CharMatcher with two possible matches. Change-Id: I50c4f229ef38dcd9327da183372fc5e6d7c2faf3 Signed-off-by: Robert Varga --- .../javav2/generator/util/JavaIdentifierNormalizer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizer.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizer.java index 44cb795778..3c478051fd 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizer.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizer.java @@ -215,6 +215,7 @@ public final class JavaIdentifierNormalizer { private static final Set PRIMITIVE_TYPES = ImmutableSet.of("char[]", "byte[]"); private static final CharMatcher DASH_MATCHER = CharMatcher.is(DASH); + private static final CharMatcher DASH_OR_SPACE_MATCHER = CharMatcher.anyOf(" -"); private static final Splitter DOT_SPLITTER = Splitter.on('.'); private JavaIdentifierNormalizer() { @@ -526,12 +527,8 @@ public final class JavaIdentifierNormalizer { * @return converted char */ private static String convertFirst(final char c, final boolean existNext) { - String name = Character.getName(c); - if (name.contains(String.valueOf(DASH))) { - name = name.replaceAll(String.valueOf(DASH), String.valueOf(UNDERSCORE)); - } - name = existNext ? name + "_" : name; - return name.contains(" ") ? name.replaceAll(" ", "_") : name; + final String name = DASH_OR_SPACE_MATCHER.replaceFrom(Character.getName(c), UNDERSCORE); + return existNext ? name + '_' : name; } /** -- 2.36.6