From 18748923d6759e0e301b608e6d6bb15a69583bbb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 16 Aug 2019 15:32:11 +0200
Subject: [PATCH] Fix mergeable if-the-else statements

This fixes DTOs to use simple return expressions. While we are in
the area, also optimize toString() methods to lower their footprint.

Change-Id: Ie206c2942c5fb9b6cbbdc2a31d197560559fd660
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../binding/yang/types/NodeWrappedType.java   |  5 +-
 .../builder/AbstractTypeMemberBuilder.java    | 27 +++-------
 .../builder/MethodSignatureBuilderImpl.java   | 37 ++++----------
 .../type/builder/MethodSignatureImpl.java     | 51 +++++++------------
 .../mdsal/eos/common/api/GenericEntity.java   | 16 +-----
 5 files changed, 38 insertions(+), 98 deletions(-)

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/NodeWrappedType.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/NodeWrappedType.java
index 14dcd27af9..9d9f67e6c9 100644
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/NodeWrappedType.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/NodeWrappedType.java
@@ -42,10 +42,7 @@ public final class NodeWrappedType extends NodeImpl {
             return false;
         }
         NodeWrappedType nodeWrappedType = (NodeWrappedType) obj;
-        if (!wrappedType.equals(nodeWrappedType.wrappedType)) {
-            return false;
-        }
-        return true;
+        return wrappedType.equals(nodeWrappedType.wrappedType);
     }
 
     @Override
diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java
index e2b7cbc187..75a24ad475 100644
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java
@@ -131,10 +131,7 @@ abstract class AbstractTypeMemberBuilder<T extends TypeMemberBuilder<T>> impleme
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final AbstractTypeMemberBuilder<?> other = (AbstractTypeMemberBuilder<?>) obj;
@@ -143,20 +140,12 @@ abstract class AbstractTypeMemberBuilder<T extends TypeMemberBuilder<T>> impleme
 
     @Override
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("GeneratedPropertyImpl [name=");
-        builder.append(getName());
-        builder.append(", annotations=");
-        builder.append(getAnnotationBuilders());
-        builder.append(", comment=");
-        builder.append(getComment());
-        builder.append(", returnType=");
-        builder.append(getReturnType());
-        builder.append(", isFinal=");
-        builder.append(isFinal());
-        builder.append(", modifier=");
-        builder.append(getAccessModifier());
-        builder.append("]");
-        return builder.toString();
+        return new StringBuilder().append("GeneratedPropertyImpl [name=").append(getName())
+                .append(", annotations=").append(getAnnotationBuilders())
+                .append(", comment=").append(getComment())
+                .append(", returnType=").append(getReturnType())
+                .append(", isFinal=").append(isFinal())
+                .append(", modifier=").append(getAccessModifier())
+                .append(']').toString();
     }
 }
diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java
index a8e6247215..f82bbfa9d7 100644
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java
@@ -74,39 +74,22 @@ final class MethodSignatureBuilderImpl extends AbstractTypeMemberBuilder<MethodS
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final MethodSignatureBuilderImpl other = (MethodSignatureBuilderImpl) obj;
-        if (!Objects.equals(getName(), other.getName())) {
-            return false;
-        }
-        if (!Objects.equals(this.parameters, other.parameters)) {
-            return false;
-        }
-        if (!Objects.equals(getReturnType(), other.getReturnType())) {
-            return false;
-        }
-        return true;
+        return Objects.equals(getName(), other.getName())
+                && Objects.equals(this.parameters, other.parameters)
+                && Objects.equals(getReturnType(), other.getReturnType());
     }
 
     @Override
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("MethodSignatureBuilderImpl [name=");
-        builder.append(getName());
-        builder.append(", returnType=");
-        builder.append(getReturnType());
-        builder.append(", parameters=");
-        builder.append(this.parameters);
-        builder.append(", annotationBuilders=");
-        builder.append(getAnnotationBuilders());
-        builder.append(", comment=");
-        builder.append(getComment());
-        builder.append("]");
-        return builder.toString();
+        return new StringBuilder().append("MethodSignatureBuilderImpl [name=").append(getName())
+                .append(", returnType=").append(getReturnType())
+                .append(", parameters=").append(this.parameters)
+                .append(", annotationBuilders=").append(getAnnotationBuilders())
+                .append(", comment=").append(getComment())
+                .append(']').toString();
     }
 }
diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java
index 7d3b7a62f3..867e905b8e 100644
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java
@@ -15,7 +15,6 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.Type;
 
 class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature {
-
     private final List<Parameter> params;
     private final boolean isAbstract;
     private final boolean isDefault;
@@ -67,47 +66,31 @@ class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final MethodSignatureImpl other = (MethodSignatureImpl) obj;
-        if (!Objects.equals(getName(), other.getName())) {
-            return false;
-        }
-        if (!Objects.equals(this.params, other.params)) {
-            return false;
-        }
-        if (!Objects.equals(getReturnType(), other.getReturnType())) {
-            return false;
-        }
-        return true;
+        return Objects.equals(getName(), other.getName())
+                && Objects.equals(this.params, other.params)
+                && Objects.equals(getReturnType(), other.getReturnType());
     }
 
     @Override
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("MethodSignatureImpl [name=");
-        builder.append(getName());
-        builder.append(", comment=");
-        builder.append(getComment());
-        if (getDefiningType() != null) {
-            builder.append(", definingType=");
-            builder.append(getDefiningType().getPackageName());
-            builder.append(".");
-            builder.append(getDefiningType().getName());
+        final StringBuilder builder = new StringBuilder().append("MethodSignatureImpl [name=").append(getName())
+                .append(", comment=").append(getComment())
+                .append(", definingType=");
+
+        final Type defType = getDefiningType();
+        if (defType != null) {
+            builder.append(defType.getPackageName()).append('.').append(defType.getName());
         } else {
-            builder.append(", definingType= null");
+            builder.append(" null");
         }
-        builder.append(", returnType=");
-        builder.append(getReturnType());
-        builder.append(", params=");
-        builder.append(this.params);
-        builder.append(", annotations=");
-        builder.append(getAnnotations());
-        builder.append("]");
-        return builder.toString();
+
+        return builder.append(", returnType=").append(getReturnType())
+                .append(", params=").append(this.params)
+                .append(", annotations=").append(getAnnotations())
+                .append(']').toString();
     }
 }
diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java
index 2e7a0bec9d..3f5deea456 100644
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java
@@ -69,28 +69,16 @@ public class GenericEntity<T extends Path<T>> implements Serializable, Identifia
         return type;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
-
         if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-
-        GenericEntity<T> entity = (GenericEntity<T>) obj;
-
-        if (!id.equals(entity.id)) {
-            return false;
-        }
-
-        if (!type.equals(entity.type)) {
-            return false;
-        }
-
-        return true;
+        final GenericEntity<?> entity = (GenericEntity<?>) obj;
+        return id.equals(entity.id) && type.equals(entity.type);
     }
 
     @Override
-- 
2.36.6