Fix xtend warnings

xtend-maven-plugin-2.14.0 flushes out a few more warnings, fix them.

Change-Id: I07bfb4da699ec2c176bebd5b6b92289c0e65b002
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 27292a96a23d6468b4e13a6b774e8ac8959afad4..a642698f49fdad767505ba66191772079d6d55f6 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
@@ -46,14 +46,14 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement
 import org.opendaylight.yangtools.yang.model.export.DeclaredStatementFormatter
 
 abstract class BaseTemplate extends JavaFileTemplate {
-    private static final char NEW_LINE = '\n'
-    private static val AMP_MATCHER = CharMatcher.is('&')
-    private static val NL_MATCHER = CharMatcher.is(NEW_LINE)
-    private static val TAB_MATCHER = CharMatcher.is('\t')
-    private static val SPACES_PATTERN = Pattern.compile(" +")
-    private static val NL_SPLITTER = Splitter.on(NL_MATCHER)
-    private static val TAIL_COMMENT_PATTERN = Pattern.compile("*/", Pattern.LITERAL);
-    private static val YANG_FORMATTER = DeclaredStatementFormatter.builder()
+    static final char NEW_LINE = '\n'
+    static val AMP_MATCHER = CharMatcher.is('&')
+    static val NL_MATCHER = CharMatcher.is(NEW_LINE)
+    static val TAB_MATCHER = CharMatcher.is('\t')
+    static val SPACES_PATTERN = Pattern.compile(" +")
+    static val NL_SPLITTER = Splitter.on(NL_MATCHER)
+    static val TAIL_COMMENT_PATTERN = Pattern.compile("*/", Pattern.LITERAL);
+    static val YANG_FORMATTER = DeclaredStatementFormatter.builder()
         .addIgnoredStatement(YangStmtMapping.CONTACT)
         .addIgnoredStatement(YangStmtMapping.DESCRIPTION)
         .addIgnoredStatement(YangStmtMapping.REFERENCE)
@@ -68,7 +68,7 @@ abstract class BaseTemplate extends JavaFileTemplate {
         super(javaType, type)
     }
 
-    final public def generate() {
+    final def generate() {
         val _body = body()
         '''
             package «type.packageName»;

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
index ca6f3e7c560731184dad4a9d8c319b42d47fe96d..7eb7c2da585509cd4046539d1d2e14b7f454fdec 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
@@ -78,7 +78,7 @@ class BuilderTemplate extends BaseTemplate {
      */
     val Type keyType
 
-    private static val METHOD_COMPARATOR = new AlphabeticallyTypeMemberComparator<MethodSignature>();
+    static val METHOD_COMPARATOR = new AlphabeticallyTypeMemberComparator<MethodSignature>();
 
     /**
      * Constructs new instance of this class.
@@ -756,7 +756,7 @@ class BuilderTemplate extends BaseTemplate {
         «ENDIF»
     '''
 
-    def override generateToString(Collection<GeneratedProperty> properties) '''
+    override generateToString(Collection<GeneratedProperty> properties) '''
         «IF properties !== null»
             @«Override.importedName»
             public «String.importedName» toString() {
@@ -787,7 +787,7 @@ class BuilderTemplate extends BaseTemplate {
     '''
     }
 
-    override def protected String formatDataForJavaDoc(GeneratedType type) {
+    override protected String formatDataForJavaDoc(GeneratedType type) {
         val typeDescription = createDescription(type)
 
         return '''

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
index c9a20bfe658df4cafd0db4df54052597faed6fe0..7c713e101611609a97eef9c09b1c0c769e9c232c 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
@@ -40,7 +40,7 @@ class ClassTemplate extends BaseTemplate {
     protected val List<GeneratedProperty> properties
     protected val List<GeneratedProperty> finalProperties
     protected val List<GeneratedProperty> parentProperties
-    protected val Iterable<GeneratedProperty> allProperties;
+    protected val Iterable<GeneratedProperty> allProperties
     protected val Restrictions restrictions
 
     /**
@@ -53,9 +53,9 @@ class ClassTemplate extends BaseTemplate {
      */
     protected val List<Constant> consts
 
-    protected val GeneratedTransferObject genTO;
+    protected val GeneratedTransferObject genTO
 
-    private val AbstractRangeGenerator<?> rangeGenerator
+    val AbstractRangeGenerator<?> rangeGenerator
 
     /**
      * Creates instance of this class with concrete <code>genType</code>.

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionBuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionBuilderTemplate.xtend
index 5f660f0a10226c4fc51e8fad0cc411f8dee97ffc..d5958907b0ffb6728673e7d265e85a3b15110783 100755 (executable)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionBuilderTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionBuilderTemplate.xtend
@@ -24,7 +24,7 @@ class UnionBuilderTemplate extends ClassTemplate {
         super(genType)
     }
 
-    def override body() '''
+    override body() '''
         «wrapToDocumentation(formatDataForJavaDoc(type, getClarification()))»
         public class «type.name» {
             private «type.name»() {

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend
index 31b0892b3348c82cab8897401bb10f04f1b23531..40632b45353bcf32b8b50922c8994db8afb209ee 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend
@@ -173,7 +173,7 @@ class UnionTemplate extends ClassTemplate {
         '''
     }
 
-    override def isReadOnly(GeneratedProperty field) {
+    override isReadOnly(GeneratedProperty field) {
         return !"value".equals(field.name) && super.isReadOnly(field)
     }