diff --git a/src/main/java/kinosearch/core/KinoPlay.java b/src/main/java/kinosearch/core/KinoPlay.java index f45bdc4..f6bc575 100644 --- a/src/main/java/kinosearch/core/KinoPlay.java +++ b/src/main/java/kinosearch/core/KinoPlay.java @@ -4,15 +4,15 @@ */ package kinosearch.core; -import java.util.ArrayList; +import java.util.List; import java.util.Map; public class KinoPlay { private String title; private KinoType type = KinoType.UNKNOW; private KinoItem oneFilm; - private ArrayList serials; - private Map> seasons; + private List serials; + private Map> seasons; public enum KinoType { UNKNOW, ONE_FILM, SIMPLE_SERIAL, SEASONS_SERIAL @@ -42,19 +42,19 @@ public class KinoPlay { this.oneFilm = oneFilm; } - public ArrayList getSerials() { + public List getSerials() { return serials; } - public void setSerials(ArrayList serials) { + public void setSerials(List serials) { this.serials = serials; } - public Map> getSeasons() { + public Map> getSeasons() { return seasons; } - public void setSeasons(Map> seasons) { + public void setSeasons(Map> seasons) { this.seasons = seasons; } } diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 1f3d256..7a8da80 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -117,7 +117,7 @@ public class Onlinelife implements KinoWarez { // сезонный сериал kinoPlay.setType(KinoPlay.KinoType.SEASONS_SERIAL); - Map> seasons = new HashMap<>(); + Map> seasons = new LinkedHashMap<>(); for (JsonElement element : jsonArray) { jsonObj = element.getAsJsonObject(); String titleSeason = jsonObj.get("comment").getAsString(); @@ -132,6 +132,7 @@ public class Onlinelife implements KinoWarez { )); } + serials.sort(Comparator.comparing(KinoItem::getTitle)); seasons.put(titleSeason, serials); } @@ -148,6 +149,7 @@ public class Onlinelife implements KinoWarez { jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/") )); } + serials.sort(Comparator.comparing(KinoItem::getTitle)); kinoPlay.setSerials(serials); } } diff --git a/src/main/java/kinosearch/webapp/KinoPlaySerializer.java b/src/main/java/kinosearch/webapp/KinoPlaySerializer.java index 509c142..2382630 100644 --- a/src/main/java/kinosearch/webapp/KinoPlaySerializer.java +++ b/src/main/java/kinosearch/webapp/KinoPlaySerializer.java @@ -10,6 +10,7 @@ import kinosearch.core.KinoPlay; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.List; import java.util.Map; public class KinoPlaySerializer implements JsonSerializer { @@ -68,7 +69,7 @@ public class KinoPlaySerializer implements JsonSerializer { */ JsonArray jsonSeasons = new JsonArray(); - for (Map.Entry> entry : kinoPlay.getSeasons().entrySet()) { + for (Map.Entry> entry : kinoPlay.getSeasons().entrySet()) { JsonObject jsonSeason = new JsonObject(); jsonSeason.addProperty("title", entry.getKey());