Use deepEquals.
- generated class potentially pass byte[] to this generated methods,
which end up as reference equality test.
This patch replaces them with deepEquals to guard against such scenario/
e.g., org.onosproject.yang.gen.v1.ietfsnmp.rev20141210.ietfsnmpcommunity.snmp.augmentedsnmpsnmp.community.name.DefaultBinaryName
Change-Id: I13deaf2adb287a663e6e89d19a4d70f453897e8b
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGenerator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGenerator.java
index c667056..95f4f82 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGenerator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGenerator.java
@@ -966,17 +966,13 @@
public static String getEqualsMethod(JavaAttributeInfo attr) {
String attributeName = attr.getAttributeName();
if (attributeName.contains(OPERATION_TYPE_ATTRIBUTE)) {
- return SIXTEEN_SPACE_INDENTATION + OBJECT_STRING + SUFFIX_S +
- NEW_LINE + SIXTEEN_SPACE_INDENTATION +
- PERIOD + EQUALS_STRING + OPEN_PARENTHESIS + attributeName +
- COMMA + NEW_LINE + SIXTEEN_SPACE_INDENTATION + SPACE + OTHER
- + PERIOD + attributeName + CLOSE_PARENTHESIS + SPACE + AND +
- AND;
+ return SIXTEEN_SPACE_INDENTATION + "Objects" + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION + ".deepEquals(" + attributeName + "," + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION + SPACE + OTHER + "." + attributeName + ") &&";
}
- return SIXTEEN_SPACE_INDENTATION + OBJECT_STRING + SUFFIX_S +
- PERIOD + EQUALS_STRING + OPEN_PARENTHESIS + attributeName +
- COMMA + SPACE + OTHER + PERIOD + attributeName +
- CLOSE_PARENTHESIS + SPACE + AND + AND;
+ return SIXTEEN_SPACE_INDENTATION +
+ "Objects.deepEquals(" + attributeName + ", " +
+ OTHER + "." + attributeName + ") &&";
}
/**
diff --git a/compiler/base/translator/src/test/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGeneratorTest.java b/compiler/base/translator/src/test/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGeneratorTest.java
index c0ea2b2..b8b86f9 100644
--- a/compiler/base/translator/src/test/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGeneratorTest.java
+++ b/compiler/base/translator/src/test/java/org/onosproject/yang/compiler/translator/tojava/utils/MethodsGeneratorTest.java
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.List;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertThat;
@@ -44,11 +45,9 @@
import static org.onosproject.yang.compiler.utils.UtilConstants.COMMA;
import static org.onosproject.yang.compiler.utils.UtilConstants.EIGHT_SPACE_INDENTATION;
import static org.onosproject.yang.compiler.utils.UtilConstants.EQUAL;
-import static org.onosproject.yang.compiler.utils.UtilConstants.EQUALS_STRING;
import static org.onosproject.yang.compiler.utils.UtilConstants.GET_METHOD_PREFIX;
import static org.onosproject.yang.compiler.utils.UtilConstants.JAVA_LANG;
import static org.onosproject.yang.compiler.utils.UtilConstants.NEW_LINE;
-import static org.onosproject.yang.compiler.utils.UtilConstants.OBJECT_STRING;
import static org.onosproject.yang.compiler.utils.UtilConstants.OF;
import static org.onosproject.yang.compiler.utils.UtilConstants.OPEN_PARENTHESIS;
import static org.onosproject.yang.compiler.utils.UtilConstants.OVERRIDE;
@@ -57,11 +56,9 @@
import static org.onosproject.yang.compiler.utils.UtilConstants.QUOTES;
import static org.onosproject.yang.compiler.utils.UtilConstants.SEMI_COLON;
import static org.onosproject.yang.compiler.utils.UtilConstants.SET_METHOD_PREFIX;
-import static org.onosproject.yang.compiler.utils.UtilConstants.SIXTEEN_SPACE_INDENTATION;
import static org.onosproject.yang.compiler.utils.UtilConstants.SPACE;
import static org.onosproject.yang.compiler.utils.UtilConstants.STATIC;
import static org.onosproject.yang.compiler.utils.UtilConstants.STRING_DATA_TYPE;
-import static org.onosproject.yang.compiler.utils.UtilConstants.SUFFIX_S;
import static org.onosproject.yang.compiler.utils.UtilConstants.TWELVE_SPACE_INDENTATION;
import static org.onosproject.yang.compiler.utils.UtilConstants.VALUE;
import static org.onosproject.yang.compiler.utils.UtilConstants.VOID;
@@ -154,11 +151,7 @@
public void getEqualsMethodTest() {
JavaAttributeInfo testAttr = getTestAttribute();
String method = MethodsGenerator.getEqualsMethod(testAttr);
- StringBuilder builder = new StringBuilder()
- .append(SIXTEEN_SPACE_INDENTATION).append(OBJECT_STRING)
- .append(SUFFIX_S).append(PERIOD).append(EQUALS_STRING)
- .append(OPEN_PARENTHESIS);
- assertThat(true, is(method.contains(builder.toString())));
+ assertThat(method, containsString(testAttr.getAttributeName()));
}
/**