Specialize relative leafref types during instantiation

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / java / api / generator / BaseTemplate.xtend

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 24ea00a0191f132dac0c1568ba06e06802bc5be0..224d212df5da03a771730e02dacb19d892f91ff3 100644 (file)
--- 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
@@ -102,20 +102,6 @@ abstract class BaseTemplate extends JavaFileTemplate {
         "_" + property.name
     }
 
-    final protected static def propertyNameFromGetter(MethodSignature getter) {
-        var String prefix;
-        if (getter.name.startsWith(BindingMapping.BOOLEAN_GETTER_PREFIX)) {
-            prefix = BindingMapping.BOOLEAN_GETTER_PREFIX
-        } else if (getter.name.startsWith(BindingMapping.GETTER_PREFIX)) {
-            prefix = BindingMapping.GETTER_PREFIX
-        } else if (getter.name.startsWith(BindingMapping.NONNULL_PREFIX)) {
-            prefix = BindingMapping.NONNULL_PREFIX
-        } else {
-            throw new IllegalArgumentException(getter + " is not a getter")
-        }
-        return getter.name.substring(prefix.length).toFirstLower;
-    }
-
     /**
      * Template method which generates the getter method for <code>field</code>
      *
@@ -124,7 +110,8 @@ abstract class BaseTemplate extends JavaFileTemplate {
      * @return string with the getter method source code in JAVA format
      */
     protected def getterMethod(GeneratedProperty field) '''
-        public «field.returnType.importedName» «field.getterMethodName»() {
+        «val methodName = field.getterMethodName»
+        public «field.returnType.importedName» «methodName»() {
             «val fieldName = field.fieldName»
             «IF field.returnType.name.endsWith("[]")»
             return «fieldName» == null ? null : «fieldName».clone();
@@ -132,11 +119,17 @@ abstract class BaseTemplate extends JavaFileTemplate {
             return «fieldName»;
             «ENDIF»
         }
+        «IF field.returnType == Types.BOOLEAN»
+
+        @«DEPRECATED.importedName»(forRemoval = true)
+        public final «field.returnType.importedName» «BindingMapping.BOOLEAN_GETTER_PREFIX»«field.name.toFirstUpper»() {
+            return «methodName»();
+        }
+        «ENDIF»
     '''
 
     final protected def getterMethodName(GeneratedProperty field) {
-        val prefix = if(field.returnType.equals(Types.BOOLEAN)) "is" else "get"
-        return '''«prefix»«field.name.toFirstUpper»'''
+        return '''«BindingMapping.GETTER_PREFIX»«field.name.toFirstUpper»'''
     }
 
     /**