csv - change headers to list instead of hashset to maintain order

eliranmoyal · eliranmoyal · commit 8639bb9d934e · 2016-03-04T09:31:02.000+02:00
diff --git a/src/main/java/org/elasticsearch/plugin/nlpcn/executors/CSVResultsExtractor.java b/src/main/java/org/elasticsearch/plugin/nlpcn/executors/CSVResultsExtractor.java
@@ -271,13 +271,14 @@ private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits,
             }
             docsAsMap.add(doc);
         }
+        ArrayList<String> headersList = new ArrayList<>(csvHeaders);
         if (this.includeScore){
-            csvHeaders.add("_score");
+            headersList.add("_score");
         }
         if (this.includeType){
-            csvHeaders.add("_type");
+            headersList.add("_type");
         }
-        return new ArrayList<>(csvHeaders);
+        return headersList;
     }
 
     private String findFieldValue(String header, Map<String, Object> doc, boolean flat, String separator) {

Original file line number	Diff line number	Diff line change
`@@ -271,13 +271,14 @@ private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits,`
`271`	`271`	`}`
`272`	`272`	`docsAsMap.add(doc);`
`273`	`273`	`}`
	`274`	`+ ArrayList<String> headersList = new ArrayList<>(csvHeaders);`
`274`	`275`	`if (this.includeScore){`
`275`		`- csvHeaders.add("_score");`
	`276`	`+ headersList.add("_score");`
`276`	`277`	`}`
`277`	`278`	`if (this.includeType){`
`278`		`- csvHeaders.add("_type");`
	`279`	`+ headersList.add("_type");`
`279`	`280`	`}`
`280`		`- return new ArrayList<>(csvHeaders);`
	`281`	`+ return headersList;`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`private String findFieldValue(String header, Map<String, Object> doc, boolean flat, String separator) {`