Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add AnnotationSchemaNodeAware interface
[yangtools.git]
/
yang
/
yang-model-util
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
model
/
util
/
RevisionAwareXPathImpl.java
diff --git
a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
index 3ef6d5a64e12eb5a4b08ebdf6ab94f5acbd11f52..813f38d0570aaca2dd4247eaba7c0f055eef0b3f 100644
(file)
--- a/
yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
+++ b/
yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java
@@
-7,6
+7,7
@@
*/
package org.opendaylight.yangtools.yang.model.util;
*/
package org.opendaylight.yangtools.yang.model.util;
+import java.util.Objects;
import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
/**
import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
/**
@@
-20,9
+21,6
@@
public class RevisionAwareXPathImpl implements RevisionAwareXPath {
private final String xpath;
private final boolean absolute;
private final String xpath;
private final boolean absolute;
- private static final int HASH_BOOLEAN_TRUE = 1231;
- private static final int HASH_BOOLEAN_FALSE = 1237;
-
public RevisionAwareXPathImpl(final String xpath, final boolean absolute) {
this.xpath = xpath;
this.absolute = absolute;
public RevisionAwareXPathImpl(final String xpath, final boolean absolute) {
this.xpath = xpath;
this.absolute = absolute;
@@
-37,8
+35,8
@@
public class RevisionAwareXPathImpl implements RevisionAwareXPath {
public int hashCode() {
final int prime = 31;
int result = 1;
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result +
((xpath == null) ? 0 : xpath.hashCode()
);
- result = prime * result +
(absolute ? HASH_BOOLEAN_TRUE : HASH_BOOLEAN_FALSE
);
+ result = prime * result +
Objects.hashCode(xpath
);
+ result = prime * result +
Boolean.hashCode(absolute
);
return result;
}
return result;
}
@@
-54,17
+52,7
@@
public class RevisionAwareXPathImpl implements RevisionAwareXPath {
return false;
}
RevisionAwareXPathImpl other = (RevisionAwareXPathImpl) obj;
return false;
}
RevisionAwareXPathImpl other = (RevisionAwareXPathImpl) obj;
- if (xpath == null) {
- if (other.xpath != null) {
- return false;
- }
- } else if (!xpath.equals(other.xpath)) {
- return false;
- }
- if (absolute != other.absolute) {
- return false;
- }
- return false;
+ return absolute == other.absolute && Objects.equals(xpath, other.xpath);
}
@Override
}
@Override