Sorting JAX-RS client methods alphabetically by URI path

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java

@@ -511,7 +511,10 @@ private List<TsMethodModel> processJaxrsMethodGroup(JaxrsApplicationModel jaxrsA
 
     private Map<Symbol, List<JaxrsMethodModel>> groupingByMethodContainer(JaxrsApplicationModel jaxrsApplication, SymbolTable symbolTable, String nameSuffix) {
         return jaxrsApplication.getMethods().stream()
-                .collect(Collectors.groupingBy(method -> getContainerSymbol(jaxrsApplication, symbolTable, nameSuffix, method)));
+                .collect(Collectors.groupingBy(
+                        method -> getContainerSymbol(jaxrsApplication, symbolTable, nameSuffix, method),
+                        Utils.toSortedList(Comparator.comparing(method -> method.getPath()))
+                ));
     }
 
     private Symbol getContainerSymbol(JaxrsApplicationModel jaxrsApplication, SymbolTable symbolTable, String nameSuffix, JaxrsMethodModel method) {

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/Utils.java

@@ -16,6 +16,8 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 
 public class Utils {
@@ -201,6 +203,16 @@ public static <T> List<T> removeAll(List<T> list, List<T> toBeRemoved) {
         return result;
     }
 
+    public static <T> Collector<T, ?, List<T>> toSortedList(Comparator<? super T> comparator) {
+        return Collectors.collectingAndThen(
+                Collectors.toCollection(ArrayList::new),
+                list -> {
+                    list.sort(comparator);
+                    return list;
+                }
+        );
+    }
+
     public static List<String> readLines(InputStream stream) {
         return splitMultiline(readString(stream), false);        
     }