Voomra/trader
Archived
0
Fork 0
Code Activity

sort items before save to xml

Browse Source
This commit is contained in:
Mo
2016-05-29 01:34:52 +03:00
parent 1f7bbf891f
commit 54eb34c40e
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/ru/trader/store/simple/MarketStreamWriter.java
View File

@@ -9,9 +9,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter; import javax.xml.stream.XMLStreamWriter;
import java.io.*; import java.io.*;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Collection; import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class MarketStreamWriter { public class MarketStreamWriter {
@@ -51,7 +49,9 @@ public class MarketStreamWriter {
protected void writeItems() throws XMLStreamException { protected void writeItems() throws XMLStreamException {
out.writeStartElement(MarketDocHandler.ITEM_LIST); out.writeStartElement(MarketDocHandler.ITEM_LIST);
Group group = null; Group group = null;
for (Item entry : market.getItems()) { List<Item> sortedItems = new ArrayList<>(market.getItems());
sortedItems.sort(itemComparator);
for (Item entry : sortedItems) {
if (group!=entry.getGroup()){ if (group!=entry.getGroup()){
if (group != null) out.writeEndElement(); if (group != null) out.writeEndElement();
group = entry.getGroup(); group = entry.getGroup();
@@ -183,4 +183,16 @@ public class MarketStreamWriter {
} }
return res; return res;
} }
private final static Comparator<Item> itemComparator = (i1, i2) -> {
Group g1 = i1.getGroup();
Group g2 = i2.getGroup();
if (g1 == null) return -1;
if (g2 == null) return 1;
int cmp = g1.getType().compareTo(g2.getType());
if (cmp != 0) return cmp;
cmp = g1.getName().compareTo(g2.getName());
if (cmp != 0) return cmp;
return i1.getName().compareTo(i2.getName());
};
} }