Merge pull request #9 from vickyl1/vickyl1/trim-endpoint-path

Trim slashes from endpoint path to prevent duplicate slashes.
palantir · Jan 8, 2016 · 13e604c · 13e604c
2 parents 782b2a6 + 254d267
commit 13e604c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...t-service-generator-core/src/main/java/com/palantir/code/ts/generator/ServiceEmitter.java b/...t-service-generator-core/src/main/java/com/palantir/code/ts/generator/ServiceEmitter.java
@@ -23,6 +23,7 @@
 import com.palantir.code.ts.generator.model.ServiceEndpointModel;
 import com.palantir.code.ts.generator.model.ServiceEndpointParameterModel;
 import com.palantir.code.ts.generator.model.ServiceModel;
+import com.palantir.code.ts.generator.utils.PathUtils;
 
 import cz.habarta.typescript.generator.ModelCompiler;
 import cz.habarta.typescript.generator.Settings;
@@ -92,7 +93,7 @@ public void emitTypescriptClass(IndentedOutputWriter classWriter) {
             classWriter.writeLine("var httpCallData = <IHttpEndpointOptions> {");
             classWriter.increaseIndent();
             classWriter.writeLine("serviceIdentifier: \"" + Character.toLowerCase(model.name().charAt(0)) + model.name().substring(1) + "\",");
-            classWriter.writeLine("endpointPath: \"" + model.servicePath() + "/" + endpointModel.endpointPath() + "\",");
+            classWriter.writeLine("endpointPath: \"" + getEndpointPathString(model, endpointModel) + "\",");
             classWriter.writeLine("method: \"" + endpointModel.endpointMethodType() + "\",");
             classWriter.writeLine("mediaType: \"" + endpointModel.endpointMediaType() + "\",");
             List<String> requiredHeaders = Lists.newArrayList();
@@ -154,6 +155,11 @@ public void emitTypescriptInterface(IndentedOutputWriter interfaceWriter) {
         interfaceWriter.writeLine("}");
     }
 
+    private String getEndpointPathString(ServiceModel model, ServiceEndpointModel endpointModel) {
+        String endpointPath = model.servicePath() + "/" + endpointModel.endpointPath();
+        return PathUtils.trimSlashes(endpointPath);
+    }
+
     private String getEndpointParametersString(ServiceEndpointModel endpointModel) {
         List<String> parameterStrings = Lists.newArrayList();
         for (ServiceEndpointParameterModel parameterModel : endpointModel.parameters()) {