[playframework#1278] Fix porting of pull request playframework#504 fr…

…om old_master to master

Commit b91659a
("[playframework#878] Add OrderBy support in simplified queries") was never ported
to master.

The changes from Pull Request playframework#504 touched some parts of it,
therefore half of the OrderBy change sneaked in to the "new" master.

Fixing by removing the irrelevant OrderBy change.

In method findByToJPQL in file framework/src/play/db/jpa/JPQL.java:
- old_master merge commit has only StringBuilder related change
- master "merge" commit has this OrderBy change too

old_master merge commit: b6797a1
ported master commit: 97c54d2

Fix: 97c54d2 ("Merge pull request playframework#504 from marcelmay/lighthouse-1502-patch")

framework/src/play/db/jpa/JPQL.java

@@ -248,11 +248,7 @@ public String findByToJPQL(String findBy) {
     public String findByToJPQL(String dbName, String findBy) {
         findBy = findBy.substring(2);
         StringBuilder jpql = new StringBuilder();
-        String subRequest;
-        if (findBy.contains("OrderBy"))
-            subRequest = findBy.split("OrderBy")[0];
-        else subRequest = findBy;
-        String[] parts = subRequest.split("And");
+        String[] parts = findBy.split("And");
         int index = 1;
         for (int i = 0; i < parts.length; i++) {
             String part = parts[i];