Narrow @SuppressModernizer

We are only suppressing the use of Guava's Objects in != operator, narrow
covered places.

Change-Id: I6b3ec8f78996227bae27558f9c04b22ed866595b
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 5d3c27f224730650771a90f5eed3ddc1873e0583..9faa3fd6959b5acd0ed947ee4c70e5291076ef31 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
@@ -20,7 +20,6 @@ import java.util.Map.Entry
 import java.util.StringTokenizer
 import java.util.regex.Pattern
 import org.eclipse.jdt.annotation.NonNull;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer
 import org.opendaylight.mdsal.binding.model.api.AnnotationType
 import org.opendaylight.mdsal.binding.model.api.ConcreteType
 import org.opendaylight.mdsal.binding.model.api.Constant
@@ -35,7 +34,6 @@ import org.opendaylight.mdsal.binding.model.ri.TypeConstants
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping
 import org.opendaylight.yangtools.yang.binding.BaseIdentity
 
-@SuppressModernizer
 abstract class BaseTemplate extends JavaFileTemplate {
     static final char NEW_LINE = '\n'
     static final char SPACE = ' '
@@ -263,7 +261,7 @@ abstract class BaseTemplate extends JavaFileTemplate {
                 sb.append(lineBuilder).append(NEW_LINE)
                 lineBuilder.setLength(0)
 
-                if (nextElement == " ") {
+                if (" ".equals(nextElement)) {
                     isFirstElementOnNewLineEmptyChar = !isFirstElementOnNewLineEmptyChar;
                 }
             }

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 2638e8a99cdad252eedb9782579f11c81f999f90..89443c26948b341d9bdfee6a19bad665e998cf6b 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,6 @@ import java.util.List
 import java.util.Map
 import java.util.Set
 import javax.management.ConstructorParameters
-import org.gaul.modernizer_maven_annotations.SuppressModernizer
 import org.opendaylight.mdsal.binding.model.api.ConcreteType
 import org.opendaylight.mdsal.binding.model.api.Constant
 import org.opendaylight.mdsal.binding.model.api.Enumeration
@@ -55,7 +54,6 @@ import org.opendaylight.yangtools.yang.common.Empty
 /**
  * Template for generating JAVA class.
  */
-@SuppressModernizer
 class ClassTemplate extends BaseTemplate {
     static val Comparator<GeneratedProperty> PROP_COMPARATOR = Comparator.comparing([prop | prop.name])
     static val VALUEOF_TYPES = Set.of(
@@ -338,7 +336,7 @@ class ClassTemplate extends BaseTemplate {
 
     def private genPatternEnforcer(String ref) '''
         «FOR c : consts»
-            «IF c.name == TypeConstants.PATTERN_CONSTANT_NAME»
+            «IF TypeConstants.PATTERN_CONSTANT_NAME.equals(c.name)»
             «CODEHELPERS.importedName».checkPattern(«ref», «Constants.MEMBER_PATTERN_LIST», «Constants.MEMBER_REGEX_LIST»);
             «ENDIF»
         «ENDFOR»
@@ -503,7 +501,7 @@ class ClassTemplate extends BaseTemplate {
     def protected constantsDeclarations() '''
         «IF !consts.empty»
             «FOR c : consts»
-                «IF c.name == TypeConstants.PATTERN_CONSTANT_NAME»
+                «IF TypeConstants.PATTERN_CONSTANT_NAME.equals(c.name)»
                     «val cValue = c.value as Map<String, String>»
                     «val jurPatternRef = JUR_PATTERN.importedName»
                     public static final «JU_LIST.importedName»<String> «TypeConstants.PATTERN_CONSTANT_NAME» = «ImmutableList.importedName».of(«

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
index 84c627c28e03af192f97626ebc632b8ec5274345..15bcf35b97c00c18297d3ef259fde73bf2c35054 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
@@ -41,7 +41,6 @@ import org.opendaylight.mdsal.binding.model.ri.TypeConstants
 /**
  * Template for generating JAVA interfaces.
  */
- @SuppressModernizer
 class InterfaceTemplate extends BaseTemplate {
     /**
      * List of constant instances which are generated as JAVA public static final attributes.
@@ -116,7 +115,7 @@ class InterfaceTemplate extends BaseTemplate {
          «val annotations = method.annotations»
          «IF annotations !== null && !annotations.empty»
              «FOR annotation : annotations»
-                  «IF method.returnType != BOOLEAN || !(annotation.identifier == OVERRIDE)»
+                  «IF !BOOLEAN.equals(method.returnType) || !OVERRIDE.equals(annotation.identifier)»
                       «annotation.generateAnnotation»
                   «ENDIF»
              «ENDFOR»
@@ -201,6 +200,7 @@ class InterfaceTemplate extends BaseTemplate {
         «ENDIF»
     '''
 
+    @SuppressModernizer
     def private generateDefaultMethod(MethodSignature method) {
         if (method.name.isNonnullMethodName) {
             generateNonnullMethod(method)
@@ -210,13 +210,14 @@ class InterfaceTemplate extends BaseTemplate {
             switch method.name {
                 case BINDING_CONTRACT_IMPLEMENTED_INTERFACE_NAME : generateDefaultImplementedInterface
                 default :
-                    if (VOID == method.returnType.identifier) {
+                    if (VOID.equals(method.returnType.identifier)) {
                         generateNoopVoidInterfaceMethod(method)
                     }
             }
         }
     }
 
+    @SuppressModernizer
     def private generateStaticMethod(MethodSignature method) {
         switch method.name {
             case BINDING_EQUALS_NAME : generateBindingEquals

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 600bb69cd2910f40d25d63795e668c580ea7eb60..d982873700f7b8fb2a6bce215dc879d52692fdcc 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
@@ -19,7 +19,6 @@ import static extension org.opendaylight.mdsal.binding.model.ri.BindingTypes.isB
 import static extension org.opendaylight.mdsal.binding.model.ri.BindingTypes.isIdentityType
 
 import java.util.Base64;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer
 import org.opendaylight.mdsal.binding.model.api.Enumeration
 import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject
 import org.opendaylight.mdsal.binding.model.api.Type
@@ -27,7 +26,6 @@ import org.opendaylight.mdsal.binding.model.api.Type
 /**
  * Template for generating JAVA class.
  */
-@SuppressModernizer
 class UnionTemplate extends ClassTemplate {
     /**
      * Creates instance of this class with concrete <code>genType</code>.
@@ -75,7 +73,7 @@ class UnionTemplate extends ClassTemplate {
                 «ENDIF»
                 this.«property.fieldName» = «property.fieldName»;
                 «FOR other : finalProperties»
-                    «IF property != other»
+                    «IF !property.equals(other)»
                          this.«other.fieldName» = null;
                     «ENDIF»
                 «ENDFOR»

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
index f8e008b6c4e6d51d32c753ead8bef34ac0db7eb9..c6840aa3ccc9adcf95be0f58cf956bd506c56c20 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
@@ -22,7 +22,6 @@ import java.util.Set
 import java.util.TreeMap
 import java.util.function.Function
 import org.eclipse.xtend.lib.annotations.Accessors
-import org.gaul.modernizer_maven_annotations.SuppressModernizer
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo
 import org.opendaylight.yangtools.yang.common.Revision
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext
@@ -35,8 +34,7 @@ import org.opendaylight.yangtools.yang.model.api.Submodule
  * this class provides a static {@code createQName(String)} method, which is used by co-generated code to initialize
  * QNAME constants.
  */
-@SuppressModernizer
-class YangModuleInfoTemplate {
+final class YangModuleInfoTemplate {
     static val Comparator<Optional<Revision>> REVISION_COMPARATOR =
         [ Optional<Revision> first, Optional<Revision> second | Revision.compare(first, second) ]