Optimize fixCasesByJavaType for packages

Rather than doing expensive String.replaceAll(), use CharMatcher's
removeFrom().

Change-Id: I1748fdb3fe11246b81b598cba12ddf166ee3cb4e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 245a006423d41d1d4946d6a40b2f3311525f897a)

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 8667cf3a269f7766e19374ce9b6d29f67428d014..8ff3763dd01847f15c2db5687e38b067b5ed8c6f 100644 (file)
--- 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
@@ -209,13 +209,13 @@ public final class JavaIdentifierNormalizer {
     private static final int FIRST_INDEX = 1;
     private static final char UNDERSCORE = '_';
     private static final char DASH = '-';
-    private static final String EMPTY_STRING = "";
     private static final String RESERVED_KEYWORD = "reserved_keyword";
     private static final ListMultimap<String, String> PACKAGES_MAP = ArrayListMultimap.create();
     private static final Set<String> 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 CharMatcher UNDERSCORE_MATCHER = CharMatcher.is(UNDERSCORE);
     private static final Splitter DOT_SPLITTER = Splitter.on('.');
     private static final Splitter UNDERSCORE_SPLITTER = Splitter.on(UNDERSCORE);
 
@@ -473,7 +473,7 @@ public final class JavaIdentifierNormalizer {
             case VARIABLE:
                 return fixCases(convertedIdentifier);
             case PACKAGE:
-                return convertedIdentifier.replaceAll(String.valueOf(UNDERSCORE), EMPTY_STRING);
+                return UNDERSCORE_MATCHER.removeFrom(convertedIdentifier);
             default:
                 throw new IllegalArgumentException("Unknown java type of identifier : " + javaIdentifier.toString());
         }