From 1b31a01b76605e55908c8850902eafb611205965 Mon Sep 17 00:00:00 2001 From: tiffanyperumpail Date: Wed, 5 Aug 2015 16:18:24 -0700 Subject: [PATCH 1/3] Added CodeGenStatus class with Status enum --- .../io/swagger/codegen/DefaultGenerator.java | 18 ++++++++++------ .../codegen/languages/CodeGenStatus.java | 21 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java 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 0b6f677857a..91093a13498 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 @@ -1,8 +1,14 @@ package io.swagger.codegen; +import static io.swagger.codegen.languages.CodeGenStatus.Status.FAILED; +import static io.swagger.codegen.languages.CodeGenStatus.Status.SUCCESSFUL; +import static io.swagger.codegen.languages.CodeGenStatus.Status.UNRUN; +import static org.apache.commons.lang3.StringUtils.capitalize; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; + import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; - +import io.swagger.codegen.languages.CodeGenStatus; import io.swagger.models.ComposedModel; import io.swagger.models.Contact; import io.swagger.models.Info; @@ -14,7 +20,6 @@ import io.swagger.models.Swagger; import io.swagger.models.auth.OAuth2Definition; import io.swagger.models.auth.SecuritySchemeDefinition; import io.swagger.util.Json; - import org.apache.commons.io.IOUtils; import java.io.File; @@ -34,14 +39,13 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.apache.commons.lang3.StringUtils.capitalize; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; - public class DefaultGenerator extends AbstractGenerator implements Generator { protected CodegenConfig config; protected ClientOptInput opts = null; protected Swagger swagger = null; + public CodeGenStatus status = new CodeGenStatus(UNRUN); + public Generator opts(ClientOptInput opts) { this.opts = opts; @@ -305,8 +309,10 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } config.processSwagger(swagger); + + status.setStatus(SUCCESSFUL); } catch (Exception e) { - e.printStackTrace(); + status.setStatus(FAILED); } return files; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java new file mode 100644 index 00000000000..80f5511825e --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java @@ -0,0 +1,21 @@ +package io.swagger.codegen.languages; + +public class CodeGenStatus { + public enum Status { + UNRUN, SUCCESSFUL, FAILED + }; + + private Status status; + + public CodeGenStatus(Status status) { + this.status = status; + } + + public Status getStatus() { + return status; + } + + public void setStatus(Status status) { + this.status = status; + } +} From 5328c00e8f48b4da0e4341a5356524868f9fceef Mon Sep 17 00:00:00 2001 From: tiffanyperumpail Date: Wed, 5 Aug 2015 16:53:39 -0700 Subject: [PATCH 2/3] Simplified enum by changing CodeGenStatus to an enum instead of a wrapper. Updated version of swagger-parser to 1.0.9. --- .../io/swagger/codegen/DefaultGenerator.java | 9 +++------ .../codegen/languages/CodeGenStatus.java | 18 +----------------- pom.xml | 2 +- 3 files changed, 5 insertions(+), 24 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 91093a13498..1821d6b0e02 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 @@ -1,8 +1,5 @@ package io.swagger.codegen; -import static io.swagger.codegen.languages.CodeGenStatus.Status.FAILED; -import static io.swagger.codegen.languages.CodeGenStatus.Status.SUCCESSFUL; -import static io.swagger.codegen.languages.CodeGenStatus.Status.UNRUN; import static org.apache.commons.lang3.StringUtils.capitalize; import static org.apache.commons.lang3.StringUtils.isNotEmpty; @@ -44,7 +41,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { protected ClientOptInput opts = null; protected Swagger swagger = null; - public CodeGenStatus status = new CodeGenStatus(UNRUN); + public CodeGenStatus status = CodeGenStatus.UNRUN; public Generator opts(ClientOptInput opts) { this.opts = opts; @@ -310,9 +307,9 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.processSwagger(swagger); - status.setStatus(SUCCESSFUL); + status = CodeGenStatus.SUCCESSFUL; } catch (Exception e) { - status.setStatus(FAILED); + status = CodeGenStatus.FAILED; } return files; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java index 80f5511825e..aa22958517f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java @@ -1,21 +1,5 @@ package io.swagger.codegen.languages; -public class CodeGenStatus { - public enum Status { +public enum CodeGenStatus { UNRUN, SUCCESSFUL, FAILED - }; - - private Status status; - - public CodeGenStatus(Status status) { - this.status = status; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } } diff --git a/pom.xml b/pom.xml index 45fba414722..ce59ad54f41 100644 --- a/pom.xml +++ b/pom.xml @@ -456,7 +456,7 @@ - 1.0.9-SNAPSHOT + 1.0.9 2.11.1 2.3.4 1.5.0 From 4ac8a93022d2f9e6ad9e1e98b107469971262dd6 Mon Sep 17 00:00:00 2001 From: tiffanyperumpail Date: Thu, 6 Aug 2015 11:29:59 -0700 Subject: [PATCH 3/3] Change swagger-parser-version to 1.0.9-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce59ad54f41..45fba414722 100644 --- a/pom.xml +++ b/pom.xml @@ -456,7 +456,7 @@ - 1.0.9 + 1.0.9-SNAPSHOT 2.11.1 2.3.4 1.5.0