X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-java-api-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjava%2Fapi%2Fgenerator%2FBaseTemplate.xtend;h=71005ca2ac6b1c9fb8b45c0911573bb7328251b5;hb=62d1bb7f2cf0c96ce34ca181462132dc95555daf;hp=f9877fb359cae42d757393f009badb34d4f7ee48;hpb=860f36ab6a68326578dfe4add51c093bb33fd218;p=mdsal.git
diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
index f9877fb359..71005ca2ac 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend
@@ -19,6 +19,7 @@ import java.util.Locale
import java.util.Map.Entry
import java.util.StringTokenizer
import java.util.regex.Pattern
+import org.opendaylight.mdsal.binding.model.api.AnnotationType
import org.opendaylight.mdsal.binding.model.api.ConcreteType
import org.opendaylight.mdsal.binding.model.api.Constant
import org.opendaylight.mdsal.binding.model.api.GeneratedProperty
@@ -30,6 +31,7 @@ import org.opendaylight.mdsal.binding.model.api.Type
import org.opendaylight.mdsal.binding.model.api.TypeMember
import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Single
import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Multiple
+import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil
import org.opendaylight.mdsal.binding.model.util.TypeConstants
import org.opendaylight.mdsal.binding.model.util.Types
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping
@@ -108,10 +110,11 @@ abstract class BaseTemplate extends JavaFileTemplate {
protected def getterMethod(GeneratedProperty field) {
'''
public «field.returnType.importedName» «field.getterMethodName»() {
- «IF field.returnType.importedName.contains("[]")»
- return «field.fieldName» == null ? null : «field.fieldName».clone();
+ «val fieldName = field.fieldName»
+ «IF field.returnType.name.endsWith("[]")»
+ return «fieldName» == null ? null : «fieldName».clone();
«ELSE»
- return «field.fieldName»;
+ return «fieldName»;
«ENDIF»
}
'''
@@ -154,7 +157,7 @@ abstract class BaseTemplate extends JavaFileTemplate {
* group of generated property instances which are transformed to the sequence of parameter names
* @return string with the list of the parameter names of the parameters
*/
- def final protected asArguments(Iterable parameters) '''«IF !parameters.empty»«FOR parameter : parameters SEPARATOR ", "»«parameter.
+ def final protected asArguments(Collection parameters) '''«IF !parameters.empty»«FOR parameter : parameters SEPARATOR ", "»«parameter.
fieldName»«ENDFOR»«ENDIF»'''
/**
@@ -283,7 +286,7 @@ abstract class BaseTemplate extends JavaFileTemplate {
def private static void appendYangSnippet(StringBuilder sb, ModuleEffectiveStatement module,
DeclaredStatement> stmt) {
for (String str : YANG_FORMATTER.toYangTextSnippet(module, stmt)) {
- sb.append(encodeAngleBrackets(encodeJavadocSymbols(str)))
+ sb.append(BindingGeneratorUtil.replaceAllIllegalChars(encodeAngleBrackets(encodeJavadocSymbols(str))))
}
}
@@ -369,15 +372,11 @@ abstract class BaseTemplate extends JavaFileTemplate {
val nextElement = tokenizer.nextToken
if (lineBuilder.length != 0 && lineBuilder.length + nextElement.length > 80) {
- // FIXME: what tricks are we playing here? Equality probably does not trigger ever
- // and then the setLength()/append() combo does not work, either
- if (lineBuilder.charAt(lineBuilder.length - 1) == ' ') {
- lineBuilder.setLength(0)
- lineBuilder.append(lineBuilder.substring(0, lineBuilder.length - 1))
+ if (lineBuilder.charAt(lineBuilder.length - 1) == SPACE) {
+ lineBuilder.setLength(lineBuilder.length - 1)
}
- if (lineBuilder.charAt(0) == ' ') {
- lineBuilder.setLength(0)
- lineBuilder.append(lineBuilder.substring(1))
+ if (lineBuilder.length != 0 && lineBuilder.charAt(0) == SPACE) {
+ lineBuilder.deleteCharAt(0)
}
sb.append(lineBuilder).append(NEW_LINE)
@@ -453,19 +452,20 @@ abstract class BaseTemplate extends JavaFileTemplate {
«AbstractRangeGenerator.forType(actualType).generateRangeCheckerCall(property.getName.toFirstUpper, value + ".getValue()")»
«ENDIF»
«ENDIF»
+ «val fieldName = property.fieldName»
«IF restrictions.getLengthConstraint.isPresent»
«IF actualType instanceof ConcreteType»
- «LengthGenerator.generateLengthCheckerCall(property.fieldName.toString, value)»
+ «LengthGenerator.generateLengthCheckerCall(fieldName.toString, value)»
«ELSE»
- «LengthGenerator.generateLengthCheckerCall(property.fieldName.toString, value + ".getValue()")»
+ «LengthGenerator.generateLengthCheckerCall(fieldName.toString, value + ".getValue()")»
«ENDIF»
«ENDIF»
- «val fieldUpperCase = property.fieldName.toString.toUpperCase(Locale.ENGLISH)»
+ «val fieldUpperCase = fieldName.toString.toUpperCase(Locale.ENGLISH)»
«FOR currentConstant : type.getConstantDefinitions»
«IF currentConstant.getName.startsWith(TypeConstants.PATTERN_CONSTANT_NAME)
&& fieldUpperCase.equals(currentConstant.getName.substring(TypeConstants.PATTERN_CONSTANT_NAME.length))»
- «CodeHelpers.importedName».checkPattern(value, «Constants.MEMBER_PATTERN_LIST»«property.fieldName», «Constants.MEMBER_REGEX_LIST»«property.fieldName»);
+ «CodeHelpers.importedName».checkPattern(value, «Constants.MEMBER_PATTERN_LIST»«fieldName», «Constants.MEMBER_REGEX_LIST»«fieldName»);
«ENDIF»
«ENDFOR»
'''
@@ -477,4 +477,15 @@ abstract class BaseTemplate extends JavaFileTemplate {
result = prime * result + «property.importedUtilClass».hashCode(«property.fieldName»);
«ENDFOR»
'''
+
+ def protected final generateAnnotation(AnnotationType annotation) '''
+ @«annotation.importedName»
+ «IF annotation.parameters !== null && !annotation.parameters.empty»
+ (
+ «FOR param : annotation.parameters SEPARATOR ","»
+ «param.name»=«param.value»
+ «ENDFOR»
+ )
+ «ENDIF»
+ '''
}