From 10075345750867aca3f30a5a3148cb49a1698ff1 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Mon, 3 Aug 2015 16:47:51 -0700 Subject: [PATCH 1/2] fix for #1042, removed empty `/` when basePath is null --- .../src/main/java/io/swagger/codegen/DefaultGenerator.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index d48238c24895..0b6f677857ac 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -111,10 +111,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } if (swagger.getBasePath() != null) { hostBuilder.append(swagger.getBasePath()); - } else { - hostBuilder.append("/"); } - String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath(); + String contextPath = swagger.getBasePath() == null ? "" : swagger.getBasePath(); String basePath = hostBuilder.toString(); From d5b959d8cda6b6eecc613f69f9fdba5859345232 Mon Sep 17 00:00:00 2001 From: Andrew B Date: Thu, 6 Aug 2015 16:54:24 -0700 Subject: [PATCH 2/2] Fixing a bug with truncated lone string responses --- .../swagger-codegen/src/main/resources/Java/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index fb4351d444de..79b445948162 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -356,7 +356,7 @@ public class ApiClient { } else if(String.class.equals(cls)) { if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) - return json.substring(1, json.length() - 2); + return json.substring(1, json.length() - 1); else return json; }