From 19c2c0e406c222de7b8378fbef82696133fd58b0 Mon Sep 17 00:00:00 2001 From: Jie Han Date: Thu, 22 Mar 2018 16:05:22 +0800 Subject: [PATCH] Binding v2 - Fix setter constant naming - ported from: https://git.opendaylight.org/gerrit/69658 Change-Id: Ia86cbdc88e6dd6a87430df467b6d61f11010f6c5 Signed-off-by: Jie Han --- .../javav2/generator/impl/GenHelperUtil.java | 3 +-- .../java/api/generator/builderTemplate.scala.txt | 5 ++--- .../api/generator/constantsTemplate.scala.txt | 15 ++++++++------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java index ee592c584d..316deadec2 100755 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java @@ -836,8 +836,7 @@ final class GenHelperUtil { if (!patternConstraints.isEmpty()) { final StringBuilder field = new StringBuilder(); field.append(BindingMapping.PATTERN_CONSTANT_NAME).append("_") - .append(JavaIdentifierNormalizer.normalizeSpecificIdentifier(leafName, JavaIdentifier.CLASS) - .toUpperCase()); + .append(JavaIdentifierNormalizer.normalizeSpecificIdentifier(leafName, JavaIdentifier.METHOD)); typeBuilder.addConstant(Types.listTypeFor(BaseYangTypes.STRING_TYPE), field.toString(), resolveRegExpressions(patternConstraints)); } diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt index 5a74bdb55f..fa064425a0 100755 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt @@ -343,9 +343,8 @@ public class @{genType.getName}Builder implements @{getSimpleNameForBuilder} <@{ @for(currentConstant <- genType.getConstantDefinitions) { @defining(fieldName(field)) { suffix => @if(currentConstant.getName.startsWith(BindingMapping.PATTERN_CONSTANT_NAME) - && suffix.toUpperCase().equals(currentConstant.getName.substring(BindingMapping.PATTERN_CONSTANT_NAME.length)) - && currentConstant.getValue.isInstanceOf[List[_]]) { - @{importedNames.get("codeHelpers")}.checkPattern(value, @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix}, @{BindingMapping.MEMBER_REGEX_LIST}@{suffix}; + && suffix.equals(currentConstant.getName.substring(BindingMapping.PATTERN_CONSTANT_NAME.length))) { + @{importedNames.get("codeHelpers")}.checkPattern(value, @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix}, @{BindingMapping.MEMBER_REGEX_LIST}@{suffix}); } } } diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/constantsTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/constantsTemplate.scala.txt index f9093b0cd8..14e075c39d 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/constantsTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/constantsTemplate.scala.txt @@ -19,16 +19,17 @@ @for(c <- genType.getConstantDefinitions) { @if(c.getName.startsWith(BindingMapping.PATTERN_CONSTANT_NAME)) { @if(!qnameOnly) { - @defining(c.getName.substring(BindingMapping.PATTERN_CONSTANT_NAME.length).toLowerCase) { suffix => + @defining(c.getName.substring(BindingMapping.PATTERN_CONSTANT_NAME.length)) { suffix => @defining(c.getValue.asInstanceOf[Map[String, String]]) { cValue => - public static final @{importedNames.get("list")}<@{importedNames.get("string")}> @{c.getName} = @{importedNames.get("immutableList")}.of( - @{(cValue.keySet map {escapeJava}).mkString("\"", "\", \"", "\"")}); @if(cValue.size == 1) { - private static final @{importedNames.get("pattern")} @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix} = @{importedNames.get("pattern")}.compile(@{c.getName}.get(0)); - private static final String @{BindingMapping.MEMBER_REGEX_LIST}@{suffix} = "@{escapeJava(cValue.values.stream.findFirst.get)}"; + private static final @{importedNames.get("pattern")} @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix} = + @{importedNames.get("pattern")}.compile("@{escapeJava(cValue.keySet.head)}"); + private static final @{importedNames.get("string")} @{BindingMapping.MEMBER_REGEX_LIST}@{suffix} = "@{escapeJava(cValue.values.head)}"; } else { - private static final @{importedNames.get("pattern")}[] @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix} = @{importedNames.get("codeHelpers")}.compilePatterns(@{c.getName}); - private static final String[] @{BindingMapping.MEMBER_REGEX_LIST}@{suffix} = { + private static final @{importedNames.get("pattern")}[] @{BindingMapping.MEMBER_PATTERN_LIST}@{suffix} = + @{importedNames.get("codeHelpers")}.compilePatterns(@{importedNames.get("immutableList")}.of( + @{(cValue.keySet map {escapeJava}).mkString("\"", "\", \"", "\"")})); + private static final @{importedNames.get("string")}[] @{BindingMapping.MEMBER_REGEX_LIST}@{suffix} = { @{(cValue.keySet map {escapeJava}).mkString("\"", "\", \"", "\"")} }; }}}} -- 2.36.6