jaxrs: fixed resource path

Author: vojtechhabarta

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

@@ -287,12 +287,11 @@ private TsModel createJaxrsInterface(SymbolTable symbolTable, TsModel tsModel, M
         tsModel.getTypeAliases().add(responseTypeAlias);
         // application interface
         final String applicationPath = jaxrsApplication.getApplicationPath();
-        final String pathPrefix = applicationPath != null && !applicationPath.isEmpty() ? applicationPath + "/" : "";
         final List<TsMethodModel> methods = new ArrayList<>();
         final Map<String, Long> methodNamesCount = groupingByMethodName(jaxrsApplication.getMethods());
         for (JaxrsMethodModel method : jaxrsApplication.getMethods()) {
             final boolean createLongName = methodNamesCount.get(method.getName()) > 1;
-            methods.add(processJaxrsMethod(symbolTable, pathPrefix, responseSymbol, method, createLongName));
+            methods.add(processJaxrsMethod(symbolTable, applicationPath, responseSymbol, method, createLongName));
         }
         final String applicationName = jaxrsApplication.getApplicationName() != null ? jaxrsApplication.getApplicationName() : "RestApplication";
         final TsBeanModel interfaceModel = new TsBeanModel(null, false, symbolTable.getSyntheticSymbol(applicationName), null, null, null, null, null, methods, null);
@@ -301,6 +300,7 @@ private TsModel createJaxrsInterface(SymbolTable symbolTable, TsModel tsModel, M
     }
 
     private static Map<String, Long> groupingByMethodName(List<JaxrsMethodModel> methods) {
+        // Java 8
 //        return methods.stream().collect(Collectors.groupingBy(JaxrsMethodModel::getName, Collectors.counting()));
         final Map<String, Long> methodNamesCount = new LinkedHashMap<>();
         for (JaxrsMethodModel method : methods) {
@@ -314,7 +314,7 @@ private static Map<String, Long> groupingByMethodName(List<JaxrsMethodModel> met
 
     private TsMethodModel processJaxrsMethod(SymbolTable symbolTable, String pathPrefix, Symbol responseSymbol, JaxrsMethodModel method, boolean createLongName) {
         final List<String> comments = new ArrayList<>();
-        final String path = pathPrefix + method.getPath();
+        final String path = Utils.joinPath(pathPrefix, method.getPath());
         comments.add("HTTP " + method.getHttpMethod() + " /" + path);
         final List<TsParameterModel> parameters = new ArrayList<>();
         // path params

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/JaxrsApplicationParser.java

@@ -175,12 +175,6 @@ private void parseResourceMethod(Result result, ResourceContext context, Class<?
         }
     }
 
-    private static String trimSlash(String path) {
-        final int begin = path.startsWith("/") ? 1 : 0;
-        final int end = path.length() - (path.endsWith("/") ? 1 : 0);
-        return path.substring(begin, end);
-    }
-
     private void foundType(Result result, Type type, Class<?> usedInClass, String usedInMember) {
         if (!isExcluded(type)) {
             result.discoveredTypes.add(new SourceType<>(type, usedInClass, usedInMember));
@@ -278,8 +272,7 @@ private static class ResourceContext {
         public final Map<String, Type> pathParamTypes;
 
         public ResourceContext(String path) {
-            this.path = path;
-            this.pathParamTypes = new LinkedHashMap<>();
+            this(path, new LinkedHashMap<String, Type>());
         }
 
         private ResourceContext(String path, Map<String, Type> pathParamTypes) {
@@ -288,8 +281,8 @@ private ResourceContext(String path, Map<String, Type> pathParamTypes) {
         }
 
         ResourceContext subPath(Path pathAnnotation) {
-            final String subPath = path + (pathAnnotation != null ? "/" + trimSlash(pathAnnotation.value()) : "");
-            return new ResourceContext(subPath, pathParamTypes);
+            final String subPath = pathAnnotation != null ? pathAnnotation.value() : null;
+            return new ResourceContext(Utils.joinPath(path, subPath), pathParamTypes);
         }
 
         ResourceContext subPathParamTypes(Map<String, Type> subPathParamTypes) {

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

@@ -26,6 +26,28 @@ public static String join(Iterable<? extends Object> values, String delimiter) {
         return sb.toString();
     }
 
+    public static String joinPath(String part1, String part2) {
+        final List<String> parts = new ArrayList<>();
+        addPathPart(parts, part1);
+        addPathPart(parts, part2);
+        return join(parts, "/");
+    }
+
+    private static void addPathPart(List<String> parts, String part) {
+        if (part != null) {
+            final String trimmed = trimSlash(part);
+            if (!trimmed.isEmpty()) {
+                parts.add(trimmed);
+            }
+        }
+    }
+
+    private static String trimSlash(String path) {
+        path = path.startsWith("/") ? path.substring(1) : path;
+        path = path.endsWith("/") ? path.substring(0, path.length() - 1) : path;
+        return path;
+    }
+
     public static Class<?> getRawClassOrNull(Type type) {
         if (type instanceof Class<?>) {
             return (Class<?>) type;