Author: echatellier Date: 2014-08-25 10:51:59 +0200 (Mon, 25 Aug 2014) New Revision: 589 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/589 Log: fixes #5649: Remove order from query Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-22 15:08:31 UTC (rev 588) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-25 08:51:59 UTC (rev 589) @@ -436,8 +436,7 @@ " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " GROUP BY range." + Range.PROPERTY_TOPIA_ID + - " ORDER BY range.label"; + " GROUP BY range." + Range.PROPERTY_TOPIA_ID; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-22 15:08:31 UTC (rev 588) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-25 08:51:59 UTC (rev 589) @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; @@ -46,6 +47,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeMap; import javax.activation.DataSource; import javax.activation.FileDataSource; @@ -612,7 +614,12 @@ // convert topiaId to entities RangeTopiaDao rangeDao = getPersistenceContext().getRangeDao(); - Map<Range, Long[]> result = new LinkedHashMap<Range, Long[]>(); + Map<Range, Long[]> result = new TreeMap<Range, Long[]>(new Comparator<Range>() { + @Override + public int compare(Range o1, Range o2) { + return o1.getLabel().compareTo(o2.getLabel()); + } + }); for (Entry<String, Long[]> entry : daoResult.entrySet()) { Range range = rangeDao.forTopiaIdEquals(entry.getKey()).findUnique(); result.put(range, entry.getValue());