From 30b20e3967a52a9b9aece72caabdb0e6251919d9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 15 Jul 2022 21:20:32 +0000 Subject: [PATCH] [github-344] refactor equals method in XSSFHyperlinkRecord git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902751 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/xssf/binary/XSSFHyperlinkRecord.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java index 080048af45..611903ddff 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java @@ -89,17 +89,16 @@ public class XSSFHyperlinkRecord { XSSFHyperlinkRecord that = (XSSFHyperlinkRecord) o; - if (cellRangeAddress != null ? !cellRangeAddress.equals(that.cellRangeAddress) : that.cellRangeAddress != null) - return false; - if (relId != null ? !relId.equals(that.relId) : that.relId != null) return false; - if (location != null ? !location.equals(that.location) : that.location != null) return false; - if (toolTip != null ? !toolTip.equals(that.toolTip) : that.toolTip != null) return false; - return display != null ? display.equals(that.display) : that.display == null; + return Objects.equals(cellRangeAddress, that.cellRangeAddress) && + Objects.equals(relId, that.relId) && + Objects.equals(location, that.location) && + Objects.equals(toolTip, that.toolTip) && + Objects.equals(display, that.display); } @Override public int hashCode() { - return Objects.hash(cellRangeAddress,relId,location,toolTip,display); + return Objects.hash(cellRangeAddress, relId, location, toolTip, display); } @Override -- 2.39.5