Merge pull request #99 from jenkinsci/#93-csv-handle

Author: simonsymhoven

src/main/java/io/jenkins/plugins/reporter/ReportDetails.java

@@ -1,5 +1,6 @@
 package io.jenkins.plugins.reporter;
 
+import com.sun.xml.bind.v2.runtime.output.Encoded;
 import edu.hm.hafner.echarts.BuildResult;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
 import edu.hm.hafner.echarts.JacksonFacade;
@@ -15,6 +16,9 @@
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.*;
 
 public class ReportDetails implements ModelObject {
@@ -202,17 +206,18 @@ private ReportHistory createHistory() {
     @SuppressWarnings("unused") // Called by jelly view
     public Object getDynamic(final String link, final StaplerRequest request, final StaplerResponse response) {
         try {
+            String decodedLink = URLDecoder.decode(link, "UTF-8");
             Item subItem = item.getItems()
                     .stream()
-                    .filter(i -> Objects.equals(i.getId(), link))
+                    .filter(i -> Objects.equals(i.getId(), decodedLink))
                     .findFirst()
                     .orElseThrow(NoSuchElementException::new);
 
             String url = getUrl() + "/" + link;
-            return new ReportDetails(owner, url, result, Messages.Module_Description(subItem.getName()), subItem,
+            return new ReportDetails(owner, URLEncoder.encode(url, "UTF-8"), result, Messages.Module_Description(subItem.getName()), subItem,
                     Optional.of(this));
         }
-        catch (NoSuchElementException ignored) {
+        catch (NoSuchElementException | UnsupportedEncodingException ignored) {
             try {
                 response.sendRedirect2("../");
             }

src/main/java/io/jenkins/plugins/reporter/model/Item.java

@@ -4,8 +4,11 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jline.internal.Nullable;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +44,15 @@ public class Item implements Serializable {
     public String getId() {
         return id;
     }
+    
+    @JsonIgnore
+    public String getEncodedId() {
+        try {
+            return URLEncoder.encode(getId(), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return StringUtils.EMPTY;
+        }
+    }
 
     public void setId(String id) {
         this.id = id;

src/main/java/io/jenkins/plugins/reporter/model/ItemTableModel.java

@@ -3,6 +3,8 @@
 import io.jenkins.plugins.datatables.TableColumn;
 import org.apache.commons.text.CaseUtils;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -101,7 +103,7 @@ public static class ItemRow {
         }
 
         public String getId() {
-            return item.getId();
+            return item.getEncodedId();
         }
 
         public String getName() {