Fix remaining Sonar code smells

[aai/babel.git] / src / test / java / org / onap / aai / babel / csar / fixture / TestArtifactInfoImpl.java

diff --git a/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java b/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
index dfca951..6c0078d 100644 (file)
--- a/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
+++ b/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
@@ -22,7 +22,7 @@ package org.onap.aai.babel.csar.fixture;
 
 import java.util.Objects;
 import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
 
 /**
  * This class is an implementation of IArtifactInfo for test purposes.
@@ -102,19 +102,18 @@ public class TestArtifactInfoImpl implements IArtifactInfo {
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
         if (!(obj instanceof TestArtifactInfoImpl)) {
             return false;
-        } else if (obj == this) {
-            return true;
         }
         TestArtifactInfoImpl rhs = (TestArtifactInfoImpl) obj;
-     // @formatter:off
-     return new EqualsBuilder()
-                  .append(artifactType, rhs.artifactType)
-                  .append(artifactDescription, rhs.artifactDescription)
-                  .append(artifactVersion, rhs.artifactVersion)
-                  .isEquals();
-     // @formatter:on
+        return new EqualsBuilder() //
+                .append(artifactType, rhs.artifactType) //
+                .append(artifactDescription, rhs.artifactDescription) //
+                .append(artifactVersion, rhs.artifactVersion) //
+                .isEquals();
     }
 
     @Override