From 245a006423d41d1d4946d6a40b2f3311525f897a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Jul 2017 12:10:01 +0200 Subject: [PATCH 1/1] Optimize fixCasesByJavaType for packages Rather than doing expensive String.replaceAll(), use CharMatcher's removeFrom(). Change-Id: I1748fdb3fe11246b81b598cba12ddf166ee3cb4e Signed-off-by: Robert Varga --- .../javav2/generator/util/JavaIdentifierNormalizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 60a3436184..a408f640ac 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 @@ -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 PACKAGES_MAP = ArrayListMultimap.create(); 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 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()); } -- 2.36.6