Repository: deltaspike Updated Branches: refs/heads/master d95abe8c0 -> 2c4c80d65
DELTASPIKE-1299: fixed orderby item order Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2c4c80d6 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2c4c80d6 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2c4c80d6 Branch: refs/heads/master Commit: 2c4c80d65984648437dcd602f2ba57f9deca91f6 Parents: d95abe8 Author: Moritz Becker <moritz.bec...@gmx.at> Authored: Sun Nov 12 16:30:13 2017 +0100 Committer: John D. Ament <john.d.am...@gmail.com> Committed: Sat Dec 30 11:09:39 2017 -0500 ---------------------------------------------------------------------- .../data/impl/builder/part/OrderByQueryPart.java | 4 ++-- .../data/impl/builder/part/QueryRootTest.java | 16 ++++++++++++++++ deltaspike/modules/partial-bean/impl/pom.xml | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2c4c80d6/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/part/OrderByQueryPart.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/part/OrderByQueryPart.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/part/OrderByQueryPart.java index c4b241e..6185dd5 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/part/OrderByQueryPart.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/part/OrderByQueryPart.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.TreeSet; +import java.util.LinkedHashSet; import org.apache.deltaspike.data.impl.builder.QueryBuilder; import org.apache.deltaspike.data.impl.builder.QueryBuilderContext; @@ -43,7 +43,7 @@ public class OrderByQueryPart extends BasePropertyQueryPart @Override protected QueryPart build(String queryPart, String method, RepositoryMetadata repo) { - Set<String> collect = new TreeSet<String>(); + Set<String> collect = new LinkedHashSet<String>(); List<String> ascSplit = new LinkedList<String>(); split(queryPart, KEYWORD_ASC, ascSplit); for (String ascPart : ascSplit) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2c4c80d6/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/builder/part/QueryRootTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/builder/part/QueryRootTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/builder/part/QueryRootTest.java index 02528d9..9312203 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/builder/part/QueryRootTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/builder/part/QueryRootTest.java @@ -167,6 +167,22 @@ public class QueryRootTest assertEquals(expected, result); } + @Test + public void should_apply_order_by_in_order() + { + // given + final String name = "findAllOrderByNameDescIdAsc"; + final String expected = + "select e from Simple e " + + "order by e.name desc, e.id asc"; + + // when + String result = QueryRoot.create(name, repo, prefix(name)).getJpqlQuery().trim(); + + // then + assertEquals(expected, result); + } + private RepositoryMethodPrefix prefix(final String name) { return new RepositoryMethodPrefix("", name); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2c4c80d6/deltaspike/modules/partial-bean/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/partial-bean/impl/pom.xml b/deltaspike/modules/partial-bean/impl/pom.xml index 8adc249..e501383 100644 --- a/deltaspike/modules/partial-bean/impl/pom.xml +++ b/deltaspike/modules/partial-bean/impl/pom.xml @@ -69,5 +69,24 @@ <groupId>org.apache.deltaspike.modules</groupId> <artifactId>deltaspike-proxy-module-impl-asm5</artifactId> </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>5.0.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>5.0.3</version> + <scope>test</scope> + </dependency> </dependencies> </project>
