Merged 5.2.N (5.2.1) to HEAD (5.2)

130297 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130050 gjames: SEARCH-161: Supporting synonyms for sorting fieldNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/search/model/SortDef.java

@@ -59,15 +59,13 @@ public class SortDef
         return type;
     }
 
-    /**
-     * You are allowed to create an instance of this class that has an invalid sortType
-     * but this method will validate the definition is correct and return it.
-     *
-     * @return SortDefinition
-     */
-    public SortDefinition toDefinition()
+    public String getField()
     {
-        return new SortDefinition(SortType.valueOf(type), field, ascending);
+        return field;
     }
 
+    public boolean isAscending()
+    {
+        return ascending;
+    }
 }