fixes #528

Author: rzymek

fastexcel-writer/src/main/java/org/dhatim/fastexcel/HyperLink.java

@@ -1,5 +1,7 @@
 package org.dhatim.fastexcel;
 
+import java.util.Objects;
+
 public class HyperLink {
     private final String displayStr;
 
@@ -53,14 +55,23 @@ public HyperLink(String linkStr, String displayStr) {
         this.hyperLinkType = hyperLinkType;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        HyperLink hyperLink = (HyperLink) o;
+        return Objects.equals(displayStr, hyperLink.displayStr)
+                && Objects.equals(linkStr, hyperLink.linkStr)
+                && hyperLinkType == hyperLink.hyperLinkType;
+    }
+
     @Override
     public int hashCode() {
-        return super.hashCode();
+        return Objects.hash(displayStr, linkStr, hyperLinkType);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        return super.equals(obj);
+    public String toString() {
+        return linkStr;
     }
 
     public String getDisplayStr() {

fastexcel-writer/src/main/java/org/dhatim/fastexcel/Relationships.java

@@ -4,6 +4,8 @@
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.dhatim.fastexcel.XmlEscapeHelper.escape;
+
 public class Relationships {
 
     private static final String TYPE_OF_HYPERLINK= "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
@@ -66,7 +68,7 @@ void write( Writer relsWr) throws IOException {
             relsWr.append("<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">");
             for (Relationship rs : relationship) {
                 relsWr.append("<Relationship Id=\"" + rs.id + "\" ");
-                relsWr.append("Target=\"" + rs.target + "\" ");
+                relsWr.append("Target=\"" + escape(rs.target) + "\" ");
                 if (rs.targetMode!=null) {
                     relsWr.append("TargetMode=\""+rs.targetMode+"\" " );
                 }

fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java

@@ -23,6 +23,8 @@
 import java.util.*;
 import java.util.stream.IntStream;
 
+import static org.dhatim.fastexcel.XmlEscapeHelper.escape;
+
 /**
  * A worksheet is a set of cells.
  */
@@ -930,7 +932,7 @@ public void finish() throws IOException {
                     String rId = relationships.setHyperLinkRels(hyperLink.getLinkStr(), "External");
                     writer.append("r:id=\"" + rId +"\" ");
                 }else{
-                    writer.append("location=\"").append(hyperLink.getLinkStr()).append("\"");
+                    writer.append("location=\"").append(escape(hyperLink.getLinkStr())).append("\"");
                 }
                 writer.append("/>");
             }

fastexcel-writer/src/test/java/org/dhatim/fastexcel/PoiCompatibilityTest.java

@@ -44,6 +44,7 @@ void singleWorksheet() throws Exception {
         int intValue = 2_016;
         long longValue = 2_016_000_000_000L;
         BigDecimal bigDecimalValue = BigDecimal.TEN;
+        HyperLink hyperlinkValue = new HyperLink("https://github.com/dhatim/fastexcel?a=1&b=2");
         byte[] data = writeWorkbook(wb -> {
             Worksheet ws = wb.newWorksheet(sheetName);
             ws.paperSize(PaperSize.A4_PAPER);
@@ -63,6 +64,7 @@ void singleWorksheet() throws Exception {
             ws.value(i, i++, bigDecimalValue);
             ws.value(i, i++, Boolean.TRUE);
             ws.value(i, i++, Boolean.FALSE);
+            ws.hyperlink(i,i++, hyperlinkValue);
             try {
                 ws.close();
             } catch (IOException ex) {
@@ -101,6 +103,7 @@ void singleWorksheet() throws Exception {
         assertThat(new BigDecimal(xws.getRow(i).getCell(i++).getRawValue())).isEqualTo(bigDecimalValue);
         assertThat(xws.getRow(i).getCell(i++).getBooleanCellValue()).isTrue();
         assertThat(xws.getRow(i).getCell(i++).getBooleanCellValue()).isFalse();
+        assertThat(xws.getRow(i).getCell(i++).getHyperlink().getAddress()).isEqualTo(hyperlinkValue.getLinkStr());
     }